HTTPCLIENT-1625 Completely overhaul GSS-API-based authentication backend

apache · Sep 6, 2024 · 7e9f619 · 7e9f619
1 parent 25f080f
commit 7e9f619
Show file tree

Hide file tree

Showing 23 changed files with 1,032 additions and 195 deletions.
diff --git a/...rc/test/java/org/apache/hc/client5/testing/extension/async/StandardTestClientBuilder.java b/...rc/test/java/org/apache/hc/client5/testing/extension/async/StandardTestClientBuilder.java
@@ -33,6 +33,7 @@
 import org.apache.hc.client5.http.HttpRequestRetryStrategy;
 import org.apache.hc.client5.http.UserTokenHandler;
 import org.apache.hc.client5.http.auth.AuthSchemeFactory;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.TlsConfig;
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
@@ -153,6 +154,12 @@ public TestAsyncClientBuilder setDefaultAuthSchemeRegistry(final Lookup<AuthSche
         return this;
     }
 
+    @Override
+    public TestAsyncClientBuilder setDefaultCredentialsProvider(final CredentialsProvider credentialsProvider) {
+        this.clientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+        return this;
+    }
+
     @Override
     public TestAsyncClient build() throws Exception {
         final PoolingAsyncClientConnectionManager connectionManager = connectionManagerBuilder

diff --git a/...g/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncClientBuilder.java b/...g/src/test/java/org/apache/hc/client5/testing/extension/async/TestAsyncClientBuilder.java
@@ -33,6 +33,7 @@
 import org.apache.hc.client5.http.HttpRequestRetryStrategy;
 import org.apache.hc.client5.http.UserTokenHandler;
 import org.apache.hc.client5.http.auth.AuthSchemeFactory;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
 import org.apache.hc.client5.http.config.TlsConfig;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpRequestInterceptor;
@@ -101,6 +102,10 @@ default TestAsyncClientBuilder setDefaultAuthSchemeRegistry(Lookup<AuthSchemeFac
         throw new UnsupportedOperationException("Operation not supported by " + getProtocolLevel());
     }
 
+    default TestAsyncClientBuilder setDefaultCredentialsProvider(CredentialsProvider credentialsProvider) {
+        throw new UnsupportedOperationException("Operation not supported by " + getProtocolLevel());
+    }
+
     TestAsyncClient build() throws Exception;
 
 }
diff --git a/...src/test/java/org/apache/hc/client5/testing/extension/sync/StandardTestClientBuilder.java b/...src/test/java/org/apache/hc/client5/testing/extension/sync/StandardTestClientBuilder.java
@@ -33,6 +33,7 @@
 import org.apache.hc.client5.http.HttpRequestRetryStrategy;
 import org.apache.hc.client5.http.UserTokenHandler;
 import org.apache.hc.client5.http.auth.AuthSchemeFactory;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
 import org.apache.hc.client5.http.classic.ExecChainHandler;
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -150,6 +151,12 @@ public TestClientBuilder addExecInterceptorLast(final String name, final ExecCha
         return this;
     }
 
+    @Override
+    public TestClientBuilder setDefaultCredentialsProvider(final CredentialsProvider credentialsProvider) {
+        this.clientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+        return this;
+    }
+
     @Override
     public TestClient build() throws Exception {
         final HttpClientConnectionManager connectionManagerCopy = connectionManager != null ? connectionManager :

diff --git a/...testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientBuilder.java b/...testing/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientBuilder.java
@@ -33,6 +33,7 @@
 import org.apache.hc.client5.http.HttpRequestRetryStrategy;
 import org.apache.hc.client5.http.UserTokenHandler;
 import org.apache.hc.client5.http.auth.AuthSchemeFactory;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
 import org.apache.hc.client5.http.classic.ExecChainHandler;
 import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.core5.http.Header;
@@ -94,7 +95,11 @@ default TestClientBuilder addExecInterceptorFirst(String name, ExecChainHandler
         throw new UnsupportedOperationException("Operation not supported by " + getProtocolLevel());
     }
 
-    default TestClientBuilder  addExecInterceptorLast(String name, ExecChainHandler interceptor) {
+    default TestClientBuilder addExecInterceptorLast(String name, ExecChainHandler interceptor) {
+        throw new UnsupportedOperationException("Operation not supported by " + getProtocolLevel());
+    }
+
+    default TestClientBuilder setDefaultCredentialsProvider(CredentialsProvider credentialsProvider) {
         throw new UnsupportedOperationException("Operation not supported by " + getProtocolLevel());
     }
 

diff --git a/...sting/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientResources.java b/...sting/src/test/java/org/apache/hc/client5/testing/extension/sync/TestClientResources.java
@@ -75,14 +75,17 @@ public void afterEach(final ExtensionContext extensionContext) {
 
         if (client != null) {
             client.close(CloseMode.GRACEFUL);
+//            client = null;
         }
 
         if (connManager != null) {
             connManager.close(CloseMode.IMMEDIATE);
+//            connManager = null;
         }
 
         if (server != null) {
             server.shutdown(CloseMode.IMMEDIATE);
+//            server = null;
         }
     }