Filter :status from HttpClient headers

Author: mtdowling

client/client-http/src/main/java/software/amazon/smithy/java/client/http/JavaHttpClientTransport.java

@@ -14,6 +14,7 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpConnectTimeoutException;
 import java.time.Duration;
+import java.util.HashMap;
 import software.amazon.smithy.java.client.core.ClientTransport;
 import software.amazon.smithy.java.client.core.ClientTransportFactory;
 import software.amazon.smithy.java.client.core.MessageExchange;
@@ -170,8 +171,10 @@ private HttpResponse sendRequest(java.net.http.HttpRequest request) {
         }
     }
 
-    private HttpResponse createSmithyResponse(java.net.http.HttpResponse<InputStream> response) {
-        var headerMap = response.headers().map();
+    // package-private for testing
+    HttpResponse createSmithyResponse(java.net.http.HttpResponse<InputStream> response) {
+        var headerMap = new HashMap<>(response.headers().map());
+        headerMap.remove(":status");
         LOGGER.trace("Got response: {}; headers: {}", response, headerMap);
 
         var headers = HttpHeaders.of(headerMap);

client/client-http/src/test/java/software/amazon/smithy/java/client/http/JavaHttpClientTest.java

@@ -10,9 +10,20 @@
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.net.ssl.SSLSession;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -91,4 +102,59 @@ public void automaticallyAppliesUserAgentPlugin() throws URISyntaxException {
         // the interceptor is package-private, so this check will suffice.
         assertThat(config.interceptors().toString(), containsString("UserAgentPlugin"));
     }
+
+    @Test
+    public void filtersStatusPseudoHeaderFromResponse() throws Exception {
+        // Create a fake Java HttpResponse with :status pseudo-header
+        var fakeResponse = new HttpResponse<InputStream>() {
+            @Override
+            public int statusCode() {
+                return 200;
+            }
+
+            @Override
+            public HttpHeaders headers() {
+                return HttpHeaders.of(
+                        Map.of(":status", List.of("200"), "content-type", List.of("application/json")),
+                        (k, v) -> true);
+            }
+
+            @Override
+            public InputStream body() {
+                return new ByteArrayInputStream(new byte[0]);
+            }
+
+            @Override
+            public HttpClient.Version version() {
+                return HttpClient.Version.HTTP_2;
+            }
+
+            @Override
+            public HttpRequest request() {
+                return null;
+            }
+
+            @Override
+            public Optional<HttpResponse<InputStream>> previousResponse() {
+                return Optional.empty();
+            }
+
+            @Override
+            public Optional<SSLSession> sslSession() {
+                return Optional.empty();
+            }
+
+            @Override
+            public URI uri() {
+                return URI.create("http://localhost/test");
+            }
+        };
+
+        var transport = new JavaHttpClientTransport();
+        var response = transport.createSmithyResponse(fakeResponse);
+
+        assertFalse(response.headers().map().containsKey(":status"),
+                "Response headers should not contain :status pseudo-header");
+        assertThat(response.headers().firstValue("content-type"), equalTo("application/json"));
+    }
 }