review:fix: headers are case-insensitive

Signed-off-by: Marc Nuri <[email protected]>

Author: manusa

CHANGELOG.md

@@ -7,7 +7,7 @@
 * Fix #6906: Knative VolatileTime should be serialized as String
 * Fix #6930: Add support for Boolean enums in the java-generator
 * Fix #6886: Remove invalid JUnit 4 references
-* Fix #6917: Fabric 8 client does not authenticate correctly on openshift if the returned Location header is lower case
+* Fix #6917: Client does not authenticate correctly on OpenShift if the returned Location header is lower-case
 
 #### Improvements
 * Fix #6863: ensuring SerialExecutor does not throw RejectedExecutionException to prevent unnecessary error logs

httpclient-vertx/src/main/java/io/fabric8/kubernetes/client/vertx/VertxHttpRequest.java

@@ -16,7 +16,6 @@
 package io.fabric8.kubernetes.client.vertx;
 
 import io.fabric8.kubernetes.client.http.AsyncBody;
-import io.fabric8.kubernetes.client.http.HttpRequest;
 import io.fabric8.kubernetes.client.http.HttpResponse;
 import io.fabric8.kubernetes.client.http.StandardHttpRequest;
 import io.fabric8.kubernetes.client.http.StandardHttpRequest.BodyContent;
@@ -34,54 +33,11 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 
 class VertxHttpRequest {
 
-  private static final class VertxHttpResponse implements HttpResponse<AsyncBody> {
-    private final AsyncBody result;
-    private final HttpClientResponse resp;
-    private final HttpRequest request;
-
-    private VertxHttpResponse(AsyncBody result, HttpClientResponse resp, HttpRequest request) {
-      this.result = result;
-      this.resp = resp;
-      this.request = request;
-    }
-
-    @Override
-    public int code() {
-      return resp.statusCode();
-    }
-
-    @Override
-    public AsyncBody body() {
-      return result;
-    }
-
-    @Override
-    public HttpRequest request() {
-      return request;
-    }
-
-    @Override
-    public Optional<HttpResponse<?>> previousResponse() {
-      return Optional.empty();
-    }
-
-    @Override
-    public List<String> headers(String key) {
-      return resp.headers().getAll(key);
-    }
-
-    @Override
-    public Map<String, List<String>> headers() {
-      return toHeadersMap(resp.headers());
-    }
-  }
-
   final Vertx vertx;
   private final RequestOptions options;
   private final StandardHttpRequest request;

httpclient-vertx/src/main/java/io/fabric8/kubernetes/client/vertx/VertxHttpResponse.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.client.vertx;
+
+import io.fabric8.kubernetes.client.http.AsyncBody;
+import io.fabric8.kubernetes.client.http.HttpRequest;
+import io.fabric8.kubernetes.client.http.HttpResponse;
+import io.fabric8.kubernetes.client.http.StandardHttpHeaders;
+import io.vertx.core.http.HttpClientResponse;
+
+import java.util.Optional;
+
+public class VertxHttpResponse extends StandardHttpHeaders implements HttpResponse<AsyncBody> {
+  private final AsyncBody result;
+  private final HttpClientResponse resp;
+  private final HttpRequest request;
+
+  VertxHttpResponse(AsyncBody result, HttpClientResponse resp, HttpRequest request) {
+    super(VertxHttpRequest.toHeadersMap(resp.headers()));
+    this.result = result;
+    this.resp = resp;
+    this.request = request;
+  }
+
+  @Override
+  public int code() {
+    return resp.statusCode();
+  }
+
+  @Override
+  public AsyncBody body() {
+    return result;
+  }
+
+  @Override
+  public HttpRequest request() {
+    return request;
+  }
+
+  @Override
+  public Optional<HttpResponse<?>> previousResponse() {
+    return Optional.empty();
+  }
+
+}

kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/http/HttpHeaders.java

@@ -23,9 +23,12 @@ public interface HttpHeaders {
 
   /**
    * Returns a List of all the Header String values for the provided key/name.
+   * <p>
+   * key is case-insensitive as defined in RFC 2616.
    *
    * @param key The header key/name for which to provide the values.
    * @return the List of header values for the provided key.
+   * @see <a href="https://datatracker.ietf.org/doc/html/rfc2616#section-4.2">RFC 2616 Section 4.2</a>
    */
   List<String> headers(String key);
 

kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/http/StandardHttpHeaders.java

@@ -41,7 +41,12 @@ public StandardHttpHeaders(Map<String, List<String>> headers) {
 
   @Override
   public List<String> headers(String key) {
-    return Collections.unmodifiableList(headers.getOrDefault(key, Collections.emptyList()));
+    for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+      if (entry.getKey().equalsIgnoreCase(key)) {
+        return Collections.unmodifiableList(entry.getValue());
+      }
+    }
+    return Collections.emptyList();
   }
 
   @Override