duplicate and rename mutual SPNEGO related classes

apache · Oct 1, 2024 · d99f274 · d99f274
1 parent 1a7f0e0
commit d99f274
Show file tree

Hide file tree

Showing 9 changed files with 639 additions and 167 deletions.
diff --git a/...lient5/testing/sync/TestSPNegoScheme.java → .../testing/sync/TestMutualSpnegoScheme.java b/...lient5/testing/sync/TestSPNegoScheme.java → .../testing/sync/TestMutualSpnegoScheme.java
@@ -49,7 +49,7 @@
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy;
 import org.apache.hc.client5.http.impl.auth.CredentialsProviderBuilder;
-import org.apache.hc.client5.http.impl.auth.SPNegoScheme;
+import org.apache.hc.client5.http.impl.auth.MutualSpnegoScheme;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.http.utils.Base64;
 import org.apache.hc.client5.testing.extension.sync.ClientProtocolLevel;
@@ -80,9 +80,9 @@
 /**
  * Tests for {@link SPNegoScheme}.
  */
-public class TestSPNegoScheme extends AbstractIntegrationTestBase {
+public class TestMutualSpnegoScheme extends AbstractIntegrationTestBase {
 
-    protected TestSPNegoScheme() {
+    protected TestMutualSpnegoScheme() {
         super(URIScheme.HTTP, ClientProtocolLevel.STANDARD);
     }
 
@@ -191,7 +191,7 @@ public void handle(
      * Kerberos configuration.
      *
      */
-    private static class NegotiateSchemeWithMockGssManager extends SPNegoScheme {
+    private static class NegotiateSchemeWithMockGssManager extends MutualSpnegoScheme {
 
         final GSSManager manager = Mockito.mock(GSSManager.class);
         final GSSName name = Mockito.mock(GSSName.class);
@@ -218,7 +218,7 @@ protected GSSManager getManager() {
 
     }
 
-    private static class MutualNegotiateSchemeWithMockGssManager extends SPNegoScheme {
+    private static class MutualNegotiateSchemeWithMockGssManager extends MutualSpnegoScheme {
 
         final GSSManager manager = Mockito.mock(GSSManager.class);
         final GSSName name = Mockito.mock(GSSName.class);

diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosScheme.java
@@ -41,8 +41,10 @@
  *
  * @since 4.2
  *
- * @deprecated Do not use. Consider using Spengo, Basic or Bearer authentication with TLS instead.
+ * @deprecated Do not use. The Kerberos authentication scheme was never standardised.
+ * Use {@link MutualSpnegoScheme} or some other scheme instead.
  *
+ * @see MutualSpnegoScheme
  * @see BasicScheme
  * @see BearerScheme
  */

diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/KerberosSchemeFactory.java
@@ -45,9 +45,10 @@
  *
  * @since 4.2
  *
- * @deprecated Do not use. The GGS based experimental authentication schemes are no longer
- * supported. Consider using Basic or Bearer authentication with TLS instead.
+ * @deprecated Do not use. The Kerberos authentication scheme was never standardised.
+ * Use {@link MutualSpnegoScheme} or some other scheme instead.
  *
+ * @see MutualSpnegoSchemeFactory
  * @see BasicSchemeFactory
  * @see BearerSchemeFactory
  */