Skip to content

fix(security): LOG-2552 Investigate the changes required to make Vector use OpenSSL #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vimalk78 merged 7 commits into from
Jun 14, 2022
Merged

fix(security): LOG-2552 Investigate the changes required to make Vector use OpenSSL #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4bbe793
LOG-2552: native-tls for aws-sdk
syedriko May 25, 2022
7b2364f
LOG-2552: link OpenSSL dynamically
syedriko May 25, 2022
ddeb5c5
LOG-2552: make bollard dependency optional
syedriko May 26, 2022
cd9b383
LOG-2552: replace Ring with OpenSSL in aws-config
syedriko May 27, 2022
7270b1f
LOG-2552: replace Ring with OpenSSL in aws-sigv4
syedriko May 30, 2022
fa7f7b9
LOG-2552:
syedriko Jun 14, 2022
727da05
LOG-2552: checked in cargo-nextest
syedriko Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
!vendor
!8.6-compose.repo
!thirdparty
!patch
23 changes: 3 additions & 20 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,17 +140,17 @@ metrics = { version = "0.17.1", default-features = false, features = ["std"] }
metrics-tracing-context = { version = "0.9.0", default-features = false }

# AWS - Official SDK
aws-config = { version = "0.9.0", optional = true }
aws-config = { version = "0.9.0", optional = true, default-features = false, features = ["native-tls"] }
aws-types = { version = "0.9.0", optional = true, features = ["hardcoded-credentials"]}
aws-sdk-s3 = { version = "0.9.0", optional = true }
aws-sdk-sqs = { version = "0.9.0", optional = true }
aws-sdk-cloudwatch = { version = "0.9.0", optional = true }
aws-sdk-cloudwatchlogs = { version = "0.9.0", optional = true }
aws-sdk-elasticsearch = {version = "0.9.0", optional = true }
aws-sdk-firehose = { version = "0.9.0", optional = true }
aws-sdk-kinesis = { version = "0.9.0", optional = true }
aws-sigv4 = { version = "0.9.0", optional = true }
aws-smithy-client = { version = "0.39.0", optional = true }
aws-sdk-s3 = { version = "0.9.0", optional = true, default-features = false, features = ["native-tls"] }
aws-sdk-sqs = { version = "0.9.0", optional = true, default-features = false, features = ["native-tls"] }
aws-sdk-cloudwatch = { version = "0.9.0", optional = true, default-features = false, features = ["native-tls"] }
aws-sdk-cloudwatchlogs = { version = "0.9.0", optional = true, default-features = false, features = ["native-tls"] }
aws-sdk-elasticsearch = {version = "0.9.0", optional = true, default-features = false, features = ["native-tls"] }
aws-sdk-firehose = { version = "0.9.0", optional = true, default-features = false, features = ["native-tls"] }
aws-sdk-kinesis = { version = "0.9.0", optional = true, default-features = false, features = ["native-tls"] }
aws-sigv4 = { version = "0.9.0", optional = true, features = ["openssl"] }
aws-smithy-client = { version = "0.39.0", optional = true, default-features = false, features = ["native-tls"] }
aws-smithy-http = { version = "0.39.0", optional = true }

# Azure
Expand Down Expand Up @@ -208,7 +208,7 @@ async-compression = { version = "0.3.12", default-features = false, features = [
avro-rs = { version = "0.13.0", default-features = false, optional = true }
base64 = { version = "0.13.0", default-features = false, optional = true }
bloom = { version = "0.3.2", default-features = false, optional = true }
bollard = { version = "0.11.1", default-features = false, features = ["ssl"] }
bollard = { version = "0.11.1", default-features = false, features = ["ssl"], optional = true }
bytes = { version = "1.1.0", default-features = false, features = ["serde"] }
bytesize = { version = "1.1.0", default-features = false }
chrono = { version = "0.4.19", default-features = false, features = ["serde"] }
Expand Down Expand Up @@ -251,7 +251,7 @@ nom = { version = "7.1.1", default-features = false, optional = true }
notify = { version = "4.0.17", default-features = false }
num_cpus = { version = "1.13.1", default-features = false }
once_cell = { version = "1.10", default-features = false }
openssl = { version = "0.10.38", default-features = false, features = ["vendored"] }
openssl = { version = "0.10.38", default-features = false}
openssl-probe = { version = "0.1.5", default-features = false }
ordered-float = { version = "2.10.0", default-features = false }
percent-encoding = { version = "2.1.0", default-features = false }
Expand Down Expand Up @@ -334,6 +334,8 @@ leveldb-sys = { git = "https://github.com/vectordotdev/leveldb-sys.git", branch
# Removes dependency on `time` v0.1
# https://github.com/chronotope/chrono/pull/578
chrono = { git = "https://github.com/vectordotdev/chrono.git", branch = "no-default-time" }
aws-config = { path = "patch/aws-config" }
aws-sigv4 = { path = "patch/aws-sigv4" }

[features]
ocp-logging = [
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.unit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ RUN mkdir -p /src

WORKDIR /src
COPY . /src
RUN mkdir -p ~/.cargo/bin && ln -s /src/thirdparty/cargo-nextest/cargo-nextest-linux-$(arch) ~/.cargo/bin/cargo-nextest
1 change: 1 addition & 0 deletions patch/aws-config/.cargo-checksum.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"files":{"Cargo.lock":"304f241b7aae1acc1e24fc91f6af6de6e3d9bef205633287e3e6bee1d54cff09","Cargo.toml":"5dbcd7201b9cec70cc9e90e90171dba69bde98938142f83b3f6bc50996b55cbe","LICENSE":"09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b","README.md":"c37b31a9c037887944302084a51873c901ca1525570bb23cdf3ce9029ba601f4","additional-ci":"635a2ab25920a342ec0d52cef4b78a0aa82dd637603667f01805d3e9a64ad5b5","examples/imds.rs":"e0df4959f2205d9a0ac544a99c461f96a09cf8013b56869943cfbeaca3f0fa57","src/cache.rs":"0ef94a4b8db871028c528b5f75dae107e4ceb34cc8ddf84a7bcde9bf8c34349f","src/connector.rs":"9181e21cbbeb503afb273b1934bc3699c97094608a658251701b6f99ae5fa568","src/default_provider.rs":"94b95238864fbc0c543f10370001b112a01b1535276a8cecac90189f48f6ef07","src/default_provider/app_name.rs":"ee2e87dc47397650611b9aaa930507d59173ef50411c71bebdf4c9536eb5c839","src/default_provider/credentials.rs":"a386ac05b34c077c8c178b8824ce91be96a8162732b71bf1c6c3230baa366103","src/default_provider/region.rs":"1f60f32d0e6046e79fb6fd3ed7ca695cefef27014afe64af134004b546199d18","src/default_provider/retry_config.rs":"f363195a93c25eba35df4cb158925951cf847e8f867b1b0d0cd60e0881538a41","src/default_provider/timeout_config.rs":"9e86355470dd54d9745cff0d7a408f52d7d05603a69c03516c52787e0a35db31","src/ecs.rs":"6f1410c19f1e78fab956f6b2232231e797996c45f723f8ea30cb61dc32eabb6a","src/environment/app_name.rs":"1cebf73cd10fd8a22cc8204cd35a54a228d4fba4aa830f9cea9c508e14d789ff","src/environment/credentials.rs":"7727f2f7a88cc806068b1c9a352c832ce517a625ccb7ba99ef540bb255c816e8","src/environment/mod.rs":"55d2e7d23e40844568bb8ee8b702cd6893a6aa056adb0ba8318537e0265376bb","src/environment/region.rs":"5874f35f37a92c29957dbdc0e57291e3296184634ca28b6fa7df4b5b3e572fd8","src/environment/retry_config.rs":"7052e0609d68a28ba026f13d8d91a8f2d0d55f2c0491acf360bbcfbf338976c7","src/environment/timeout_config.rs":"097767ce6e5fca6c89a9d823402119ddf2f06eecbce9961f24ed32315a07fa25","src/fs_util.rs":"ddd0c6ed3cebc68152ff99f9e33c24c8f0879e7ebd9d4f5f154f20dfe4847c8c","src/http_credential_provider.rs":"cd5fa4c201a857a84100b2b3efe65ae4267255e25ab351d58cccc6ddeab98b21","src/imds/client.rs":"5103d71a7ba746943f0461fb3729eec969a1d3c9b598efc6bfc24d46bf7edbc9","src/imds/client/token.rs":"9d0754186a5a18dae9078ce5359d44f683e3ef09bfb0651f40854783885d399f","src/imds/credentials.rs":"ef48ec83002497c4327094f74d2d1aa944ae94580969fcfa830045ca0e7c9ce7","src/imds/mod.rs":"52bcfd7cc9e807ccc2d8afb8568fbcc6a1cd571eac2e06dbf703765ee53c152d","src/imds/region.rs":"f2c41de6fc4c26f68e02d62af82321e56965114e345227e6de656d55e28b915f","src/json_credentials.rs":"de7cbc1120d1089388ae2aac5967b560f711a164221ee83ef50297e459dfff49","src/lib.rs":"43a7fa5db94faa84b1dd7f0ca7648025892359fa55168357abdb7f4aba56c475","src/meta/credentials/chain.rs":"dddcee3651fd2c6d0926c17b9bd37296eb43857639ee238d21b4b2da4caabd80","src/meta/credentials/credential_fn.rs":"1b319d5800ac53415f4a74968602b17f044f84a8339bb32e5b13709ef753e4aa","src/meta/credentials/lazy_caching.rs":"8d9b1c159b964aed9b196aaacf4a634ab2ffdb1295a7d2a121b9d89c41ce4d0e","src/meta/credentials/mod.rs":"a67a3110e4ba8fb641efb817975606b02cdb17c88ed4988aa4709e3b3f7f1824","src/meta/mod.rs":"031e68ce64dafb417b027f7665cc75ee5cc5664887c7806c85c4c7bc19aafc2c","src/meta/region.rs":"d669057f3f0a3d44cce403b66e61fa131dfe01ae8704762aa659b4503c1507e4","src/parsing.rs":"1ae7a5ca45b379b06d9ccaec845c38bd79081dbca13b59db4734bfe883de8ece","src/profile/app_name.rs":"e55119f7f587dfb899c5f073cd91169a8e4c41d73cc39aad3ffac8dc29369ba3","src/profile/credentials.rs":"08920469a873a3845564626560898a059e0114b11c78ea95e1243db848667913","src/profile/credentials/exec.rs":"5c834b05091a0f03888d3971dfbb0942b3b98433f116276f54b187b9e50abd00","src/profile/credentials/repr.rs":"93b7217011da3b0e9332d10e8d32b09c628a4b6a03b22684029ee1cc79dd2103","src/profile/mod.rs":"6938c8279487de762031897229122f039369ab9c6c45b37095c0087d77932dbd","src/profile/parser.rs":"c4f4d438dfa077483cf2111ee93999e5852370ff9af29c7dee0792c8ff5cf0e5","src/profile/parser/normalize.rs":"8d3d513f4cc77b09e5457fbad4f98bb580fe6ad40eb1ea2316e267cf2a9c986c","src/profile/parser/parse.rs":"55073a88b22db6eea8c88f345ad1a6190f6709f49b78bfbc06af7c90b08ed64b","src/profile/parser/source.rs":"010708b4d1ac11ea3df9c3fd6014dc180145024ed232264af47a20e32e6d252e","src/profile/region.rs":"7ff1690464824a3a400efce7f484acfe8d6260d01d2142c37a97edd3342ed2be","src/profile/retry_config.rs":"62a1dc2a0c5119da6a2203c3d5b75f38244fc4171ff7422e60384ac19deccb55","src/profile/timeout_config.rs":"dae51600a668d32f306be8189f7553b40e7055624f90cfeecd028473f1640f5d","src/provider_config.rs":"90ad94d87779793d3570906cf968381a78e08088d0170d00d93093ce5fcfc890","src/sso.rs":"0cafe289657fbb2afc8c7c74e8d6c675cb6e59ea811539c66fdffb0c70f9fda6","src/sts.rs":"55fd6b002f16ef8de378546ff1b069f3a0f07f18b6f41949e40d071d665a3648","src/sts/assume_role.rs":"1b68867bd2c027811856e63376d42929a7c5e81de628dda33d6c01ebb5e9a6b8","src/sts/util.rs":"58c7aaa6bcd4808f74d37ad3e00f9499800f5d7a5ea6ffffb21fc15de002cf97","src/test_case.rs":"5e1a539074b3b2c4b7385572070f1b60ee51425ad3d00f111bd95daa435074aa","src/web_identity_token.rs":"ed52452e6908ede1a3827a6a8ad611ed2bc41b4701998bc25f343bc3f18d2cbb"},"package":"2da63196d2d0dd38667b404459a35d32562a8d83c1f46c5b789ab89ab176fd53"}
Loading