diff --git a/aws/rust-runtime/aws-config/Cargo.lock b/aws/rust-runtime/aws-config/Cargo.lock index eecae0c1ce..5b5a794604 100644 --- a/aws/rust-runtime/aws-config/Cargo.lock +++ b/aws/rust-runtime/aws-config/Cargo.lock @@ -86,7 +86,7 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.2" +version = "1.2.1" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -291,7 +291,7 @@ dependencies = [ [[package]] name = "aws-smithy-protocol-test" -version = "0.63.1" +version = "0.63.0" dependencies = [ "assert-json-diff", "aws-smithy-runtime-api", diff --git a/buildSrc/src/main/kotlin/CrateSet.kt b/buildSrc/src/main/kotlin/CrateSet.kt index e9631b09b0..9c1f567ae4 100644 --- a/buildSrc/src/main/kotlin/CrateSet.kt +++ b/buildSrc/src/main/kotlin/CrateSet.kt @@ -63,6 +63,7 @@ object CrateSet { "aws-smithy-checksums", "aws-smithy-compression", "aws-smithy-client", + "aws-smithy-default-tls", "aws-smithy-eventstream", "aws-smithy-http", "aws-smithy-http-client", diff --git a/rust-runtime/Cargo.lock b/rust-runtime/Cargo.lock index 58d786a2d7..d4fe62c328 100644 --- a/rust-runtime/Cargo.lock +++ b/rust-runtime/Cargo.lock @@ -415,6 +415,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-smithy-default-tls" +version = "0.1.0" +dependencies = [ + "aws-smithy-http-client", + "aws-smithy-runtime-api 1.7.4", + "tracing", +] + [[package]] name = "aws-smithy-eventstream" version = "0.60.6" @@ -710,6 +719,7 @@ version = "1.8.0" dependencies = [ "approx", "aws-smithy-async 1.2.5", + "aws-smithy-default-tls", "aws-smithy-http 0.62.0", "aws-smithy-http-client", "aws-smithy-runtime-api 1.7.4", diff --git a/rust-runtime/Cargo.toml b/rust-runtime/Cargo.toml index 1d5e2eddd6..348e45ab02 100644 --- a/rust-runtime/Cargo.toml +++ b/rust-runtime/Cargo.toml @@ -7,6 +7,7 @@ members = [ "aws-smithy-checksums", "aws-smithy-compression", "aws-smithy-client", + "aws-smithy-default-tls", "aws-smithy-eventstream", "aws-smithy-http", "aws-smithy-http-auth", diff --git a/rust-runtime/aws-smithy-default-tls/Cargo.toml b/rust-runtime/aws-smithy-default-tls/Cargo.toml new file mode 100644 index 0000000000..57a4090912 --- /dev/null +++ b/rust-runtime/aws-smithy-default-tls/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "aws-smithy-default-tls" +authors = ["AWS Rust SDK Team "] +description = "Selects the default HTTPS stack for generated smithy clients based on platform support" +version = "0.1.0" +license = "Apache-2.0" +edition = "2021" +repository = "https://github.com/smithy-lang/smithy-rs" + +[dependencies] +aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api" } +aws-smithy-http-client = { path = "../aws-smithy-http-client", optional = true } +tracing = "0.1.40" + +[target.'cfg(unix)'.dependencies] +aws-smithy-http-client = { path = "../aws-smithy-http-client", features = ["s2n-tls"] } + +[target.'cfg(windows)'.dependencies] +aws-smithy-http-client = { path = "../aws-smithy-http-client", features = ["rustls-aws-lc"] } + +[package.metadata.docs.rs] +all-features = true +targets = ["x86_64-unknown-linux-gnu"] +cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"] +rustdoc-args = ["--cfg", "docsrs"] +# End of docs.rs metadata diff --git a/rust-runtime/aws-smithy-default-tls/LICENSE b/rust-runtime/aws-smithy-default-tls/LICENSE new file mode 100644 index 0000000000..67db858821 --- /dev/null +++ b/rust-runtime/aws-smithy-default-tls/LICENSE @@ -0,0 +1,175 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. diff --git a/rust-runtime/aws-smithy-default-tls/README.md b/rust-runtime/aws-smithy-default-tls/README.md new file mode 100644 index 0000000000..5be15771f2 --- /dev/null +++ b/rust-runtime/aws-smithy-default-tls/README.md @@ -0,0 +1,7 @@ +# aws-smithy-default-tls + +Selects the default HTTPS client based on platform support. + + +This crate is part of the [AWS SDK for Rust](https://awslabs.github.io/aws-sdk-rust/) and the [smithy-rs](https://github.com/smithy-lang/smithy-rs) code generator. In most cases, it should not be used directly. + diff --git a/rust-runtime/aws-smithy-default-tls/src/lib.rs b/rust-runtime/aws-smithy-default-tls/src/lib.rs new file mode 100644 index 0000000000..46b614474c --- /dev/null +++ b/rust-runtime/aws-smithy-default-tls/src/lib.rs @@ -0,0 +1,75 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +/* Automatically managed default lints */ +#![cfg_attr(docsrs, feature(doc_auto_cfg))] +/* End of automatically managed default lints */ + +//! Default HTTPS client implementation for smithy-rs generated code. +//! +//! This crate is not meant to be consumed directly and exists to facilitate +//! platform specific defaults only. Use the `aws-smithy-http-client` crate directly +//! instead. + +#![warn( + missing_docs, + rustdoc::missing_crate_level_docs, + unreachable_pub, + rust_2018_idioms +)] +#![cfg_attr(docsrs, feature(doc_cfg))] + +use aws_smithy_runtime_api::client::behavior_version::BehaviorVersion; +use aws_smithy_runtime_api::client::http::SharedHttpClient; + +// NOTE: We created default client options to evolve defaults over time (e.g. allow passing a different DNS resolver) +/// Configuration options for the default HTTPS client +#[derive(Debug, Clone)] +pub struct DefaultClientOptions { + _behavior_version: BehaviorVersion, +} + +impl Default for DefaultClientOptions { + fn default() -> Self { + DefaultClientOptions { + _behavior_version: BehaviorVersion::latest(), + } + } +} + +impl DefaultClientOptions { + /// Set the behavior version to use + #[allow(unused)] + pub fn with_behavior_version(mut self, behavior_version: BehaviorVersion) -> Self { + self._behavior_version = behavior_version; + self + } +} + +#[cfg(unix)] +/// Creates an HTTPS client using the default TLS provider +pub fn default_https_client(_options: DefaultClientOptions) -> Option { + use aws_smithy_http_client::{tls, Builder}; + tracing::trace!("creating a new default hyper 1.x client using s2n-tls"); + Some( + Builder::new() + .tls_provider(tls::Provider::S2nTls) + .build_https(), + ) +} + +#[cfg(windows)] +/// Creates an HTTPS client using the default TLS provider +pub fn default_https_client(_options: DefaultClientOptions) -> Option { + use aws_smithy_http_client::{tls, Builder}; + tracing::trace!("creating a new default hyper 1.x client using rustls"); + Some( + Builder::new() + .tls_provider(tls::Provider::Rustls( + tls::rustls_provider::CryptoMode::AwsLc, + )) + .build_https(), + ) +} diff --git a/rust-runtime/aws-smithy-runtime/Cargo.toml b/rust-runtime/aws-smithy-runtime/Cargo.toml index 5d47ca0d25..826c841a86 100644 --- a/rust-runtime/aws-smithy-runtime/Cargo.toml +++ b/rust-runtime/aws-smithy-runtime/Cargo.toml @@ -16,7 +16,7 @@ http-auth = ["aws-smithy-runtime-api/http-auth"] # NOTE: connector-hyper-0-14-x and tls-rustls are "legacy" features related to default HTTP client based on hyper 0.14.x ecosystem connector-hyper-0-14-x = ["dep:aws-smithy-http-client", "aws-smithy-http-client?/hyper-014"] tls-rustls = ["dep:aws-smithy-http-client", "aws-smithy-http-client?/legacy-rustls-ring", "connector-hyper-0-14-x"] -default-https-client = ["dep:aws-smithy-http-client", "aws-smithy-http-client?/rustls-aws-lc"] +default-https-client = ["dep:aws-smithy-default-tls"] rt-tokio = ["tokio/rt"] # Features for testing @@ -49,6 +49,7 @@ aws-smithy-http = { path = "../aws-smithy-http" } aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api" } aws-smithy-types = { path = "../aws-smithy-types", features = ["http-body-0-4-x"] } aws-smithy-http-client = { path = "../aws-smithy-http-client", optional = true } +aws-smithy-default-tls = { path = "../aws-smithy-default-tls", optional = true } bytes = "1.4.0" # Make sure to update `fastrand` in [dev-dependencies] if we bump the major version # We probably need to update unit tests using the `fastrand` crate when that happens diff --git a/rust-runtime/aws-smithy-runtime/src/client/defaults.rs b/rust-runtime/aws-smithy-runtime/src/client/defaults.rs index b6d581baab..0be7d20f4e 100644 --- a/rust-runtime/aws-smithy-runtime/src/client/defaults.rs +++ b/rust-runtime/aws-smithy-runtime/src/client/defaults.rs @@ -83,9 +83,9 @@ pub fn default_http_client_plugin_v2( // takes precedence over legacy connector if enabled #[cfg(feature = "default-https-client")] { - let opts = crate::client::http::DefaultClientOptions::default() + let opts = aws_smithy_default_tls::DefaultClientOptions::default() .with_behavior_version(behavior_version); - _default = crate::client::http::default_https_client(opts); + _default = aws_smithy_default_tls::default_https_client(opts); } } else { // fallback to legacy hyper client for given behavior version diff --git a/rust-runtime/aws-smithy-runtime/src/client/http.rs b/rust-runtime/aws-smithy-runtime/src/client/http.rs index eebb8a320e..8e50ba75fa 100644 --- a/rust-runtime/aws-smithy-runtime/src/client/http.rs +++ b/rust-runtime/aws-smithy-runtime/src/client/http.rs @@ -2,9 +2,6 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ -use aws_smithy_runtime_api::client::behavior_version::BehaviorVersion; -#[cfg(feature = "default-https-client")] -use aws_smithy_runtime_api::client::http::SharedHttpClient; /// Interceptor for connection poisoning. pub mod connection_poisoning; @@ -55,41 +52,3 @@ pub mod hyper_014 { /// HTTP body and body-wrapper types pub mod body; - -// NOTE: We created default client options to evolve defaults over time (e.g. allow passing a different DNS resolver) -/// Configuration options for the default HTTPS client -#[derive(Debug, Clone)] -pub(crate) struct DefaultClientOptions { - _behavior_version: BehaviorVersion, -} - -impl Default for DefaultClientOptions { - fn default() -> Self { - DefaultClientOptions { - _behavior_version: BehaviorVersion::latest(), - } - } -} - -impl DefaultClientOptions { - /// Set the behavior version to use - #[allow(unused)] - pub(crate) fn with_behavior_version(mut self, behavior_version: BehaviorVersion) -> Self { - self._behavior_version = behavior_version; - self - } -} - -/// Creates an HTTPS client using the default TLS provider -#[cfg(feature = "default-https-client")] -pub(crate) fn default_https_client(_options: DefaultClientOptions) -> Option { - use aws_smithy_http_client::{tls, Builder}; - tracing::trace!("creating a new default hyper 1.x client using rustls"); - Some( - Builder::new() - .tls_provider(tls::Provider::Rustls( - tls::rustls_provider::CryptoMode::AwsLc, - )) - .build_https(), - ) -}