[smithy-rs] Rollup of 2 commits

Includes commits:
  ec429200 Add `generateBuildEnvironmentConstants` as a dependency of `sourcesJar` (#4005)
  771f7173 Fix Sigv4 signing bug for endpoints with default ports (#4006)

Co-authored-by: Landon James <[email protected]>
Co-authored-by: Shahar Naveh <[email protected]>

Author: 3 people

sdk/aws-runtime/Cargo.toml

@@ -38,7 +38,7 @@ version = "1.2.1"
 [dependencies.aws-sigv4]
 path = "../aws-sigv4"
 features = ["http0-compat"]
-version = "1.2.8"
+version = "1.2.9"
 
 [dependencies.aws-smithy-async]
 path = "../aws-smithy-async"

sdk/aws-sigv4/Cargo.toml

@@ -10,7 +10,7 @@ required-features = ["sigv4a"]
 
 [package]
 name = "aws-sigv4"
-version = "1.2.8"
+version = "1.2.9"
 authors = ["AWS Rust SDK Team <[email protected]>", "David Barsky <[email protected]>"]
 description = "SigV4 signer for HTTP requests and Event Stream messages."
 edition = "2021"

sdk/aws-sigv4/src/http_request/canonical_request.rs

@@ -16,6 +16,7 @@ use crate::sign::v4::sha256_hex_string;
 use crate::SignatureVersion;
 use aws_smithy_http::query_writer::QueryWriter;
 use http0::header::{AsHeaderName, HeaderName, HOST};
+use http0::uri::{Port, Scheme};
 use http0::{HeaderMap, HeaderValue, Uri};
 use std::borrow::Cow;
 use std::cmp::Ordering;
@@ -389,10 +390,28 @@ impl<'a> CanonicalRequest<'a> {
         match canonical_headers.get(&HOST) {
             Some(header) => header.clone(),
             None => {
+                let port = uri.port();
+                let scheme = uri.scheme();
                 let authority = uri
                     .authority()
-                    .expect("request uri authority must be set for signing");
-                let header = HeaderValue::try_from(authority.as_str())
+                    .expect("request uri authority must be set for signing")
+                    .as_str();
+                let host = uri
+                    .host()
+                    .expect("request uri host must be set for signing");
+
+                // Check if port is default (80 for HTTP, 443 for HTTPS) and if so exclude it from the
+                // Host header when signing since RFC 2616 indicates that the default port should not be
+                // sent in the Host header (and Hyper strips default ports if they are present)
+                // https://datatracker.ietf.org/doc/html/rfc2616#section-14.23
+                // https://github.com/awslabs/aws-sdk-rust/issues/1244
+                let header_value = if is_port_scheme_default(scheme, port) {
+                    host
+                } else {
+                    authority
+                };
+
+                let header = HeaderValue::try_from(header_value)
                     .expect("endpoint must contain valid header characters");
                 canonical_headers.insert(HOST, header.clone());
                 header
@@ -475,6 +494,15 @@ fn normalize_header_value(header_value: &str) -> Result<HeaderValue, CanonicalRe
     HeaderValue::from_str(&trimmed_value).map_err(CanonicalRequestError::from)
 }
 
+#[inline]
+fn is_port_scheme_default(scheme: Option<&Scheme>, port: Option<Port<&str>>) -> bool {
+    if let (Some(scheme), Some(port)) = (scheme, port) {
+        return [("http", "80"), ("https", "443")].contains(&(scheme.as_str(), port.as_str()));
+    }
+
+    false
+}
+
 #[derive(Debug, PartialEq, Default)]
 pub(crate) struct SignedHeaders {
     headers: Vec<CanonicalHeaderName>,
@@ -692,6 +720,40 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_host_header_properly_handles_ports() {
+        fn host_header_test_setup(endpoint: String) -> String {
+            let mut req = test::v4::test_request("get-vanilla");
+            req.uri = endpoint;
+            let req = SignableRequest::from(&req);
+            let settings = SigningSettings {
+                payload_checksum_kind: PayloadChecksumKind::XAmzSha256,
+                session_token_mode: SessionTokenMode::Exclude,
+                ..Default::default()
+            };
+            let identity = Credentials::for_tests().into();
+            let signing_params = signing_params(&identity, settings);
+            let creq = CanonicalRequest::from(&req, &signing_params).unwrap();
+            creq.header_values_for("host")
+        }
+
+        // HTTP request with 80 port should not be signed with that port
+        let http_80_host_header = host_header_test_setup("http://localhost:80".into());
+        assert_eq!(http_80_host_header, "localhost",);
+
+        // HTTP request with non-80 port should be signed with that port
+        let http_1234_host_header = host_header_test_setup("http://localhost:1234".into());
+        assert_eq!(http_1234_host_header, "localhost:1234",);
+
+        // HTTPS request with 443 port should not be signed with that port
+        let https_443_host_header = host_header_test_setup("https://localhost:443".into());
+        assert_eq!(https_443_host_header, "localhost",);
+
+        // HTTPS request with non-443 port should be signed with that port
+        let https_1234_host_header = host_header_test_setup("https://localhost:1234".into());
+        assert_eq!(https_1234_host_header, "localhost:1234",);
+    }
+
     #[test]
     fn test_set_xamz_sha_256() {
         let req = test::v4::test_request("get-vanilla-query-order-key-case");

sdk/dsql/Cargo.toml

@@ -24,7 +24,7 @@ version = "1.5.5"
 
 [dependencies.aws-sigv4]
 path = "../aws-sigv4"
-version = "1.2.8"
+version = "1.2.9"
 
 [dependencies.aws-smithy-async]
 path = "../aws-smithy-async"

sdk/ebs/Cargo.toml

@@ -24,7 +24,7 @@ version = "1.5.5"
 
 [dependencies.aws-sigv4]
 path = "../aws-sigv4"
-version = "1.2.8"
+version = "1.2.9"
 
 [dependencies.aws-smithy-async]
 path = "../aws-smithy-async"

sdk/glacier/Cargo.toml

@@ -24,7 +24,7 @@ version = "1.5.5"
 
 [dependencies.aws-sigv4]
 path = "../aws-sigv4"
-version = "1.2.8"
+version = "1.2.9"
 
 [dependencies.aws-smithy-async]
 path = "../aws-smithy-async"

sdk/lexruntime/Cargo.toml

@@ -24,7 +24,7 @@ version = "1.5.5"
 
 [dependencies.aws-sigv4]
 path = "../aws-sigv4"
-version = "1.2.8"
+version = "1.2.9"
 
 [dependencies.aws-smithy-async]
 path = "../aws-smithy-async"

sdk/lexruntimev2/Cargo.toml

@@ -25,7 +25,7 @@ version = "1.5.5"
 
 [dependencies.aws-sigv4]
 path = "../aws-sigv4"
-version = "1.2.8"
+version = "1.2.9"
 
 [dependencies.aws-smithy-async]
 path = "../aws-smithy-async"

sdk/mediastoredata/Cargo.toml

@@ -24,7 +24,7 @@ version = "1.5.5"
 
 [dependencies.aws-sigv4]
 path = "../aws-sigv4"
-version = "1.2.8"
+version = "1.2.9"
 
 [dependencies.aws-smithy-async]
 path = "../aws-smithy-async"

sdk/omics/Cargo.toml

@@ -24,7 +24,7 @@ version = "1.5.5"
 
 [dependencies.aws-sigv4]
 path = "../aws-sigv4"
-version = "1.2.8"
+version = "1.2.9"
 
 [dependencies.aws-smithy-async]
 path = "../aws-smithy-async"