Implement feedback

Author: SamRemis

packages/aws-sdk-signers/src/aws_sdk_signers/signers.py

@@ -218,6 +218,9 @@ def _apply_required_fields(
             request.fields.set_field(
                 Field(name="X-Amz-Security-Token", values=[identity.session_token])
             )
+        if "host" not in request.fields:
+            host = self._normalize_host_field(uri=request.destination)
+            request.fields.set_field(Field(name="host", values=[host]))
 
     def canonical_request(
         self, *, signing_properties: SigV4SigningProperties, request: AWSRequest
@@ -335,11 +338,6 @@ def _normalize_signing_fields(self, *, request: AWSRequest) -> dict[str, str]:
             for field in request.fields
             if self._is_signable_header(field.name.lower())
         }
-        if "host" not in normalized_fields:
-            normalized_fields["host"] = self._normalize_host_field(
-                uri=request.destination  # type: ignore - TODO(pyright)
-            )
-
         return dict(sorted(normalized_fields.items()))
 
     def _is_signable_header(self, field_name: str):
@@ -352,7 +350,10 @@ def _normalize_host_field(self, *, uri: URI) -> str:
             uri_dict = uri.to_dict()
             uri_dict.update({"port": None})
             uri = URI(**uri_dict)
-        return uri.netloc
+        host_header = uri.hostname
+        if port := uri.port:
+            host_header += f":{port}"
+        return host_header
 
     def _format_canonical_fields(self, *, fields: dict[str, str]) -> str:
         return "".join(
@@ -601,6 +602,9 @@ async def _apply_required_fields(
             request.fields.set_field(
                 Field(name="X-Amz-Security-Token", values=[identity.session_token])
             )
+        if "host" not in request.fields:
+            host = await self._normalize_host_field(uri=request.destination)
+            request.fields.set_field(Field(name="host", values=[host]))
 
     async def canonical_request(
         self, *, signing_properties: SigV4SigningProperties, request: AWSRequest
@@ -721,10 +725,6 @@ async def _normalize_signing_fields(self, *, request: AWSRequest) -> dict[str, s
             for field in request.fields
             if self._is_signable_header(field.name.lower())
         }
-        if "host" not in normalized_fields:
-            normalized_fields["host"] = await self._normalize_host_field(
-                uri=request.destination  # type: ignore - TODO(pyright)
-            )
 
         return dict(sorted(normalized_fields.items()))
 
@@ -738,7 +738,10 @@ async def _normalize_host_field(self, *, uri: URI) -> str:
             uri_dict = uri.to_dict()
             uri_dict.update({"port": None})
             uri = URI(**uri_dict)
-        return uri.netloc
+        host_header = uri.hostname
+        if port := uri.port:
+            host_header += f":{port}"
+        return host_header
 
     async def _format_canonical_fields(self, *, fields: dict[str, str]) -> str:
         return "".join(

packages/smithy-http/src/smithy_http/aio/crt.py

@@ -272,9 +272,10 @@ def _marshal_request(
         :py:class:`smithy_http.aio.HTTPRequest`"""
         headers_list: list[tuple[str, str]] = []
         if "host" not in request.fields:
-            request.fields.set_field(
-                Field(name="host", values=[request.destination.netloc])
-            )
+            host_header = request.destination.hostname
+            if port := request.destination.port:
+                host_header += f":{port}"
+            request.fields.set_field(Field(name="host", values=[host_header]))
 
         if "accept" not in request.fields:
             request.fields.set_field(Field(name="accept", values=["*/*"]))