You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by mi...@apache.org on 2020/01/01 21:51:48 UTC
[httpcomponents-client] branch authschemename-rework updated
(bace403 -> 3730b03)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch authschemename-rework
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git.
omit bace403 Rename AuthSchemes enum to StandardAuthSchemes final class
omit 2f3d293 Properly distinguish between AuthScheme and auth scheme name
add eaa8c5f [HTTPCLIENT-2043] Rename classes documented as factories from *Provider to *Factory (#194)
add 711672a HTTPCLIENT-2043: Rename classes documented as factories from *Provider #194.
add 3fd383f [HTTPCLIENT-2044] Don't create stateless/immutable factory objects
add 56463de MIME code cleanup and class renaming (no functional changes)
add 54a341e Simplified MIME multipart generation modes (legacy, strict and extended)
new 634886a [HTTPCLIENT-2046] Rename AuthSchemes enum to StandardAuthScheme final class
new 3730b03 Properly distinguish between AuthScheme and auth scheme name
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (bace403)
\
N -- N -- N refs/heads/authschemename-rework (3730b03)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASE_NOTES.txt | 11 ++-
.../http/impl/cache/TestCachingExecChain.java | 6 +-
.../impl/cache/TestProtocolRecommendations.java | 4 +-
.../http/impl/cache/TestProtocolRequirements.java | 8 +--
.../http/impl/cache/TestResponseCachingPolicy.java | 30 ++++-----
.../async/AuthenticatingAsyncDecorator.java | 4 +-
.../testing/auth/BasicAuthTokenExtractor.java | 4 +-
.../testing/classic/AuthenticatingDecorator.java | 4 +-
.../AbstractHttpAsyncClientAuthentication.java | 12 ++--
.../testing/async/TestH2ClientAuthentication.java | 4 +-
.../async/TestHttp1ClientAuthentication.java | 4 +-
.../testing/sync/TestClientAuthentication.java | 8 +--
.../sync/TestClientAuthenticationFakeNTLM.java | 10 +--
.../hc/client5/testing/sync/TestSPNegoScheme.java | 22 +++---
.../testing/sync/TestWindowsNegotiateScheme.java | 12 ++--
.../hc/client5/http/impl/win/WinHttpClients.java | 14 ++--
.../http/impl/win/WindowsNTLMSchemeFactory.java | 15 +++--
.../http/impl/win/WindowsNegotiateScheme.java | 4 +-
.../impl/win/WindowsNegotiateSchemeFactory.java | 15 +++--
...hSchemeProvider.java => AuthSchemeFactory.java} | 2 +-
...ardAuthSchemes.java => StandardAuthScheme.java} | 6 +-
...kieSpecProvider.java => CookieSpecFactory.java} | 2 +-
.../http/entity/mime/AbstractMultipartFormat.java | 8 +--
.../http/entity/mime/FormBodyPartBuilder.java | 24 +++----
.../apache/hc/client5/http/entity/mime/Header.java | 34 +++++-----
.../http/entity/mime/HttpMultipartMode.java | 31 +++++++--
.../http/entity/mime/HttpRFC6532Multipart.java | 9 +--
.../http/entity/mime/HttpRFC7578Multipart.java | 78 ++++++++++------------
.../http/entity/mime/HttpStrictMultipart.java | 9 +--
...mpatibleMultipart.java => LegacyMultipart.java} | 8 +--
.../entity/mime/{MIME.java => MimeConsts.java} | 6 +-
.../mime/{MinimalField.java => MimeField.java} | 8 +--
.../http/entity/mime/MultipartEntityBuilder.java | 28 ++++----
.../hc/client5/http/entity/mime/MultipartPart.java | 4 +-
.../http/entity/mime/MultipartPartBuilder.java | 16 ++---
.../apache/hc/client5/http/impl/AuthSupport.java | 4 +-
.../hc/client5/http/impl/CookieSpecSupport.java | 26 ++++----
.../http/impl/DefaultAuthenticationStrategy.java | 22 +++---
.../http/impl/async/H2AsyncClientBuilder.java | 34 +++++-----
.../http/impl/async/HttpAsyncClientBuilder.java | 34 +++++-----
.../async/InternalAbstractHttpAsyncClient.java | 12 ++--
.../http/impl/async/InternalH2AsyncClient.java | 8 +--
.../http/impl/async/InternalHttpAsyncClient.java | 8 +--
.../hc/client5/http/impl/auth/BasicScheme.java | 6 +-
.../client5/http/impl/auth/BasicSchemeFactory.java | 11 ++-
.../hc/client5/http/impl/auth/DigestScheme.java | 6 +-
.../http/impl/auth/DigestSchemeFactory.java | 11 ++-
.../hc/client5/http/impl/auth/GGSSchemeBase.java | 4 +-
.../hc/client5/http/impl/auth/KerberosScheme.java | 4 +-
.../http/impl/auth/KerberosSchemeFactory.java | 13 +++-
.../hc/client5/http/impl/auth/NTLMEngineImpl.java | 6 +-
.../hc/client5/http/impl/auth/NTLMScheme.java | 6 +-
.../client5/http/impl/auth/NTLMSchemeFactory.java | 11 ++-
.../hc/client5/http/impl/auth/SPNegoScheme.java | 4 +-
.../http/impl/auth/SPNegoSchemeFactory.java | 13 +++-
.../auth/SystemDefaultCredentialsProvider.java | 4 +-
.../http/impl/classic/HttpClientBuilder.java | 32 +++++----
.../http/impl/classic/InternalHttpClient.java | 12 ++--
.../hc/client5/http/impl/classic/ProxyClient.java | 22 +++---
...cProvider.java => IgnoreCookieSpecFactory.java} | 10 +--
.../{IgnoreSpec.java => IgnoreSpecSpec.java} | 2 +-
...Provider.java => RFC6265CookieSpecFactory.java} | 12 ++--
.../client5/http/protocol/HttpClientContext.java | 20 +++---
.../client5/http/protocol/RequestAddCookies.java | 6 +-
.../hc/client5/http/auth/TestAuthChallenge.java | 12 ++--
.../hc/client5/http/config/TestRequestConfig.java | 10 +--
.../http/entity/mime/TestFormBodyPartBuilder.java | 52 +++++++--------
.../entity/mime/TestMultipartEntityBuilder.java | 12 ++--
.../http/entity/mime/TestMultipartForm.java | 2 +-
.../http/entity/mime/TestMultipartMixed.java | 2 +-
.../http/entity/mime/TestMultipartPartBuilder.java | 42 ++++++------
.../client5/http/examples/ClientConfiguration.java | 6 +-
.../examples/ClientCustomPublicSuffixList.java | 8 +--
.../http/impl/TestAuthenticationStrategy.java | 30 ++++-----
.../http/impl/auth/TestAuthChallengeParser.java | 18 ++---
.../impl/auth/TestBasicCredentialsProvider.java | 8 +--
.../hc/client5/http/impl/auth/TestBasicScheme.java | 16 ++---
.../client5/http/impl/auth/TestDigestScheme.java | 56 ++++++++--------
.../http/impl/auth/TestHttpAuthenticator.java | 62 ++++++++---------
.../auth/TestSystemDefaultCredentialsProvider.java | 10 +--
.../client5/http/impl/classic/TestConnectExec.java | 6 +-
.../http/impl/classic/TestInternalHttpClient.java | 12 ++--
.../http/impl/classic/TestProtocolExec.java | 8 +--
.../http/protocol/TestRequestAddCookies.java | 20 +++---
84 files changed, 622 insertions(+), 597 deletions(-)
rename httpclient5/src/main/java/org/apache/hc/client5/http/auth/{AuthSchemeProvider.java => AuthSchemeFactory.java} (97%)
rename httpclient5/src/main/java/org/apache/hc/client5/http/auth/{StandardAuthSchemes.java => StandardAuthScheme.java} (92%)
rename httpclient5/src/main/java/org/apache/hc/client5/http/cookie/{CookieSpecProvider.java => CookieSpecFactory.java} (97%)
rename httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/{HttpBrowserCompatibleMultipart.java => LegacyMultipart.java} (90%)
rename httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/{MIME.java => MimeConsts.java} (96%)
rename httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/{MinimalField.java => MimeField.java} (92%)
rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/{IgnoreSpecProvider.java => IgnoreCookieSpecFactory.java} (86%)
rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/{IgnoreSpec.java => IgnoreSpecSpec.java} (97%)
rename httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/{RFC6265CookieSpecProvider.java => RFC6265CookieSpecFactory.java} (93%)
[httpcomponents-client] 01/02: [HTTPCLIENT-2046] Rename AuthSchemes
enum to StandardAuthScheme final class
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch authschemename-rework
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit 634886ab614df150a07f8328f21bdbfc5a3692d7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Jan 1 09:49:56 2020 -0500
[HTTPCLIENT-2046] Rename AuthSchemes enum to StandardAuthScheme final class
Modeled after StandardCharsets, the new class indicates a non-exhaustive
list of standard auth schemes by name supported by the HttpClient. The
previous enum suffered from two issues:
* it was exhaustive implying that no more auth schemes can be supported
* its sole purpose was to contain an id for the declared auth scheme;
the enum values theirselves were never used directly
This closes #196
---
.../http/impl/cache/TestCachingExecChain.java | 6 +--
.../impl/cache/TestProtocolRecommendations.java | 4 +-
.../http/impl/cache/TestProtocolRequirements.java | 8 ++--
.../http/impl/cache/TestResponseCachingPolicy.java | 30 ++++++------
.../async/AuthenticatingAsyncDecorator.java | 4 +-
.../testing/auth/BasicAuthTokenExtractor.java | 4 +-
.../testing/classic/AuthenticatingDecorator.java | 4 +-
.../AbstractHttpAsyncClientAuthentication.java | 4 +-
.../testing/sync/TestClientAuthentication.java | 4 +-
.../sync/TestClientAuthenticationFakeNTLM.java | 10 ++--
.../hc/client5/testing/sync/TestSPNegoScheme.java | 8 ++--
.../testing/sync/TestWindowsNegotiateScheme.java | 8 ++--
.../hc/client5/http/impl/win/WinHttpClients.java | 10 ++--
.../http/impl/win/WindowsNTLMSchemeFactory.java | 4 +-
.../http/impl/win/WindowsNegotiateScheme.java | 4 +-
.../impl/win/WindowsNegotiateSchemeFactory.java | 4 +-
.../{AuthSchemes.java => StandardAuthScheme.java} | 28 +++++------
.../apache/hc/client5/http/impl/AuthSupport.java | 4 +-
.../http/impl/DefaultAuthenticationStrategy.java | 12 ++---
.../http/impl/async/H2AsyncClientBuilder.java | 12 ++---
.../http/impl/async/HttpAsyncClientBuilder.java | 12 ++---
.../hc/client5/http/impl/auth/BasicScheme.java | 6 +--
.../hc/client5/http/impl/auth/DigestScheme.java | 6 +--
.../hc/client5/http/impl/auth/GGSSchemeBase.java | 4 +-
.../hc/client5/http/impl/auth/KerberosScheme.java | 4 +-
.../hc/client5/http/impl/auth/NTLMScheme.java | 6 +--
.../hc/client5/http/impl/auth/SPNegoScheme.java | 4 +-
.../auth/SystemDefaultCredentialsProvider.java | 27 ++---------
.../http/impl/classic/HttpClientBuilder.java | 12 ++---
.../hc/client5/http/impl/classic/ProxyClient.java | 12 ++---
.../hc/client5/http/auth/TestAuthChallenge.java | 12 ++---
.../hc/client5/http/config/TestRequestConfig.java | 10 ++--
.../client5/http/examples/ClientConfiguration.java | 6 +--
.../http/impl/TestAuthenticationStrategy.java | 24 +++++-----
.../http/impl/auth/TestAuthChallengeParser.java | 18 +++----
.../impl/auth/TestBasicCredentialsProvider.java | 8 ++--
.../hc/client5/http/impl/auth/TestBasicScheme.java | 16 +++----
.../client5/http/impl/auth/TestDigestScheme.java | 56 +++++++++++-----------
.../http/impl/auth/TestHttpAuthenticator.java | 56 +++++++++++-----------
.../auth/TestSystemDefaultCredentialsProvider.java | 11 +++--
.../client5/http/impl/classic/TestConnectExec.java | 6 +--
.../http/impl/classic/TestProtocolExec.java | 8 ++--
42 files changed, 237 insertions(+), 259 deletions(-)
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java
index 5466c8a..853a595 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java
@@ -50,7 +50,7 @@ import java.util.List;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.cache.CacheResponseStatus;
import org.apache.hc.client5.http.cache.HttpCacheContext;
import org.apache.hc.client5.http.cache.HttpCacheEntry;
@@ -738,9 +738,9 @@ public abstract class TestCachingExecChain {
.setSharedCache(true).build());
final Date now = new Date();
final ClassicHttpRequest req1 = new HttpOptions("http://foo.example.com/");
- req1.setHeader("Authorization", AuthSchemes.BASIC.id + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ req1.setHeader("Authorization", StandardAuthScheme.BASIC + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
final ClassicHttpRequest req2 = new HttpGet("http://foo.example.com/");
- req2.setHeader("Authorization", AuthSchemes.BASIC.id + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ req2.setHeader("Authorization", StandardAuthScheme.BASIC + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
final ClassicHttpResponse resp1 = new BasicClassicHttpResponse(HttpStatus.SC_NO_CONTENT, "No Content");
resp1.setHeader("Content-Length", "0");
resp1.setHeader("ETag", "\"options-etag\"");
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java
index 7337fc4..ef25006 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java
@@ -38,7 +38,7 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.classic.ExecChain;
import org.apache.hc.client5.http.classic.methods.HttpGet;
import org.apache.hc.client5.http.classic.methods.HttpPost;
@@ -612,7 +612,7 @@ public class TestProtocolRecommendations extends AbstractProtocolTest {
@Test
public void testDoesNotModifyAuthorizationOnRequests() throws Exception {
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " dXNlcjpwYXNzd2Q=");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " dXNlcjpwYXNzd2Q=");
testDoesNotModifyHeaderOnRequests("Authorization");
}
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java
index 14acef5..460581a 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java
@@ -37,7 +37,7 @@ import java.util.regex.Pattern;
import org.apache.hc.client5.http.ClientProtocolException;
import org.apache.hc.client5.http.HttpRoute;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.cache.HttpCacheEntry;
import org.apache.hc.client5.http.classic.ExecChain;
import org.apache.hc.client5.http.utils.DateUtils;
@@ -4521,7 +4521,7 @@ public class TestProtocolRequirements extends AbstractProtocolTest {
protected void testSharedCacheRevalidatesAuthorizedResponse(
final ClassicHttpResponse authorizedResponse, final int minTimes, final int maxTimes) throws Exception {
if (config.isSharedCache()) {
- final String authorization = AuthSchemes.BASIC.id + " dXNlcjpwYXNzd2Q=";
+ final String authorization = StandardAuthScheme.BASIC + " dXNlcjpwYXNzd2Q=";
final ClassicHttpRequest req1 = new BasicClassicHttpRequest("GET", "/");
req1.setHeader("Authorization",authorization);
@@ -4585,8 +4585,8 @@ public class TestProtocolRequirements extends AbstractProtocolTest {
protected void testSharedCacheMustUseNewRequestHeadersWhenRevalidatingAuthorizedResponse(
final ClassicHttpResponse authorizedResponse) throws Exception {
if (config.isSharedCache()) {
- final String authorization1 = AuthSchemes.BASIC.id + " dXNlcjpwYXNzd2Q=";
- final String authorization2 = AuthSchemes.BASIC.id + " dXNlcjpwYXNzd2Qy";
+ final String authorization1 = StandardAuthScheme.BASIC + " dXNlcjpwYXNzd2Q=";
+ final String authorization2 = StandardAuthScheme.BASIC + " dXNlcjpwYXNzd2Qy";
final ClassicHttpRequest req1 = new BasicClassicHttpRequest("GET", "/");
req1.setHeader("Authorization",authorization1);
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java
index 907023b..a1f0030 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java
@@ -29,7 +29,7 @@ package org.apache.hc.client5.http.impl.cache;
import java.util.Date;
import java.util.Random;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.classic.methods.HttpOptions;
import org.apache.hc.client5.http.utils.DateUtils;
import org.apache.hc.core5.http.HttpRequest;
@@ -83,7 +83,7 @@ public class TestResponseCachingPolicy {
@Test
public void testResponsesToRequestsWithAuthorizationHeadersAreNotCacheableBySharedCache() {
request = new BasicHttpRequest("GET","/");
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " dXNlcjpwYXNzd2Q=");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " dXNlcjpwYXNzd2Q=");
Assert.assertFalse(policy.isResponseCacheable(request,response));
}
@@ -91,14 +91,14 @@ public class TestResponseCachingPolicy {
public void testResponsesToRequestsWithAuthorizationHeadersAreCacheableByNonSharedCache() {
policy = new ResponseCachingPolicy(0, false, false, false);
request = new BasicHttpRequest("GET","/");
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " dXNlcjpwYXNzd2Q=");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " dXNlcjpwYXNzd2Q=");
Assert.assertTrue(policy.isResponseCacheable(request,response));
}
@Test
public void testAuthorizedResponsesWithSMaxAgeAreCacheable() {
request = new BasicHttpRequest("GET","/");
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " dXNlcjpwYXNzd2Q=");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " dXNlcjpwYXNzd2Q=");
response.setHeader("Cache-Control","s-maxage=3600");
Assert.assertTrue(policy.isResponseCacheable(request,response));
}
@@ -106,7 +106,7 @@ public class TestResponseCachingPolicy {
@Test
public void testAuthorizedResponsesWithMustRevalidateAreCacheable() {
request = new BasicHttpRequest("GET","/");
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " dXNlcjpwYXNzd2Q=");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " dXNlcjpwYXNzd2Q=");
response.setHeader("Cache-Control","must-revalidate");
Assert.assertTrue(policy.isResponseCacheable(request,response));
}
@@ -114,7 +114,7 @@ public class TestResponseCachingPolicy {
@Test
public void testAuthorizedResponsesWithCacheControlPublicAreCacheable() {
request = new BasicHttpRequest("GET","/");
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " dXNlcjpwYXNzd2Q=");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " dXNlcjpwYXNzd2Q=");
response.setHeader("Cache-Control","public");
Assert.assertTrue(policy.isResponseCacheable(request,response));
}
@@ -122,7 +122,7 @@ public class TestResponseCachingPolicy {
@Test
public void testAuthorizedResponsesWithCacheControlMaxAgeAreNotCacheable() {
request = new BasicHttpRequest("GET","/");
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " dXNlcjpwYXNzd2Q=");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " dXNlcjpwYXNzd2Q=");
response.setHeader("Cache-Control","max-age=3600");
Assert.assertFalse(policy.isResponseCacheable(request,response));
}
@@ -143,7 +143,7 @@ public class TestResponseCachingPolicy {
public void test206ResponseCodeIsNotCacheableUsingSharedPublicCache() {
policy = new ResponseCachingPolicy(0, true, false, false);
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
response.setCode(HttpStatus.SC_PARTIAL_CONTENT);
response.setHeader("Cache-Control", "public");
Assert.assertFalse(policy.isResponseCacheable(request, response));
@@ -414,7 +414,7 @@ public class TestResponseCachingPolicy {
public void testVaryStarIsNotCacheableUsingSharedPublicCache() {
policy = new ResponseCachingPolicy(0, true, false, false);
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
response.setHeader("Cache-Control", "public");
response.setHeader("Vary", "*");
Assert.assertFalse(policy.isResponseCacheable(request, response));
@@ -446,7 +446,7 @@ public class TestResponseCachingPolicy {
policy = new ResponseCachingPolicy(0, true, false, false);
request = new HttpOptions("http://foo.example.com/");
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
response.setCode(HttpStatus.SC_NO_CONTENT);
response.setHeader("Cache-Control", "public");
@@ -471,7 +471,7 @@ public class TestResponseCachingPolicy {
public void testResponsesWithMultipleAgeHeadersAreNotCacheableUsingSharedPublicCache() {
policy = new ResponseCachingPolicy(0, true, false, false);
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
response.setHeader("Cache-Control", "public");
response.addHeader("Age", "3");
response.addHeader("Age", "5");
@@ -489,7 +489,7 @@ public class TestResponseCachingPolicy {
public void testResponsesWithMultipleDateHeadersAreNotCacheableUsingSharedPublicCache() {
policy = new ResponseCachingPolicy(0, true, false, false);
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
response.setHeader("Cache-Control", "public");
response.addHeader("Date", DateUtils.formatDate(now));
response.addHeader("Date", DateUtils.formatDate(sixSecondsAgo));
@@ -506,7 +506,7 @@ public class TestResponseCachingPolicy {
public void testResponsesWithMalformedDateHeadersAreNotCacheableUsingSharedPublicCache() {
policy = new ResponseCachingPolicy(0, true, false, false);
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
response.setHeader("Cache-Control", "public");
response.addHeader("Date", "garbage");
Assert.assertFalse(policy.isResponseCacheable(request, response));
@@ -523,7 +523,7 @@ public class TestResponseCachingPolicy {
public void testResponsesWithMultipleExpiresHeadersAreNotCacheableUsingSharedPublicCache() {
policy = new ResponseCachingPolicy(0, true, false, false);
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
response.setHeader("Cache-Control", "public");
response.addHeader("Expires", DateUtils.formatDate(now));
response.addHeader("Expires", DateUtils.formatDate(sixSecondsAgo));
@@ -546,7 +546,7 @@ public class TestResponseCachingPolicy {
public void testResponseThatHasTooMuchContentIsNotCacheableUsingSharedPublicCache() {
policy = new ResponseCachingPolicy(0, true, false, false);
- request.setHeader("Authorization", AuthSchemes.BASIC.id + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
+ request.setHeader("Authorization", StandardAuthScheme.BASIC + " QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
response.setHeader("Cache-Control", "public");
response.setHeader("Content-Length", "9000");
Assert.assertFalse(policy.isResponseCacheable(request, response));
diff --git a/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/async/AuthenticatingAsyncDecorator.java b/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/async/AuthenticatingAsyncDecorator.java
index 71e8dca..b3bfdc7 100644
--- a/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/async/AuthenticatingAsyncDecorator.java
+++ b/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/async/AuthenticatingAsyncDecorator.java
@@ -31,7 +31,7 @@ import java.nio.ByteBuffer;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.testing.auth.Authenticator;
import org.apache.hc.client5.testing.auth.BasicAuthTokenExtractor;
import org.apache.hc.core5.http.ContentType;
@@ -96,7 +96,7 @@ public class AuthenticatingAsyncDecorator implements AsyncServerExchangeHandler
} else {
final HttpResponse unauthorized = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED);
final String realm = authenticator.getRealm(authority, requestUri);
- unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=\"" + realm + "\"");
+ unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=\"" + realm + "\"");
customizeUnauthorizedResponse(unauthorized);
diff --git a/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/auth/BasicAuthTokenExtractor.java b/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/auth/BasicAuthTokenExtractor.java
index 105ffa0..525832b 100644
--- a/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/auth/BasicAuthTokenExtractor.java
+++ b/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/auth/BasicAuthTokenExtractor.java
@@ -32,7 +32,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.commons.codec.BinaryDecoder;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Base64;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.ProtocolException;
@@ -45,7 +45,7 @@ public class BasicAuthTokenExtractor {
throw new ProtocolException("Invalid challenge response: " + challengeResponse);
}
final String authscheme = challengeResponse.substring(0, i);
- if (authscheme.equalsIgnoreCase(AuthSchemes.BASIC.id)) {
+ if (authscheme.equalsIgnoreCase(StandardAuthScheme.BASIC)) {
final String s = challengeResponse.substring(i + 1).trim();
try {
final byte[] credsRaw = s.getBytes(StandardCharsets.US_ASCII);
diff --git a/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/classic/AuthenticatingDecorator.java b/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/classic/AuthenticatingDecorator.java
index 07aaa1c..ba5a8b9 100644
--- a/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/classic/AuthenticatingDecorator.java
+++ b/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/classic/AuthenticatingDecorator.java
@@ -29,7 +29,7 @@ package org.apache.hc.client5.testing.classic;
import java.io.IOException;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.testing.auth.Authenticator;
import org.apache.hc.client5.testing.auth.BasicAuthTokenExtractor;
import org.apache.hc.core5.http.ClassicHttpRequest;
@@ -84,7 +84,7 @@ public class AuthenticatingDecorator implements HttpServerRequestHandler {
} else {
final ClassicHttpResponse unauthorized = new BasicClassicHttpResponse(HttpStatus.SC_UNAUTHORIZED);
final String realm = authenticator.getRealm(authority, requestUri);
- unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=\"" + realm + "\"");
+ unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=\"" + realm + "\"");
customizeUnauthorizedResponse(unauthorized);
if (unauthorized.getEntity() == null) {
unauthorized.setEntity(new StringEntity("Unauthorized"));
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthentication.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthentication.java
index 8746fc9..8dce39e 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthentication.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthentication.java
@@ -39,7 +39,7 @@ import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
import org.apache.hc.client5.http.auth.AuthSchemeFactory;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.ChallengeType;
import org.apache.hc.client5.http.auth.Credentials;
@@ -539,7 +539,7 @@ public abstract class AbstractHttpAsyncClientAuthentication<T extends CloseableH
@Override
protected void customizeUnauthorizedResponse(final HttpResponse unauthorized) {
- unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.DIGEST.id + " realm=\"test realm\" invalid");
+ unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.DIGEST + " realm=\"test realm\" invalid");
}
};
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java
index 348be75..e37dda8 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java
@@ -39,7 +39,7 @@ import org.apache.hc.client5.http.auth.AuthCache;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
import org.apache.hc.client5.http.auth.AuthSchemeFactory;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.ChallengeType;
import org.apache.hc.client5.http.auth.Credentials;
@@ -720,7 +720,7 @@ public class TestClientAuthentication extends LocalServerTestBase {
@Override
protected void customizeUnauthorizedResponse(final ClassicHttpResponse unauthorized) {
- unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.DIGEST.id + " realm=\"test realm\" invalid");
+ unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.DIGEST + " realm=\"test realm\" invalid");
}
};
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthenticationFakeNTLM.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthenticationFakeNTLM.java
index 0a4092c..1ca26a8 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthenticationFakeNTLM.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthenticationFakeNTLM.java
@@ -28,7 +28,7 @@ package org.apache.hc.client5.testing.sync;
import java.io.IOException;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.NTCredentials;
import org.apache.hc.client5.http.classic.methods.HttpGet;
@@ -61,7 +61,7 @@ public class TestClientAuthenticationFakeNTLM extends LocalServerTestBase {
final HttpContext context) throws HttpException, IOException {
response.setCode(HttpStatus.SC_UNAUTHORIZED);
response.setHeader("Connection", "Keep-Alive");
- response.setHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.NTLM.id);
+ response.setHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.NTLM);
}
}
@@ -93,7 +93,7 @@ public class TestClientAuthenticationFakeNTLM extends LocalServerTestBase {
private final String authenticateHeaderValue;
public NtlmType2MessageResponseHandler(final String type2Message) {
- this.authenticateHeaderValue = AuthSchemes.NTLM.id + " " + type2Message;
+ this.authenticateHeaderValue = StandardAuthScheme.NTLM + " " + type2Message;
}
@Override
@@ -104,7 +104,7 @@ public class TestClientAuthenticationFakeNTLM extends LocalServerTestBase {
response.setCode(HttpStatus.SC_UNAUTHORIZED);
response.setHeader("Connection", "Keep-Alive");
if (!request.containsHeader(HttpHeaders.AUTHORIZATION)) {
- response.setHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.NTLM.id);
+ response.setHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.NTLM);
} else {
response.setHeader(HttpHeaders.WWW_AUTHENTICATE, authenticateHeaderValue);
}
@@ -164,7 +164,7 @@ public class TestClientAuthenticationFakeNTLM extends LocalServerTestBase {
private final String authenticateHeaderValue;
public NtlmType2MessageOnlyResponseHandler(final String type2Message) {
- this.authenticateHeaderValue = AuthSchemes.NTLM.id + " " + type2Message;
+ this.authenticateHeaderValue = StandardAuthScheme.NTLM + " " + type2Message;
}
@Override
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSPNegoScheme.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSPNegoScheme.java
index 61c4cc9..28ec989 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSPNegoScheme.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSPNegoScheme.java
@@ -36,7 +36,7 @@ import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.Credentials;
import org.apache.hc.client5.http.auth.KerberosConfig;
import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
import org.apache.hc.client5.http.impl.auth.SPNegoScheme;
import org.apache.hc.client5.http.impl.classic.HttpClients;
@@ -78,7 +78,7 @@ public class TestSPNegoScheme extends LocalServerTestBase {
final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
response.setCode(HttpStatus.SC_UNAUTHORIZED);
- response.addHeader(new BasicHeader("WWW-Authenticate", AuthSchemes.SPNEGO.id + " blablabla"));
+ response.addHeader(new BasicHeader("WWW-Authenticate", StandardAuthScheme.SPNEGO + " blablabla"));
response.addHeader(new BasicHeader("Connection", "Keep-Alive"));
response.setEntity(new StringEntity("auth required "));
}
@@ -160,7 +160,7 @@ public class TestSPNegoScheme extends LocalServerTestBase {
credentialsProvider.setCredentials(new AuthScope(null, null, -1, null, null), use_jaas_creds);
final Registry<AuthSchemeFactory> authSchemeRegistry = RegistryBuilder.<AuthSchemeFactory>create()
- .register(AuthSchemes.SPNEGO.id, nsf)
+ .register(StandardAuthScheme.SPNEGO, nsf)
.build();
this.httpclient = HttpClients.custom()
.setDefaultAuthSchemeRegistry(authSchemeRegistry)
@@ -191,7 +191,7 @@ public class TestSPNegoScheme extends LocalServerTestBase {
credentialsProvider.setCredentials(new AuthScope(null, null, -1, null, null), use_jaas_creds);
final Registry<AuthSchemeFactory> authSchemeRegistry = RegistryBuilder.<AuthSchemeFactory>create()
- .register(AuthSchemes.SPNEGO.id, nsf)
+ .register(StandardAuthScheme.SPNEGO, nsf)
.build();
this.httpclient = HttpClients.custom()
.setDefaultAuthSchemeRegistry(authSchemeRegistry)
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestWindowsNegotiateScheme.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestWindowsNegotiateScheme.java
index 10398f3..71c47bc 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestWindowsNegotiateScheme.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestWindowsNegotiateScheme.java
@@ -31,7 +31,7 @@ import java.io.IOException;
import org.apache.hc.client5.http.auth.AuthScheme;
import org.apache.hc.client5.http.auth.AuthSchemeFactory;
import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
@@ -65,7 +65,7 @@ public class TestWindowsNegotiateScheme extends LocalServerTestBase {
final ClassicHttpRequest request,
final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
- response.addHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.SPNEGO);
+ response.addHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.SPNEGO);
response.setCode(HttpStatus.SC_UNAUTHORIZED);
}
@@ -81,10 +81,10 @@ public class TestWindowsNegotiateScheme extends LocalServerTestBase {
// you can contact the server that authenticated you." is associated with SEC_E_DOWNGRADE_DETECTED.
final Registry<AuthSchemeFactory> authSchemeRegistry = RegistryBuilder.<AuthSchemeFactory>create()
- .register(AuthSchemes.SPNEGO.id, new AuthSchemeFactory() {
+ .register(StandardAuthScheme.SPNEGO, new AuthSchemeFactory() {
@Override
public AuthScheme create(final HttpContext context) {
- return new WindowsNegotiateSchemeGetTokenFail(AuthSchemes.SPNEGO.id, "HTTP/example.com");
+ return new WindowsNegotiateSchemeGetTokenFail(StandardAuthScheme.SPNEGO, "HTTP/example.com");
}
}).build();
final CloseableHttpClient customClient = HttpClientBuilder.create()
diff --git a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java
index a8f32f6..47f3274 100644
--- a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java
+++ b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WinHttpClients.java
@@ -29,7 +29,7 @@ package org.apache.hc.client5.http.impl.win;
import java.util.Locale;
import org.apache.hc.client5.http.auth.AuthSchemeFactory;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory;
import org.apache.hc.client5.http.impl.auth.DigestSchemeFactory;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -67,10 +67,10 @@ public class WinHttpClients {
private static HttpClientBuilder createBuilder() {
if (isWinAuthAvailable()) {
final Registry<AuthSchemeFactory> authSchemeRegistry = RegistryBuilder.<AuthSchemeFactory>create()
- .register(AuthSchemes.BASIC.id, BasicSchemeFactory.INSTANCE)
- .register(AuthSchemes.DIGEST.id, DigestSchemeFactory.INSTANCE)
- .register(AuthSchemes.NTLM.id, WindowsNTLMSchemeFactory.DEFAULT)
- .register(AuthSchemes.SPNEGO.id, WindowsNegotiateSchemeFactory.DEFAULT)
+ .register(StandardAuthScheme.BASIC, BasicSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.DIGEST, DigestSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.NTLM, WindowsNTLMSchemeFactory.DEFAULT)
+ .register(StandardAuthScheme.SPNEGO, WindowsNegotiateSchemeFactory.DEFAULT)
.build();
return HttpClientBuilder.create()
.setDefaultAuthSchemeRegistry(authSchemeRegistry);
diff --git a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java
index 90063bd..b882eb1 100644
--- a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java
+++ b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNTLMSchemeFactory.java
@@ -29,7 +29,7 @@ package org.apache.hc.client5.http.impl.win;
import org.apache.hc.client5.http.auth.AuthScheme;
import org.apache.hc.client5.http.auth.AuthSchemeFactory;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.Experimental;
import org.apache.hc.core5.annotation.ThreadingBehavior;
@@ -59,7 +59,7 @@ public class WindowsNTLMSchemeFactory implements AuthSchemeFactory {
@Override
public AuthScheme create(final HttpContext context) {
- return new WindowsNegotiateScheme(AuthSchemes.NTLM.id, servicePrincipalName);
+ return new WindowsNegotiateScheme(StandardAuthScheme.NTLM, servicePrincipalName);
}
}
diff --git a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
index 2c1f922..4d39b8c 100644
--- a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
+++ b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
@@ -32,7 +32,7 @@ import org.apache.commons.codec.binary.Base64;
import org.apache.hc.client5.http.RouteInfo;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthenticationException;
import org.apache.hc.client5.http.auth.BasicUserPrincipal;
import org.apache.hc.client5.http.auth.ChallengeType;
@@ -86,7 +86,7 @@ public class WindowsNegotiateScheme implements AuthScheme {
WindowsNegotiateScheme(final String scheme, final String servicePrincipalName) {
super();
- this.scheme = (scheme == null) ? AuthSchemes.SPNEGO.id : scheme;
+ this.scheme = (scheme == null) ? StandardAuthScheme.SPNEGO : scheme;
this.continueNeeded = true;
this.servicePrincipalName = servicePrincipalName;
diff --git a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java
index 394150b..f1b5c37 100644
--- a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java
+++ b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeFactory.java
@@ -29,7 +29,7 @@ package org.apache.hc.client5.http.impl.win;
import org.apache.hc.client5.http.auth.AuthScheme;
import org.apache.hc.client5.http.auth.AuthSchemeFactory;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.Experimental;
import org.apache.hc.core5.annotation.ThreadingBehavior;
@@ -59,7 +59,7 @@ public class WindowsNegotiateSchemeFactory implements AuthSchemeFactory {
@Override
public AuthScheme create(final HttpContext context) {
- return new WindowsNegotiateScheme(AuthSchemes.SPNEGO.id, servicePrincipalName);
+ return new WindowsNegotiateScheme(StandardAuthScheme.SPNEGO, servicePrincipalName);
}
}
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthSchemes.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/StandardAuthScheme.java
similarity index 79%
rename from httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthSchemes.java
rename to httpclient5/src/main/java/org/apache/hc/client5/http/auth/StandardAuthScheme.java
index 1920945..feb7e6c 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthSchemes.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/StandardAuthScheme.java
@@ -28,47 +28,45 @@
package org.apache.hc.client5.http.auth;
/**
- * Supported authentication schemes.
+ * Authentication schemes by their names supported by the HttpClient.
*
* @since 4.3
*/
-public enum AuthSchemes {
+public final class StandardAuthScheme {
+
+ private StandardAuthScheme() {
+ // no instances
+ }
/**
* Basic authentication scheme as defined in RFC 2617 (considered inherently
- * insecure, but most widely supported).
+ * insecure without transport encryption, but most widely supported).
*/
- BASIC("Basic"),
+ public static final String BASIC = "Basic";
/**
* Digest authentication scheme as defined in RFC 2617.
*/
- DIGEST("Digest"),
+ public static final String DIGEST = "Digest";
/**
* The NTLM authentication scheme is a proprietary Microsoft Windows
* authentication protocol as defined in [MS-NLMP].
*/
- NTLM("NTLM"),
+ public static final String NTLM = "NTLM";
/**
* SPNEGO authentication scheme as defined in RFC 4559 and RFC 4178
* (considered to be the most secure among currently supported
* authentication schemes if Kerberos is selected).
*/
- SPNEGO("Negotiate"),
+ public static final String SPNEGO = "Negotiate";
/**
* Kerberos authentication scheme as defined in RFC 4120
* (considered to be the most secure among currently supported
* authentication schemes).
*/
- KERBEROS("Kerberos");
-
- public final String id;
-
- AuthSchemes(final String id) {
- this.id = id;
- }
+ public static final String KERBEROS = "Kerberos";
-}
\ No newline at end of file
+}
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/AuthSupport.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/AuthSupport.java
index 825db8c..8de956f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/AuthSupport.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/AuthSupport.java
@@ -28,7 +28,7 @@
package org.apache.hc.client5.http.impl;
import org.apache.hc.client5.http.HttpRoute;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.CredentialsStore;
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
@@ -63,7 +63,7 @@ public class AuthSupport {
final char[] password = atColon >= 0 ? userInfo.substring(atColon + 1).toCharArray() : null;
credentialsStore.setCredentials(
- new AuthScope(scheme, authority.getHostName(), authority.getPort(), null, AuthSchemes.BASIC.id),
+ new AuthScope(scheme, authority.getHostName(), authority.getPort(), null, StandardAuthScheme.BASIC),
new UsernamePasswordCredentials(userName, password));
}
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java
index 87222ad..3eb3762 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java
@@ -39,7 +39,7 @@ import org.apache.hc.client5.http.AuthenticationStrategy;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
import org.apache.hc.client5.http.auth.AuthSchemeFactory;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.ChallengeType;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.protocol.HttpClientContext;
@@ -65,11 +65,11 @@ public class DefaultAuthenticationStrategy implements AuthenticationStrategy {
private static final List<String> DEFAULT_SCHEME_PRIORITY =
Collections.unmodifiableList(Arrays.asList(
- AuthSchemes.SPNEGO.id,
- AuthSchemes.KERBEROS.id,
- AuthSchemes.NTLM.id,
- AuthSchemes.DIGEST.id,
- AuthSchemes.BASIC.id));
+ StandardAuthScheme.SPNEGO,
+ StandardAuthScheme.KERBEROS,
+ StandardAuthScheme.NTLM,
+ StandardAuthScheme.DIGEST,
+ StandardAuthScheme.BASIC));
@Override
public List<AuthScheme> select(
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java
index fa6ef73..b5d7226 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java
@@ -44,7 +44,7 @@ import org.apache.hc.client5.http.HttpRequestRetryStrategy;
import org.apache.hc.client5.http.SchemePortResolver;
import org.apache.hc.client5.http.async.AsyncExecChainHandler;
import org.apache.hc.client5.http.auth.AuthSchemeFactory;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.CredentialsProvider;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.cookie.BasicCookieStore;
@@ -761,11 +761,11 @@ public class H2AsyncClientBuilder {
Lookup<AuthSchemeFactory> authSchemeRegistryCopy = this.authSchemeRegistry;
if (authSchemeRegistryCopy == null) {
authSchemeRegistryCopy = RegistryBuilder.<AuthSchemeFactory>create()
- .register(AuthSchemes.BASIC.id, BasicSchemeFactory.INSTANCE)
- .register(AuthSchemes.DIGEST.id, DigestSchemeFactory.INSTANCE)
- .register(AuthSchemes.NTLM.id, NTLMSchemeFactory.INSTANCE)
- .register(AuthSchemes.SPNEGO.id, SPNegoSchemeFactory.DEFAULT)
- .register(AuthSchemes.KERBEROS.id, KerberosSchemeFactory.DEFAULT)
+ .register(StandardAuthScheme.BASIC, BasicSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.DIGEST, DigestSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.NTLM, NTLMSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.SPNEGO, SPNegoSchemeFactory.DEFAULT)
+ .register(StandardAuthScheme.KERBEROS, KerberosSchemeFactory.DEFAULT)
.build();
}
Lookup<CookieSpecFactory> cookieSpecRegistryCopy = this.cookieSpecRegistry;
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java
index 154737c..a87a0ab 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java
@@ -45,7 +45,7 @@ import org.apache.hc.client5.http.SchemePortResolver;
import org.apache.hc.client5.http.UserTokenHandler;
import org.apache.hc.client5.http.async.AsyncExecChainHandler;
import org.apache.hc.client5.http.auth.AuthSchemeFactory;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.CredentialsProvider;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.cookie.BasicCookieStore;
@@ -968,11 +968,11 @@ public class HttpAsyncClientBuilder {
Lookup<AuthSchemeFactory> authSchemeRegistryCopy = this.authSchemeRegistry;
if (authSchemeRegistryCopy == null) {
authSchemeRegistryCopy = RegistryBuilder.<AuthSchemeFactory>create()
- .register(AuthSchemes.BASIC.id, BasicSchemeFactory.INSTANCE)
- .register(AuthSchemes.DIGEST.id, DigestSchemeFactory.INSTANCE)
- .register(AuthSchemes.NTLM.id, NTLMSchemeFactory.INSTANCE)
- .register(AuthSchemes.SPNEGO.id, SPNegoSchemeFactory.DEFAULT)
- .register(AuthSchemes.KERBEROS.id, KerberosSchemeFactory.DEFAULT)
+ .register(StandardAuthScheme.BASIC, BasicSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.DIGEST, DigestSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.NTLM, NTLMSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.SPNEGO, SPNegoSchemeFactory.DEFAULT)
+ .register(StandardAuthScheme.KERBEROS, KerberosSchemeFactory.DEFAULT)
.build();
}
Lookup<CookieSpecFactory> cookieSpecRegistryCopy = this.cookieSpecRegistry;
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java
index c9f7b99..634eea0 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java
@@ -42,7 +42,7 @@ import java.util.Map;
import org.apache.commons.codec.binary.Base64;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.AuthStateCacheable;
import org.apache.hc.client5.http.auth.AuthenticationException;
@@ -100,7 +100,7 @@ public class BasicScheme implements AuthScheme, Serializable {
@Override
public String getName() {
- return AuthSchemes.BASIC.id;
+ return StandardAuthScheme.BASIC;
}
@Override
@@ -174,7 +174,7 @@ public class BasicScheme implements AuthScheme, Serializable {
}
final byte[] encodedCreds = this.base64codec.encode(this.buffer.toByteArray());
this.buffer.reset();
- return AuthSchemes.BASIC.id + " " + new String(encodedCreds, 0, encodedCreds.length, StandardCharsets.US_ASCII);
+ return StandardAuthScheme.BASIC + " " + new String(encodedCreds, 0, encodedCreds.length, StandardCharsets.US_ASCII);
}
private void writeObject(final ObjectOutputStream out) throws IOException {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java
index df1b60a..a85d5bb 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java
@@ -46,7 +46,7 @@ import java.util.StringTokenizer;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.AuthenticationException;
import org.apache.hc.client5.http.utils.ByteArrayBuilder;
@@ -127,7 +127,7 @@ public class DigestScheme implements AuthScheme, Serializable {
@Override
public String getName() {
- return AuthSchemes.DIGEST.id;
+ return StandardAuthScheme.DIGEST;
}
@Override
@@ -375,7 +375,7 @@ public class DigestScheme implements AuthScheme, Serializable {
final String digest = formatHex(digester.digest(digestInput));
final CharArrayBuffer buffer = new CharArrayBuffer(128);
- buffer.append(AuthSchemes.DIGEST.id + " ");
+ buffer.append(StandardAuthScheme.DIGEST + " ");
final List<BasicNameValuePair> params = new ArrayList<>(20);
params.add(new BasicNameValuePair("username", username));
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
index b66f5c6..b66aa68 100644
--- 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
@@ -35,7 +35,7 @@ import org.apache.hc.client5.http.DnsResolver;
import org.apache.hc.client5.http.SystemDefaultDnsResolver;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.AuthenticationException;
import org.apache.hc.client5.http.auth.Credentials;
@@ -247,7 +247,7 @@ public abstract class GGSSchemeBase implements AuthScheme {
if (log.isDebugEnabled()) {
log.debug("Sending response '" + tokenstr + "' back to the auth server");
}
- return AuthSchemes.SPNEGO.id + " " + tokenstr;
+ return StandardAuthScheme.SPNEGO + " " + tokenstr;
default:
throw new IllegalStateException("Illegal state: " + state);
}
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
index 181f6df..46cbdbe 100644
--- 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
@@ -27,7 +27,7 @@
package org.apache.hc.client5.http.impl.auth;
import org.apache.hc.client5.http.DnsResolver;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.KerberosConfig;
import org.apache.hc.core5.annotation.Experimental;
import org.ietf.jgss.GSSException;
@@ -60,7 +60,7 @@ public class KerberosScheme extends GGSSchemeBase {
@Override
public String getName() {
- return AuthSchemes.KERBEROS.id;
+ return StandardAuthScheme.KERBEROS;
}
@Override
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java
index 61ee47d..e8ca14f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMScheme.java
@@ -30,7 +30,7 @@ import java.security.Principal;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.AuthenticationException;
import org.apache.hc.client5.http.auth.Credentials;
@@ -81,7 +81,7 @@ public final class NTLMScheme implements AuthScheme {
@Override
public String getName() {
- return AuthSchemes.NTLM.id;
+ return StandardAuthScheme.NTLM;
}
@Override
@@ -169,7 +169,7 @@ public final class NTLMScheme implements AuthScheme {
} else {
throw new AuthenticationException("Unexpected state: " + this.state);
}
- return AuthSchemes.NTLM.id + " " + response;
+ return StandardAuthScheme.NTLM + " " + response;
}
@Override
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java
index 06395b0..bad1c0f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SPNegoScheme.java
@@ -27,7 +27,7 @@
package org.apache.hc.client5.http.impl.auth;
import org.apache.hc.client5.http.DnsResolver;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.KerberosConfig;
import org.apache.hc.core5.annotation.Experimental;
import org.ietf.jgss.GSSException;
@@ -61,7 +61,7 @@ public class SPNegoScheme extends GGSSchemeBase {
@Override
public String getName() {
- return AuthSchemes.SPNEGO.id;
+ return StandardAuthScheme.SPNEGO;
}
@Override
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java
index 3a60c8c..dfb4d0b 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java
@@ -32,15 +32,13 @@ import java.net.PasswordAuthentication;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.Credentials;
import org.apache.hc.client5.http.auth.CredentialsStore;
import org.apache.hc.client5.http.auth.NTCredentials;
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.protocol.HttpClientContext;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
@@ -58,25 +56,6 @@ import org.apache.hc.core5.util.Args;
@Contract(threading = ThreadingBehavior.SAFE)
public class SystemDefaultCredentialsProvider implements CredentialsStore {
- private static final Map<String, String> SCHEME_MAP;
-
- static {
- SCHEME_MAP = new ConcurrentHashMap<>();
- SCHEME_MAP.put(AuthSchemes.BASIC.name(), "Basic");
- SCHEME_MAP.put(AuthSchemes.DIGEST.name(), "Digest");
- SCHEME_MAP.put(AuthSchemes.NTLM.name(), "NTLM");
- SCHEME_MAP.put(AuthSchemes.SPNEGO.name(), "SPNEGO");
- SCHEME_MAP.put(AuthSchemes.KERBEROS.name(), "Kerberos");
- }
-
- private static String translateAuthScheme(final String key) {
- if (key == null) {
- return null;
- }
- final String s = SCHEME_MAP.get(key);
- return s != null ? s : key;
- }
-
private final BasicCredentialsProvider internal;
/**
@@ -112,7 +91,7 @@ public class SystemDefaultCredentialsProvider implements CredentialsStore {
authScope.getPort(),
protocol,
authScope.getRealm(),
- translateAuthScheme(authScope.getAuthScheme()),
+ authScope.getAuthScheme(),
targetHostURL,
requestorType);
}
@@ -149,7 +128,7 @@ public class SystemDefaultCredentialsProvider implements CredentialsStore {
if (domain != null) {
return new NTCredentials(systemcreds.getUserName(), systemcreds.getPassword(), null, domain);
}
- if (AuthSchemes.NTLM.id.equalsIgnoreCase(authScope.getAuthScheme())) {
+ if (StandardAuthScheme.NTLM.equalsIgnoreCase(authScope.getAuthScheme())) {
// Domain may be specified in a fully qualified user name
return new NTCredentials(
systemcreds.getUserName(), systemcreds.getPassword(), null, null);
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java
index 5a3251b..573ebb0 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java
@@ -43,7 +43,7 @@ import org.apache.hc.client5.http.HttpRequestRetryStrategy;
import org.apache.hc.client5.http.SchemePortResolver;
import org.apache.hc.client5.http.UserTokenHandler;
import org.apache.hc.client5.http.auth.AuthSchemeFactory;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.CredentialsProvider;
import org.apache.hc.client5.http.classic.BackoffManager;
import org.apache.hc.client5.http.classic.ConnectionBackoffStrategy;
@@ -940,11 +940,11 @@ public class HttpClientBuilder {
Lookup<AuthSchemeFactory> authSchemeRegistryCopy = this.authSchemeRegistry;
if (authSchemeRegistryCopy == null) {
authSchemeRegistryCopy = RegistryBuilder.<AuthSchemeFactory>create()
- .register(AuthSchemes.BASIC.id, BasicSchemeFactory.INSTANCE)
- .register(AuthSchemes.DIGEST.id, DigestSchemeFactory.INSTANCE)
- .register(AuthSchemes.NTLM.id, NTLMSchemeFactory.INSTANCE)
- .register(AuthSchemes.SPNEGO.id, SPNegoSchemeFactory.DEFAULT)
- .register(AuthSchemes.KERBEROS.id, KerberosSchemeFactory.DEFAULT)
+ .register(StandardAuthScheme.BASIC, BasicSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.DIGEST, DigestSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.NTLM, NTLMSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.SPNEGO, SPNegoSchemeFactory.DEFAULT)
+ .register(StandardAuthScheme.KERBEROS, KerberosSchemeFactory.DEFAULT)
.build();
}
Lookup<CookieSpecFactory> cookieSpecRegistryCopy = this.cookieSpecRegistry;
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProxyClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProxyClient.java
index f70928b..ef7a5ea 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProxyClient.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProxyClient.java
@@ -36,7 +36,7 @@ import org.apache.hc.client5.http.RouteInfo.LayerType;
import org.apache.hc.client5.http.RouteInfo.TunnelType;
import org.apache.hc.client5.http.auth.AuthExchange;
import org.apache.hc.client5.http.auth.AuthSchemeFactory;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.ChallengeType;
import org.apache.hc.client5.http.auth.Credentials;
@@ -113,11 +113,11 @@ public class ProxyClient {
this.authenticator = new HttpAuthenticator();
this.proxyAuthExchange = new AuthExchange();
this.authSchemeRegistry = RegistryBuilder.<AuthSchemeFactory>create()
- .register(AuthSchemes.BASIC.id, BasicSchemeFactory.INSTANCE)
- .register(AuthSchemes.DIGEST.id, DigestSchemeFactory.INSTANCE)
- .register(AuthSchemes.NTLM.id, NTLMSchemeFactory.INSTANCE)
- .register(AuthSchemes.SPNEGO.id, SPNegoSchemeFactory.DEFAULT)
- .register(AuthSchemes.KERBEROS.id, KerberosSchemeFactory.DEFAULT)
+ .register(StandardAuthScheme.BASIC, BasicSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.DIGEST, DigestSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.NTLM, NTLMSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.SPNEGO, SPNegoSchemeFactory.DEFAULT)
+ .register(StandardAuthScheme.KERBEROS, KerberosSchemeFactory.DEFAULT)
.build();
this.reuseStrategy = new DefaultConnectionReuseStrategy();
}
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java b/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java
index 409e5b4..89ea358 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java
@@ -37,21 +37,21 @@ public class TestAuthChallenge {
@Test
public void testAuthChallengeWithValue() {
- final AuthChallenge authChallenge = new AuthChallenge(ChallengeType.TARGET, AuthSchemes.BASIC.id, "blah", null);
- Assert.assertEquals(AuthSchemes.BASIC.id, authChallenge.getScheme());
+ final AuthChallenge authChallenge = new AuthChallenge(ChallengeType.TARGET, StandardAuthScheme.BASIC, "blah", null);
+ Assert.assertEquals(StandardAuthScheme.BASIC, authChallenge.getScheme());
Assert.assertEquals("blah", authChallenge.getValue());
Assert.assertEquals(null, authChallenge.getParams());
- Assert.assertEquals(AuthSchemes.BASIC.id + " blah", authChallenge.toString());
+ Assert.assertEquals(StandardAuthScheme.BASIC + " blah", authChallenge.toString());
}
@Test
public void testAuthChallengeWithParams() {
- final AuthChallenge authChallenge = new AuthChallenge(ChallengeType.TARGET, AuthSchemes.BASIC.id, null,
+ final AuthChallenge authChallenge = new AuthChallenge(ChallengeType.TARGET, StandardAuthScheme.BASIC, null,
Arrays.asList(new BasicNameValuePair("blah", "this"), new BasicNameValuePair("blah", "that")));
- Assert.assertEquals(AuthSchemes.BASIC.id, authChallenge.getScheme());
+ Assert.assertEquals(StandardAuthScheme.BASIC, authChallenge.getScheme());
Assert.assertEquals(null, authChallenge.getValue());
Assert.assertNotNull(authChallenge.getParams());
- Assert.assertEquals(AuthSchemes.BASIC.id + " [blah=this, blah=that]", authChallenge.toString());
+ Assert.assertEquals(StandardAuthScheme.BASIC + " [blah=this, blah=that]", authChallenge.toString());
}
}
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java b/httpclient5/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java
index 635764d..1011fc3 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java
@@ -30,7 +30,7 @@ package org.apache.hc.client5.http.config;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.cookie.CookieSpecs;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.util.TimeValue;
@@ -75,8 +75,8 @@ public class TestRequestConfig {
.setMaxRedirects(100)
.setCookieSpec(CookieSpecs.STANDARD.id)
.setProxy(new HttpHost("someproxy"))
- .setTargetPreferredAuthSchemes(Collections.singletonList(AuthSchemes.NTLM.id))
- .setProxyPreferredAuthSchemes(Collections.singletonList(AuthSchemes.DIGEST.id))
+ .setTargetPreferredAuthSchemes(Collections.singletonList(StandardAuthScheme.NTLM))
+ .setProxyPreferredAuthSchemes(Collections.singletonList(StandardAuthScheme.DIGEST))
.setContentCompressionEnabled(false)
.build();
final RequestConfig config = RequestConfig.copy(config0).build();
@@ -89,8 +89,8 @@ public class TestRequestConfig {
Assert.assertEquals(100, config.getMaxRedirects());
Assert.assertEquals(CookieSpecs.STANDARD.id, config.getCookieSpec());
Assert.assertEquals(new HttpHost("someproxy"), config.getProxy());
- Assert.assertEquals(Collections.singletonList(AuthSchemes.NTLM.id), config.getTargetPreferredAuthSchemes());
- Assert.assertEquals(Collections.singletonList(AuthSchemes.DIGEST.id), config.getProxyPreferredAuthSchemes());
+ Assert.assertEquals(Collections.singletonList(StandardAuthScheme.NTLM), config.getTargetPreferredAuthSchemes());
+ Assert.assertEquals(Collections.singletonList(StandardAuthScheme.DIGEST), config.getProxyPreferredAuthSchemes());
Assert.assertEquals(false, config.isContentCompressionEnabled());
}
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConfiguration.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConfiguration.java
index 0a2f223..28effa4 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConfiguration.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConfiguration.java
@@ -38,7 +38,7 @@ import javax.net.ssl.SSLContext;
import org.apache.hc.client5.http.DnsResolver;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.SystemDefaultDnsResolver;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.CredentialsProvider;
import org.apache.hc.client5.http.classic.methods.HttpGet;
import org.apache.hc.client5.http.config.RequestConfig;
@@ -195,8 +195,8 @@ public class ClientConfiguration {
final RequestConfig defaultRequestConfig = RequestConfig.custom()
.setCookieSpec(CookieSpecs.STANDARD.id)
.setExpectContinueEnabled(true)
- .setTargetPreferredAuthSchemes(Arrays.asList(AuthSchemes.NTLM.id, AuthSchemes.DIGEST.id))
- .setProxyPreferredAuthSchemes(Arrays.asList(AuthSchemes.BASIC.id))
+ .setTargetPreferredAuthSchemes(Arrays.asList(StandardAuthScheme.NTLM, StandardAuthScheme.DIGEST))
+ .setProxyPreferredAuthSchemes(Arrays.asList(StandardAuthScheme.BASIC))
.build();
// Create an HttpClient with the given custom dependencies and configuration.
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAuthenticationStrategy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAuthenticationStrategy.java
index 50eac53..e4d612f 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAuthenticationStrategy.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/TestAuthenticationStrategy.java
@@ -38,7 +38,7 @@ import org.apache.hc.client5.http.auth.AuthSchemeFactory;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.ChallengeType;
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
import org.apache.hc.client5.http.impl.auth.BasicScheme;
@@ -85,9 +85,9 @@ public class TestAuthenticationStrategy {
final HttpClientContext context = HttpClientContext.create();
final Map<String, AuthChallenge> challenges = new HashMap<>();
- challenges.put(AuthSchemes.BASIC.id.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, AuthSchemes.BASIC.id,
+ challenges.put(StandardAuthScheme.BASIC.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, StandardAuthScheme.BASIC,
new BasicNameValuePair("realm", "test")));
- challenges.put(AuthSchemes.DIGEST.id.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, AuthSchemes.DIGEST.id,
+ challenges.put(StandardAuthScheme.DIGEST.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, StandardAuthScheme.DIGEST,
new BasicNameValuePair("realm", "test"), new BasicNameValuePair("nonce", "1234")));
final List<AuthScheme> authSchemes = authStrategy.select(ChallengeType.TARGET, challenges, context);
@@ -101,16 +101,16 @@ public class TestAuthenticationStrategy {
final HttpClientContext context = HttpClientContext.create();
final Map<String, AuthChallenge> challenges = new HashMap<>();
- challenges.put(AuthSchemes.BASIC.id.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, AuthSchemes.BASIC.id,
+ challenges.put(StandardAuthScheme.BASIC.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, StandardAuthScheme.BASIC,
new BasicNameValuePair("realm", "realm1")));
- challenges.put(AuthSchemes.DIGEST.id.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, AuthSchemes.DIGEST.id,
+ challenges.put(StandardAuthScheme.DIGEST.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, StandardAuthScheme.DIGEST,
new BasicNameValuePair("realm", "realm2"), new BasicNameValuePair("nonce", "1234")));
challenges.put("whatever", new AuthChallenge(ChallengeType.TARGET, "Whatever",
new BasicNameValuePair("realm", "realm3")));
final Registry<AuthSchemeFactory> authSchemeRegistry = RegistryBuilder.<AuthSchemeFactory>create()
- .register(AuthSchemes.BASIC.id, BasicSchemeFactory.INSTANCE)
- .register(AuthSchemes.DIGEST.id, DigestSchemeFactory.INSTANCE).build();
+ .register(StandardAuthScheme.BASIC, BasicSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.DIGEST, DigestSchemeFactory.INSTANCE).build();
context.setAuthSchemeRegistry(authSchemeRegistry);
final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
@@ -131,20 +131,20 @@ public class TestAuthenticationStrategy {
public void testCustomAuthPreference() throws Exception {
final DefaultAuthenticationStrategy authStrategy = new DefaultAuthenticationStrategy();
final RequestConfig config = RequestConfig.custom()
- .setTargetPreferredAuthSchemes(Collections.singletonList(AuthSchemes.BASIC.id))
+ .setTargetPreferredAuthSchemes(Collections.singletonList(StandardAuthScheme.BASIC))
.build();
final HttpClientContext context = HttpClientContext.create();
final Map<String, AuthChallenge> challenges = new HashMap<>();
- challenges.put(AuthSchemes.BASIC.id.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, AuthSchemes.BASIC.id,
+ challenges.put(StandardAuthScheme.BASIC.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, StandardAuthScheme.BASIC,
new BasicNameValuePair("realm", "realm1")));
- challenges.put(AuthSchemes.DIGEST.id.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, AuthSchemes.DIGEST.id,
+ challenges.put(StandardAuthScheme.DIGEST.toLowerCase(Locale.ROOT), new AuthChallenge(ChallengeType.TARGET, StandardAuthScheme.DIGEST,
new BasicNameValuePair("realm", "realm2"), new BasicNameValuePair("nonce", "1234")));
final Registry<AuthSchemeFactory> authSchemeRegistry = RegistryBuilder.<AuthSchemeFactory>create()
- .register(AuthSchemes.BASIC.id, BasicSchemeFactory.INSTANCE)
- .register(AuthSchemes.DIGEST.id, DigestSchemeFactory.INSTANCE).build();
+ .register(StandardAuthScheme.BASIC, BasicSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.DIGEST, DigestSchemeFactory.INSTANCE).build();
context.setAuthSchemeRegistry(authSchemeRegistry);
context.setRequestConfig(config);
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java
index 38f7369..0f99926 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java
@@ -29,7 +29,7 @@ package org.apache.hc.client5.http.impl.auth;
import java.util.List;
import org.apache.hc.client5.http.auth.AuthChallenge;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.ChallengeType;
import org.apache.hc.core5.http.NameValuePair;
import org.apache.hc.core5.http.ParseException;
@@ -151,13 +151,13 @@ public class TestAuthChallengeParser {
@Test
public void testParseBasicAuthChallenge() throws Exception {
final CharArrayBuffer buffer = new CharArrayBuffer(64);
- buffer.append(AuthSchemes.BASIC.id + " realm=blah");
+ buffer.append(StandardAuthScheme.BASIC + " realm=blah");
final ParserCursor cursor = new ParserCursor(0, buffer.length());
final List<AuthChallenge> challenges = parser.parse(ChallengeType.TARGET, buffer, cursor);
Assert.assertNotNull(challenges);
Assert.assertEquals(1, challenges.size());
final AuthChallenge challenge1 = challenges.get(0);
- Assert.assertEquals(AuthSchemes.BASIC.id, challenge1.getScheme());
+ Assert.assertEquals(StandardAuthScheme.BASIC, challenge1.getScheme());
Assert.assertEquals(null, challenge1.getValue());
final List<NameValuePair> params = challenge1.getParams();
Assert.assertNotNull(params);
@@ -168,13 +168,13 @@ public class TestAuthChallengeParser {
@Test
public void testParseAuthChallengeWithBlanks() throws Exception {
final CharArrayBuffer buffer = new CharArrayBuffer(64);
- buffer.append(" " + AuthSchemes.BASIC.id + " realm = blah ");
+ buffer.append(" " + StandardAuthScheme.BASIC + " realm = blah ");
final ParserCursor cursor = new ParserCursor(0, buffer.length());
final List<AuthChallenge> challenges = parser.parse(ChallengeType.TARGET, buffer, cursor);
Assert.assertNotNull(challenges);
Assert.assertEquals(1, challenges.size());
final AuthChallenge challenge1 = challenges.get(0);
- Assert.assertEquals(AuthSchemes.BASIC.id, challenge1.getScheme());
+ Assert.assertEquals(StandardAuthScheme.BASIC, challenge1.getScheme());
Assert.assertEquals(null, challenge1.getValue());
final List<NameValuePair> params = challenge1.getParams();
Assert.assertNotNull(params);
@@ -206,15 +206,15 @@ public class TestAuthChallengeParser {
@Test
public void testParseMultipleAuthChallengeWithParams() throws Exception {
final CharArrayBuffer buffer = new CharArrayBuffer(64);
- buffer.append(AuthSchemes.BASIC.id + " realm=blah, param1 = this, param2=that, " +
- AuthSchemes.BASIC.id + " realm=\"\\\"yada\\\"\", this, that=,this-and-that ");
+ buffer.append(StandardAuthScheme.BASIC + " realm=blah, param1 = this, param2=that, " +
+ StandardAuthScheme.BASIC + " realm=\"\\\"yada\\\"\", this, that=,this-and-that ");
final ParserCursor cursor = new ParserCursor(0, buffer.length());
final List<AuthChallenge> challenges = parser.parse(ChallengeType.TARGET, buffer, cursor);
Assert.assertNotNull(challenges);
Assert.assertEquals(2, challenges.size());
final AuthChallenge challenge1 = challenges.get(0);
- Assert.assertEquals(AuthSchemes.BASIC.id, challenge1.getScheme());
+ Assert.assertEquals(StandardAuthScheme.BASIC, challenge1.getScheme());
Assert.assertEquals(null, challenge1.getValue());
final List<NameValuePair> params1 = challenge1.getParams();
Assert.assertNotNull(params1);
@@ -224,7 +224,7 @@ public class TestAuthChallengeParser {
assertNameValuePair(new BasicNameValuePair("param2", "that"), params1.get(2));
final AuthChallenge challenge2 = challenges.get(1);
- Assert.assertEquals(AuthSchemes.BASIC.id, challenge2.getScheme());
+ Assert.assertEquals(StandardAuthScheme.BASIC, challenge2.getScheme());
Assert.assertEquals(null, challenge2.getValue());
final List<NameValuePair> params2 = challenge2.getParams();
Assert.assertNotNull(params2);
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java
index 7b0f42f..dfbea82 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicCredentialsProvider.java
@@ -26,7 +26,7 @@
*/
package org.apache.hc.client5.http.impl.auth;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.Credentials;
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
@@ -142,15 +142,15 @@ public class TestBasicCredentialsProvider {
state.setCredentials(scope2, creds2);
state.setCredentials(scope3, creds3);
- Credentials got = state.getCredentials(new AuthScope("http", "someotherhost", 80, "someotherrealm", AuthSchemes.BASIC.id), null);
+ Credentials got = state.getCredentials(new AuthScope("http", "someotherhost", 80, "someotherrealm", StandardAuthScheme.BASIC), null);
Credentials expected = creds1;
Assert.assertEquals(expected, got);
- got = state.getCredentials(new AuthScope("http", "someotherhost", 80, "somerealm", AuthSchemes.BASIC.id), null);
+ got = state.getCredentials(new AuthScope("http", "someotherhost", 80, "somerealm", StandardAuthScheme.BASIC), null);
expected = creds2;
Assert.assertEquals(expected, got);
- got = state.getCredentials(new AuthScope("http", "somehost", 80, "someotherrealm", AuthSchemes.BASIC.id), null);
+ got = state.getCredentials(new AuthScope("http", "somehost", 80, "someotherrealm", StandardAuthScheme.BASIC), null);
expected = creds3;
Assert.assertEquals(expected, got);
}
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java
index 37db3ab..9115aad 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestBasicScheme.java
@@ -36,7 +36,7 @@ import java.util.List;
import org.apache.commons.codec.binary.Base64;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.ChallengeType;
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
@@ -65,7 +65,7 @@ public class TestBasicScheme {
@Test
public void testBasicAuthenticationEmptyChallenge() throws Exception {
- final String challenge = AuthSchemes.BASIC.id;
+ final String challenge = StandardAuthScheme.BASIC;
final AuthChallenge authChallenge = parse(challenge);
final AuthScheme authscheme = new BasicScheme();
authscheme.processChallenge(authChallenge, null);
@@ -90,12 +90,12 @@ public class TestBasicScheme {
Assert.assertTrue(authscheme.isResponseReady(host, credentialsProvider, null));
final HttpRequest request = new BasicHttpRequest("GET", "/");
final String authResponse = authscheme.generateAuthResponse(host, request, null);
- Assert.assertEquals(AuthSchemes.BASIC.id + " ZGg65C32Lfw=", authResponse);
+ Assert.assertEquals(StandardAuthScheme.BASIC + " ZGg65C32Lfw=", authResponse);
}
@Test
public void testBasicAuthentication() throws Exception {
- final AuthChallenge authChallenge = parse(AuthSchemes.BASIC.id + " realm=\"test\"");
+ final AuthChallenge authChallenge = parse(StandardAuthScheme.BASIC + " realm=\"test\"");
final BasicScheme authscheme = new BasicScheme();
authscheme.processChallenge(authChallenge, null);
@@ -110,7 +110,7 @@ public class TestBasicScheme {
Assert.assertTrue(authscheme.isResponseReady(host, credentialsProvider, null));
final String authResponse = authscheme.generateAuthResponse(host, request, null);
- final String expected = AuthSchemes.BASIC.id + " " + new String(
+ final String expected = StandardAuthScheme.BASIC + " " + new String(
Base64.encodeBase64("testuser:testpass".getBytes(StandardCharsets.US_ASCII)),
StandardCharsets.US_ASCII);
Assert.assertEquals(expected, authResponse);
@@ -121,7 +121,7 @@ public class TestBasicScheme {
@Test
public void testBasicProxyAuthentication() throws Exception {
- final AuthChallenge authChallenge = parse(AuthSchemes.BASIC.id + " realm=\"test\"");
+ final AuthChallenge authChallenge = parse(StandardAuthScheme.BASIC + " realm=\"test\"");
final BasicScheme authscheme = new BasicScheme();
authscheme.processChallenge(authChallenge, null);
@@ -136,7 +136,7 @@ public class TestBasicScheme {
Assert.assertTrue(authscheme.isResponseReady(host, credentialsProvider, null));
final String authResponse = authscheme.generateAuthResponse(host, request, null);
- final String expected = AuthSchemes.BASIC.id + " " + new String(
+ final String expected = StandardAuthScheme.BASIC + " " + new String(
Base64.encodeBase64("testuser:testpass".getBytes(StandardCharsets.US_ASCII)),
StandardCharsets.US_ASCII);
Assert.assertEquals(expected, authResponse);
@@ -147,7 +147,7 @@ public class TestBasicScheme {
@Test
public void testSerialization() throws Exception {
- final AuthChallenge authChallenge = parse(AuthSchemes.BASIC.id + " realm=\"test\"");
+ final AuthChallenge authChallenge = parse(StandardAuthScheme.BASIC + " realm=\"test\"");
final BasicScheme basicScheme = new BasicScheme();
basicScheme.processChallenge(authChallenge, null);
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java
index 6cc2b35..363f1bc 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestDigestScheme.java
@@ -39,7 +39,7 @@ import java.util.Map;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.AuthenticationException;
import org.apache.hc.client5.http.auth.ChallengeType;
@@ -78,14 +78,14 @@ public class TestDigestScheme {
@Test(expected=MalformedChallengeException.class)
public void testDigestAuthenticationEmptyChallenge1() throws Exception {
- final AuthChallenge authChallenge = parse(AuthSchemes.DIGEST.id);
+ final AuthChallenge authChallenge = parse(StandardAuthScheme.DIGEST);
final AuthScheme authscheme = new DigestScheme();
authscheme.processChallenge(authChallenge, null);
}
@Test(expected=MalformedChallengeException.class)
public void testDigestAuthenticationEmptyChallenge2() throws Exception {
- final AuthChallenge authChallenge = parse(AuthSchemes.DIGEST.id + " ");
+ final AuthChallenge authChallenge = parse(StandardAuthScheme.DIGEST + " ");
final AuthScheme authscheme = new DigestScheme();
authscheme.processChallenge(authChallenge, null);
}
@@ -99,7 +99,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme authscheme = new DigestScheme();
authscheme.processChallenge(authChallenge, null);
@@ -126,7 +126,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme authscheme = new DigestScheme();
authscheme.processChallenge(authChallenge, null);
@@ -150,7 +150,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme authscheme = new DigestScheme();
authscheme.processChallenge(authChallenge, null);
@@ -181,7 +181,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", " +
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", " +
"nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
"algorithm=SHA";
final AuthChallenge authChallenge = parse(challenge);
@@ -208,7 +208,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme authscheme = new DigestScheme();
authscheme.processChallenge(authChallenge, null);
@@ -233,7 +233,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " no-realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
+ final String challenge = StandardAuthScheme.DIGEST + " no-realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme authscheme = new DigestScheme();
authscheme.processChallenge(authChallenge, null);
@@ -251,7 +251,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", no-nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", no-nonce=\"f2a3f18799759d4f1a1c068b92b573cb\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme authscheme = new DigestScheme();
authscheme.processChallenge(authChallenge, null);
@@ -279,7 +279,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials(username, password.toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge=AuthSchemes.DIGEST.id + " realm=\"" + realm + "\", "
+ final String challenge=StandardAuthScheme.DIGEST + " realm=\"" + realm + "\", "
+ "nonce=\"" + nonce + "\", "
+ "opaque=\"SomeString\", "
+ "stale=false, "
@@ -330,7 +330,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials(username, password.toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge=AuthSchemes.DIGEST.id + " realm=\"" + realm + "\", "
+ final String challenge=StandardAuthScheme.DIGEST + " realm=\"" + realm + "\", "
+ "nonce=\"" + nonce + "\", "
+ "opaque=\"SomeString\", "
+ "stale=false, "
@@ -375,7 +375,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials(username, password.toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge=AuthSchemes.DIGEST.id + " realm=\"" + realm + "\", "
+ final String challenge=StandardAuthScheme.DIGEST + " realm=\"" + realm + "\", "
+ "nonce=\"" + nonce + "\", "
+ "opaque=\"SomeString\", "
+ "stale=false, "
@@ -410,7 +410,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials(username, password.toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge=AuthSchemes.DIGEST.id + " realm=\"" + realm + "\", "
+ final String challenge=StandardAuthScheme.DIGEST + " realm=\"" + realm + "\", "
+ "nonce=\"" + nonce + "\", "
+ "opaque=\"SomeString\", "
+ "stale=false, "
@@ -428,7 +428,7 @@ public class TestDigestScheme {
@Test
public void testDigestAuthenticationWithStaleNonce() throws Exception {
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", " +
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", " +
"nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", stale=\"true\"";
final AuthChallenge authChallenge = parse(challenge);
final AuthScheme authscheme = new DigestScheme();
@@ -438,7 +438,7 @@ public class TestDigestScheme {
}
private static Map<String, String> parseAuthResponse(final String authResponse) {
- if (!authResponse.startsWith(AuthSchemes.DIGEST.id + " ")) {
+ if (!authResponse.startsWith(StandardAuthScheme.DIGEST + " ")) {
return null;
}
final String s = authResponse.substring(7);
@@ -460,7 +460,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge1 = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", qop=auth";
+ final String challenge1 = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", qop=auth";
final AuthChallenge authChallenge1 = parse(challenge1);
final DigestScheme authscheme = new DigestScheme();
@@ -476,7 +476,7 @@ public class TestDigestScheme {
final Map<String, String> table2 = parseAuthResponse(authResponse2);
Assert.assertEquals("00000002", table2.get("nc"));
- final String challenge2 = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", qop=auth";
+ final String challenge2 = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", qop=auth";
final AuthChallenge authChallenge2 = parse(challenge2);
authscheme.processChallenge(authChallenge2, null);
@@ -485,7 +485,7 @@ public class TestDigestScheme {
final Map<String, String> table3 = parseAuthResponse(authResponse3);
Assert.assertEquals("00000003", table3.get("nc"));
- final String challenge3 = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"e273f1776275974f1a120d8b92c5b3cb\", qop=auth";
+ final String challenge3 = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"e273f1776275974f1a120d8b92c5b3cb\", qop=auth";
final AuthChallenge authChallenge3 = parse(challenge3);
authscheme.processChallenge(authChallenge3, null);
@@ -505,7 +505,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge1 = AuthSchemes.DIGEST.id + " qop=\"auth\", algorithm=MD5-sess, nonce=\"1234567890abcdef\", " +
+ final String challenge1 = StandardAuthScheme.DIGEST + " qop=\"auth\", algorithm=MD5-sess, nonce=\"1234567890abcdef\", " +
"charset=utf-8, realm=\"subnet.domain.com\"";
final AuthChallenge authChallenge1 = parse(challenge1);
final DigestScheme authscheme = new DigestScheme();
@@ -528,7 +528,7 @@ public class TestDigestScheme {
Assert.assertEquals(cnonce1, cnonce2);
Assert.assertEquals(sessionKey1, sessionKey2);
- final String challenge2 = AuthSchemes.DIGEST.id + " qop=\"auth\", algorithm=MD5-sess, nonce=\"1234567890abcdef\", " +
+ final String challenge2 = StandardAuthScheme.DIGEST + " qop=\"auth\", algorithm=MD5-sess, nonce=\"1234567890abcdef\", " +
"charset=utf-8, realm=\"subnet.domain.com\"";
final AuthChallenge authChallenge2 = parse(challenge2);
authscheme.processChallenge(authChallenge2, null);
@@ -543,7 +543,7 @@ public class TestDigestScheme {
Assert.assertEquals(cnonce1, cnonce3);
Assert.assertEquals(sessionKey1, sessionKey3);
- final String challenge3 = AuthSchemes.DIGEST.id + " qop=\"auth\", algorithm=MD5-sess, nonce=\"fedcba0987654321\", " +
+ final String challenge3 = StandardAuthScheme.DIGEST + " qop=\"auth\", algorithm=MD5-sess, nonce=\"fedcba0987654321\", " +
"charset=utf-8, realm=\"subnet.domain.com\"";
final AuthChallenge authChallenge3 = parse(challenge3);
authscheme.processChallenge(authChallenge3, null);
@@ -595,7 +595,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
"qop=\"auth,auth-int\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme authscheme = new DigestScheme();
@@ -622,7 +622,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
"qop=\"auth-int\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme authscheme = new DigestScheme();
@@ -650,7 +650,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
"qop=\"auth,auth-int\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme authscheme = new DigestScheme();
@@ -677,7 +677,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " Realm=\"-\", " +
+ final String challenge = StandardAuthScheme.DIGEST + " Realm=\"-\", " +
"nonce=\"YjYuNGYyYmJhMzUuY2I5ZDhlZDE5M2ZlZDM 1Mjk3NGJkNTIyYjgyNTcwMjQ=\", " +
"opaque=\"98700A3D9CE17065E2246B41035C6609\", qop=\"auth\"";
final AuthChallenge authChallenge = parse(challenge);
@@ -699,7 +699,7 @@ public class TestDigestScheme {
final Credentials creds = new UsernamePasswordCredentials("username","password".toCharArray());
credentialsProvider.setCredentials(authScope, creds);
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
"qop=\"auth-int\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme authscheme = new DigestScheme();
@@ -711,7 +711,7 @@ public class TestDigestScheme {
@Test
public void testSerialization() throws Exception {
- final String challenge = AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
+ final String challenge = StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
"qop=\"auth,auth-int\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme digestScheme = new DigestScheme();
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java
index edad5a0..a6675c0 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestHttpAuthenticator.java
@@ -40,7 +40,7 @@ import org.apache.hc.client5.http.auth.ChallengeType;
import org.apache.hc.client5.http.auth.Credentials;
import org.apache.hc.client5.http.auth.CredentialsProvider;
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy;
import org.apache.hc.client5.http.protocol.HttpClientContext;
import org.apache.hc.core5.http.HttpHeaders;
@@ -69,7 +69,7 @@ public class TestHttpAuthenticator {
@Override
public String getName() {
- return AuthSchemes.BASIC.id;
+ return StandardAuthScheme.BASIC;
}
}
@@ -94,9 +94,9 @@ public class TestHttpAuthenticator {
this.credentialsProvider = Mockito.mock(CredentialsProvider.class);
this.context.setAttribute(HttpClientContext.CREDS_PROVIDER, this.credentialsProvider);
this.authSchemeRegistry = RegistryBuilder.<AuthSchemeFactory>create()
- .register(AuthSchemes.BASIC.id, BasicSchemeFactory.INSTANCE)
- .register(AuthSchemes.DIGEST.id, DigestSchemeFactory.INSTANCE)
- .register(AuthSchemes.NTLM.id, NTLMSchemeFactory.INSTANCE).build();
+ .register(StandardAuthScheme.BASIC, BasicSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.DIGEST, DigestSchemeFactory.INSTANCE)
+ .register(StandardAuthScheme.NTLM, NTLMSchemeFactory.INSTANCE).build();
this.context.setAttribute(HttpClientContext.AUTHSCHEME_REGISTRY, this.authSchemeRegistry);
this.authCache = Mockito.mock(AuthCache.class);
this.context.setAttribute(HttpClientContext.AUTH_CACHE, this.authCache);
@@ -106,7 +106,7 @@ public class TestHttpAuthenticator {
@Test
public void testUpdateAuthExchange() throws Exception {
final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED, "UNAUTHORIZED");
- response.setHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=test");
+ response.setHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=test");
Assert.assertTrue(this.httpAuthenticator.isChallenged(
this.defaultHost, ChallengeType.TARGET, response, this.authExchange, this.context));
Mockito.verifyZeroInteractions(this.authCache);
@@ -115,7 +115,7 @@ public class TestHttpAuthenticator {
@Test
public void testAuthenticationRequestedAfterSuccess() throws Exception {
final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED, "UNAUTHORIZED");
- response.setHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=test");
+ response.setHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=test");
this.authExchange.select(this.authScheme);
this.authExchange.setState(AuthExchange.State.SUCCESS);
@@ -165,8 +165,8 @@ public class TestHttpAuthenticator {
public void testAuthentication() throws Exception {
final HttpHost host = new HttpHost("somehost", 80);
final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED, "UNAUTHORIZED");
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=\"test\""));
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"1234\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=\"test\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"1234\""));
response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, "whatever realm=\"realm1\", stuff=\"1234\""));
final Credentials credentials = new UsernamePasswordCredentials("user", "pass".toCharArray());
@@ -183,10 +183,10 @@ public class TestHttpAuthenticator {
Assert.assertNotNull(options);
final AuthScheme authScheme1 = options.poll();
Assert.assertNotNull(authScheme1);
- Assert.assertEquals(AuthSchemes.DIGEST.id, authScheme1.getName());
+ Assert.assertEquals(StandardAuthScheme.DIGEST, authScheme1.getName());
final AuthScheme authScheme2 = options.poll();
Assert.assertNotNull(authScheme2);
- Assert.assertEquals(AuthSchemes.BASIC.id, authScheme2.getName());
+ Assert.assertEquals(StandardAuthScheme.BASIC, authScheme2.getName());
Assert.assertNull(options.poll());
}
@@ -195,11 +195,11 @@ public class TestHttpAuthenticator {
final HttpHost host = new HttpHost("somehost", 80);
final HttpResponse response =
new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED, "UNAUTHORIZED");
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=\"test\""));
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"1234\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=\"test\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"1234\""));
final Credentials credentials = new UsernamePasswordCredentials("user", "pass".toCharArray());
- Mockito.when(this.credentialsProvider.getCredentials(Mockito.eq(new AuthScope(host, "test", AuthSchemes.BASIC.id)),
+ Mockito.when(this.credentialsProvider.getCredentials(Mockito.eq(new AuthScope(host, "test", StandardAuthScheme.BASIC)),
Mockito.<HttpContext>any())).thenReturn(credentials);
final DefaultAuthenticationStrategy authStrategy = new DefaultAuthenticationStrategy();
@@ -212,7 +212,7 @@ public class TestHttpAuthenticator {
Assert.assertNotNull(options);
final AuthScheme authScheme1 = options.poll();
Assert.assertNotNull(authScheme1);
- Assert.assertEquals(AuthSchemes.BASIC.id, authScheme1.getName());
+ Assert.assertEquals(StandardAuthScheme.BASIC, authScheme1.getName());
Assert.assertNull(options.poll());
}
@@ -244,8 +244,8 @@ public class TestHttpAuthenticator {
public void testAuthenticationNoCredentials() throws Exception {
final HttpHost host = new HttpHost("somehost", 80);
final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED, "UNAUTHORIZED");
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=\"test\""));
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"1234\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=\"test\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"1234\""));
final DefaultAuthenticationStrategy authStrategy = new DefaultAuthenticationStrategy();
@@ -257,8 +257,8 @@ public class TestHttpAuthenticator {
public void testAuthenticationFailed() throws Exception {
final HttpHost host = new HttpHost("somehost", 80);
final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED, "UNAUTHORIZED");
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=\"test\""));
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"1234\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=\"test\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"1234\""));
this.authExchange.setState(AuthExchange.State.CHALLENGED);
this.authExchange.select(this.authScheme);
@@ -277,8 +277,8 @@ public class TestHttpAuthenticator {
public void testAuthenticationFailedPreviously() throws Exception {
final HttpHost host = new HttpHost("somehost", 80);
final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED, "UNAUTHORIZED");
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=\"test\""));
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"1234\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=\"test\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"1234\""));
this.authExchange.setState(AuthExchange.State.FAILURE);
@@ -294,8 +294,8 @@ public class TestHttpAuthenticator {
public void testAuthenticationFailure() throws Exception {
final HttpHost host = new HttpHost("somehost", 80);
final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED, "UNAUTHORIZED");
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=\"test\""));
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"1234\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=\"test\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"1234\""));
response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, "whatever realm=\"realm1\", stuff=\"1234\""));
final DefaultAuthenticationStrategy authStrategy = new DefaultAuthenticationStrategy();
@@ -312,8 +312,8 @@ public class TestHttpAuthenticator {
public void testAuthenticationHandshaking() throws Exception {
final HttpHost host = new HttpHost("somehost", 80);
final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED, "UNAUTHORIZED");
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=\"test\""));
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.DIGEST.id + " realm=\"realm1\", stale=true, nonce=\"1234\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=\"test\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.DIGEST + " realm=\"realm1\", stale=true, nonce=\"1234\""));
response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, "whatever realm=\"realm1\", stuff=\"1234\""));
final DefaultAuthenticationStrategy authStrategy = new DefaultAuthenticationStrategy();
@@ -331,11 +331,11 @@ public class TestHttpAuthenticator {
public void testAuthenticationNoMatchingChallenge() throws Exception {
final HttpHost host = new HttpHost("somehost", 80);
final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED, "UNAUTHORIZED");
- response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.DIGEST.id + " realm=\"realm1\", nonce=\"1234\""));
+ response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.DIGEST + " realm=\"realm1\", nonce=\"1234\""));
response.addHeader(new BasicHeader(HttpHeaders.WWW_AUTHENTICATE, "whatever realm=\"realm1\", stuff=\"1234\""));
final Credentials credentials = new UsernamePasswordCredentials("user", "pass".toCharArray());
- Mockito.when(this.credentialsProvider.getCredentials(Mockito.eq(new AuthScope(host, "realm1", AuthSchemes.DIGEST.id)),
+ Mockito.when(this.credentialsProvider.getCredentials(Mockito.eq(new AuthScope(host, "realm1", StandardAuthScheme.DIGEST)),
Mockito.<HttpContext>any())).thenReturn(credentials);
final DefaultAuthenticationStrategy authStrategy = new DefaultAuthenticationStrategy();
@@ -351,7 +351,7 @@ public class TestHttpAuthenticator {
Assert.assertNotNull(options);
final AuthScheme authScheme1 = options.poll();
Assert.assertNotNull(authScheme1);
- Assert.assertEquals(AuthSchemes.DIGEST.id, authScheme1.getName());
+ Assert.assertEquals(StandardAuthScheme.DIGEST, authScheme1.getName());
Assert.assertNull(options.poll());
}
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java
index f5b6405..11016a8 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java
@@ -28,11 +28,12 @@ package org.apache.hc.client5.http.impl.auth;
import java.net.Authenticator;
import java.net.Authenticator.RequestorType;
+import java.util.Locale;
import java.net.InetAddress;
import java.net.PasswordAuthentication;
import java.net.URL;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.Credentials;
import org.apache.hc.client5.http.classic.methods.HttpGet;
@@ -92,7 +93,7 @@ public class TestSystemDefaultCredentialsProvider {
final AuthenticatorDelegate authenticatorDelegate = installAuthenticator(AUTH1);
final URL httpRequestUrl = new URL(TARGET_SCHEME1, TARGET_HOST1, TARGET_PORT1, "/");
- final AuthScope authScope = new AuthScope(PROXY_PROTOCOL1, PROXY_HOST1, PROXY_PORT1, PROMPT1, AuthSchemes.BASIC.id);
+ final AuthScope authScope = new AuthScope(PROXY_PROTOCOL1, PROXY_HOST1, PROXY_PORT1, PROMPT1, StandardAuthScheme.BASIC);
final HttpCoreContext coreContext = new HttpCoreContext();
coreContext.setAttribute(HttpCoreContext.HTTP_REQUEST, new HttpGet(httpRequestUrl.toURI()));
@@ -100,7 +101,7 @@ public class TestSystemDefaultCredentialsProvider {
new SystemDefaultCredentialsProvider().getCredentials(authScope, coreContext);
Mockito.verify(authenticatorDelegate).getPasswordAuthentication(PROXY_HOST1, null, PROXY_PORT1, PROXY_PROTOCOL1,
- PROMPT1, AuthSchemes.BASIC.id, httpRequestUrl,
+ PROMPT1, StandardAuthScheme.BASIC.toUpperCase(Locale.ROOT), httpRequestUrl,
RequestorType.SERVER);
Assert.assertNotNull(receivedCredentials);
Assert.assertEquals(AUTH1.getUserName(), receivedCredentials.getUserPrincipal().getName());
@@ -112,13 +113,13 @@ public class TestSystemDefaultCredentialsProvider {
final AuthenticatorDelegate authenticatorDelegate = installAuthenticator(AUTH1);
- final AuthScope authScope = new AuthScope(PROXY_PROTOCOL1, PROXY_HOST1, PROXY_PORT1, PROMPT1, AuthSchemes.BASIC.id);
+ final AuthScope authScope = new AuthScope(PROXY_PROTOCOL1, PROXY_HOST1, PROXY_PORT1, PROMPT1, StandardAuthScheme.BASIC);
final Credentials receivedCredentials =
new SystemDefaultCredentialsProvider().getCredentials(authScope, null);
Mockito.verify(authenticatorDelegate).getPasswordAuthentication(PROXY_HOST1, null, PROXY_PORT1, PROXY_PROTOCOL1,
- PROMPT1, AuthSchemes.BASIC.id, null,
+ PROMPT1, StandardAuthScheme.BASIC.toUpperCase(Locale.ROOT), null,
RequestorType.SERVER);
Assert.assertNotNull(receivedCredentials);
Assert.assertEquals(AUTH1.getUserName(), receivedCredentials.getUserPrincipal().getName());
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestConnectExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestConnectExec.java
index 8684c79..82dd8fe 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestConnectExec.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestConnectExec.java
@@ -36,7 +36,7 @@ import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.RouteInfo;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.ChallengeType;
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
@@ -245,7 +245,7 @@ public class TestConnectExec {
final HttpClientContext context = new HttpClientContext();
final ClassicHttpRequest request = new HttpGet("http://bar/test");
final ClassicHttpResponse response1 = new BasicClassicHttpResponse(407, "Huh?");
- response1.setHeader(HttpHeaders.PROXY_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=test");
+ response1.setHeader(HttpHeaders.PROXY_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=test");
final InputStream inStream1 = Mockito.spy(new ByteArrayInputStream(new byte[] {1, 2, 3}));
response1.setEntity(EntityBuilder.create()
.setStream(inStream1)
@@ -286,7 +286,7 @@ public class TestConnectExec {
final HttpClientContext context = new HttpClientContext();
final ClassicHttpRequest request = new HttpGet("http://bar/test");
final ClassicHttpResponse response1 = new BasicClassicHttpResponse(407, "Huh?");
- response1.setHeader(HttpHeaders.PROXY_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=test");
+ response1.setHeader(HttpHeaders.PROXY_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=test");
final InputStream inStream1 = Mockito.spy(new ByteArrayInputStream(new byte[] {1, 2, 3}));
response1.setEntity(EntityBuilder.create()
.setStream(inStream1)
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestProtocolExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestProtocolExec.java
index 293e36f..38619df 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestProtocolExec.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestProtocolExec.java
@@ -39,7 +39,7 @@ import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthExchange;
import org.apache.hc.client5.http.auth.AuthScheme;
-import org.apache.hc.client5.http.auth.AuthSchemes;
+import org.apache.hc.client5.http.auth.StandardAuthScheme;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.ChallengeType;
import org.apache.hc.client5.http.auth.Credentials;
@@ -214,7 +214,7 @@ public class TestProtocolExec {
final HttpClientContext context = new HttpClientContext();
final ClassicHttpRequest request = new HttpGet("http://foo/test");
final ClassicHttpResponse response1 = new BasicClassicHttpResponse(401, "Huh?");
- response1.setHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=test");
+ response1.setHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=test");
final InputStream inStream1 = Mockito.spy(new ByteArrayInputStream(new byte[] {1, 2, 3}));
response1.setEntity(EntityBuilder.create()
.setStream(inStream1)
@@ -253,7 +253,7 @@ public class TestProtocolExec {
final HttpRoute route = new HttpRoute(target, proxy);
final ClassicHttpRequest request = new HttpGet("http://foo/test");
final ClassicHttpResponse response1 = new BasicClassicHttpResponse(401, "Huh?");
- response1.setHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=test");
+ response1.setHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=test");
final InputStream inStream1 = Mockito.spy(new ByteArrayInputStream(new byte[] {1, 2, 3}));
response1.setEntity(EntityBuilder.create()
.setStream(inStream1)
@@ -305,7 +305,7 @@ public class TestProtocolExec {
.setStream(inStream0)
.build());
final ClassicHttpResponse response1 = new BasicClassicHttpResponse(401, "Huh?");
- response1.setHeader(HttpHeaders.WWW_AUTHENTICATE, AuthSchemes.BASIC.id + " realm=test");
+ response1.setHeader(HttpHeaders.WWW_AUTHENTICATE, StandardAuthScheme.BASIC + " realm=test");
final InputStream inStream1 = new ByteArrayInputStream(new byte[] {1, 2, 3});
response1.setEntity(EntityBuilder.create()
.setStream(inStream1)
[httpcomponents-client] 02/02: Properly distinguish between
AuthScheme and auth scheme name
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch authschemename-rework
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit 3730b03a99308ff99769fdd60e80a43230cf5aac
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Dec 30 01:20:04 2019 +0100
Properly distinguish between AuthScheme and auth scheme name
Throughout the code the terms 'authScheme' and 'scheme' have been used
synonymously for an AuthScheme instance and a string-based auth scheme
name. To avoid confusion, fields, methods and variable have been adapted
to distinguish both properly. If necessary, Javadoc has been modified to
denote the nature of the input.
Also an auth scheme name is retained as-is, but normalized to lowercase
if comparsion is required.
This closes #193
---
.../testing/auth/BasicAuthTokenExtractor.java | 4 +--
.../win/WindowsNegotiateSchemeGetTokenFail.java | 4 +--
.../http/impl/win/WindowsNegotiateScheme.java | 14 ++++----
.../apache/hc/client5/http/auth/AuthChallenge.java | 16 ++++-----
.../org/apache/hc/client5/http/auth/AuthScope.java | 40 +++++++++++++---------
.../hc/client5/http/config/RequestConfig.java | 4 +--
.../http/impl/DefaultAuthenticationStrategy.java | 10 +++---
.../http/impl/auth/AuthChallengeParser.java | 20 +++++------
.../client5/http/impl/auth/HttpAuthenticator.java | 14 ++++----
.../auth/SystemDefaultCredentialsProvider.java | 4 +--
.../hc/client5/http/auth/TestAuthChallenge.java | 4 +--
.../apache/hc/client5/http/auth/TestAuthScope.java | 16 +++++----
.../http/impl/auth/TestAuthChallengeParser.java | 18 +++++-----
.../auth/TestSystemDefaultCredentialsProvider.java | 5 ++-
14 files changed, 91 insertions(+), 82 deletions(-)
diff --git a/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/auth/BasicAuthTokenExtractor.java b/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/auth/BasicAuthTokenExtractor.java
index 525832b..a576057 100644
--- a/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/auth/BasicAuthTokenExtractor.java
+++ b/httpclient5-testing/src/main/java/org/apache/hc/client5/testing/auth/BasicAuthTokenExtractor.java
@@ -44,8 +44,8 @@ public class BasicAuthTokenExtractor {
if (i == -1) {
throw new ProtocolException("Invalid challenge response: " + challengeResponse);
}
- final String authscheme = challengeResponse.substring(0, i);
- if (authscheme.equalsIgnoreCase(StandardAuthScheme.BASIC)) {
+ final String schemeName = challengeResponse.substring(0, i);
+ if (schemeName.equalsIgnoreCase(StandardAuthScheme.BASIC)) {
final String s = challengeResponse.substring(i + 1).trim();
try {
final byte[] credsRaw = s.getBytes(StandardCharsets.US_ASCII);
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeGetTokenFail.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeGetTokenFail.java
index 25bb1e4..3a49263 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeGetTokenFail.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateSchemeGetTokenFail.java
@@ -32,8 +32,8 @@ import com.sun.jna.platform.win32.WinError;
public final class WindowsNegotiateSchemeGetTokenFail extends WindowsNegotiateScheme {
- public WindowsNegotiateSchemeGetTokenFail(final String scheme, final String servicePrincipalName) {
- super(scheme, servicePrincipalName);
+ public WindowsNegotiateSchemeGetTokenFail(final String schemeName, final String servicePrincipalName) {
+ super(schemeName, servicePrincipalName);
}
@Override
diff --git a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
index 4d39b8c..b269fa3 100644
--- a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
+++ b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
@@ -74,7 +74,7 @@ public class WindowsNegotiateScheme implements AuthScheme {
private final Logger log = LoggerFactory.getLogger(getClass());
// NTLM or Negotiate
- private final String scheme;
+ private final String schemeName;
private final String servicePrincipalName;
private ChallengeType challengeType;
@@ -83,15 +83,15 @@ public class WindowsNegotiateScheme implements AuthScheme {
private CtxtHandle sspiContext;
private boolean continueNeeded;
- WindowsNegotiateScheme(final String scheme, final String servicePrincipalName) {
+ WindowsNegotiateScheme(final String schemeName, final String servicePrincipalName) {
super();
- this.scheme = (scheme == null) ? StandardAuthScheme.SPNEGO : scheme;
+ this.schemeName = (schemeName == null) ? StandardAuthScheme.SPNEGO : schemeName;
this.continueNeeded = true;
this.servicePrincipalName = servicePrincipalName;
if (this.log.isDebugEnabled()) {
- this.log.debug("Created WindowsNegotiateScheme using " + this.scheme);
+ this.log.debug("Created WindowsNegotiateScheme using " + this.schemeName);
}
}
@@ -115,7 +115,7 @@ public class WindowsNegotiateScheme implements AuthScheme {
@Override
public String getName() {
- return scheme;
+ return schemeName;
}
@Override
@@ -186,7 +186,7 @@ public class WindowsNegotiateScheme implements AuthScheme {
clientCred = new CredHandle();
final int rc = Secur32.INSTANCE.AcquireCredentialsHandle(username,
- scheme, Sspi.SECPKG_CRED_OUTBOUND, null, null, null, null,
+ schemeName, Sspi.SECPKG_CRED_OUTBOUND, null, null, null, null,
clientCred, lifetime);
if (WinError.SEC_E_OK != rc) {
@@ -220,7 +220,7 @@ public class WindowsNegotiateScheme implements AuthScheme {
throw ex;
}
}
- return scheme + " " + response;
+ return schemeName + " " + response;
}
private void failAuthCleanup() {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthChallenge.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthChallenge.java
index bfd3181..e150a18 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthChallenge.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthChallenge.java
@@ -46,28 +46,28 @@ import org.apache.hc.core5.util.Args;
public final class AuthChallenge {
private final ChallengeType challengeType;
- private final String scheme;
+ private final String schemeName;
private final String value;
private final List<NameValuePair> params;
- public AuthChallenge(final ChallengeType challengeType, final String scheme, final String value, final List<? extends NameValuePair> params) {
+ public AuthChallenge(final ChallengeType challengeType, final String schemeName, final String value, final List<? extends NameValuePair> params) {
super();
this.challengeType = Args.notNull(challengeType, "Challenge type");
- this.scheme = Args.notNull(scheme, "Auth scheme");
+ this.schemeName = Args.notNull(schemeName, "schemeName");
this.value = value;
this.params = params != null ? Collections.unmodifiableList(new ArrayList<>(params)) : null;
}
- public AuthChallenge(final ChallengeType challengeType, final String scheme, final NameValuePair... params) {
- this(challengeType, scheme, null, Arrays.asList(params));
+ public AuthChallenge(final ChallengeType challengeType, final String schemeName, final NameValuePair... params) {
+ this(challengeType, schemeName, null, Arrays.asList(params));
}
public ChallengeType getChallengeType() {
return challengeType;
}
- public String getScheme() {
- return scheme;
+ public String getSchemeName() {
+ return schemeName;
}
public String getValue() {
@@ -81,7 +81,7 @@ public final class AuthChallenge {
@Override
public String toString() {
final StringBuilder buffer = new StringBuilder();
- buffer.append(scheme).append(" ");
+ buffer.append(schemeName).append(" ");
if (value != null) {
buffer.append(value);
} else if (params != null) {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthScope.java b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthScope.java
index 74fe68c..f29919c 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthScope.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/auth/AuthScope.java
@@ -48,7 +48,7 @@ public class AuthScope {
private final String host;
private final int port;
private final String realm;
- private final String authScheme;
+ private final String schemeName;
/**
* Defines auth scope with the given {@code protocol}, {@code host}, {@code port},
@@ -62,20 +62,20 @@ public class AuthScope {
* to any port of the host.
* @param realm authentication realm. May be {@code null} if applies
* to any realm on the host.
- * @param authScheme authentication scheme. May be {@code null} if applies
- * to any authScheme supported by the host.
+ * @param schemeName authentication scheme name. May be {@code null} if applies
+ * to any auth scheme supported by the host.
*/
public AuthScope(
final String protocol,
final String host,
final int port,
final String realm,
- final String authScheme) {
+ final String schemeName) {
this.protocol = protocol != null ? protocol.toLowerCase(Locale.ROOT) : null;
this.host = host != null ? host.toLowerCase(Locale.ROOT) : null;
this.port = port >= 0 ? port: -1;
this.realm = realm;
- this.authScheme = authScheme != null ? authScheme.toUpperCase(Locale.ROOT): null;
+ this.schemeName = schemeName != null ? schemeName : null;
}
/**
@@ -84,8 +84,8 @@ public class AuthScope {
* @param origin host of origin
* @param realm authentication realm. May be {@code null} if applies
* to any realm on the host.
- * @param schemeName authentication authScheme. May be {@code null} if applies
- * to any authScheme supported by the host.
+ * @param schemeName authentication scheme name. May be {@code null} if applies
+ * to any auth scheme supported by the host.
*
* @since 4.2
*/
@@ -98,7 +98,7 @@ public class AuthScope {
this.host = origin.getHostName().toLowerCase(Locale.ROOT);
this.port = origin.getPort() >= 0 ? origin.getPort() : -1;
this.realm = realm;
- this.authScheme = schemeName != null ? schemeName.toUpperCase(Locale.ROOT): null;
+ this.schemeName = schemeName != null ? schemeName : null;
}
/**
@@ -134,7 +134,7 @@ public class AuthScope {
this.host = authScope.getHost();
this.port = authScope.getPort();
this.realm = authScope.getRealm();
- this.authScheme = authScope.getAuthScheme();
+ this.schemeName = authScope.getSchemeName();
}
public String getProtocol() {
@@ -153,8 +153,8 @@ public class AuthScope {
return this.realm;
}
- public String getAuthScheme() {
- return this.authScheme;
+ public String getSchemeName() {
+ return this.schemeName;
}
/**
@@ -166,10 +166,11 @@ public class AuthScope {
*/
public int match(final AuthScope that) {
int factor = 0;
- if (LangUtils.equals(this.authScheme, that.authScheme)) {
+ if (LangUtils.equals(toNullSafeLowerCase(this.schemeName),
+ toNullSafeLowerCase(that.schemeName))) {
factor += 1;
} else {
- if (this.authScheme != null && that.authScheme != null) {
+ if (this.schemeName != null && that.schemeName != null) {
return -1;
}
}
@@ -215,7 +216,8 @@ public class AuthScope {
&& LangUtils.equals(this.host, that.host)
&& this.port == that.port
&& LangUtils.equals(this.realm, that.realm)
- && LangUtils.equals(this.authScheme, that.authScheme);
+ && LangUtils.equals(toNullSafeLowerCase(this.schemeName),
+ toNullSafeLowerCase(that.schemeName));
}
return false;
}
@@ -227,15 +229,19 @@ public class AuthScope {
hash = LangUtils.hashCode(hash, this.host);
hash = LangUtils.hashCode(hash, this.port);
hash = LangUtils.hashCode(hash, this.realm);
- hash = LangUtils.hashCode(hash, this.authScheme);
+ hash = LangUtils.hashCode(hash, toNullSafeLowerCase(this.schemeName));
return hash;
}
+ private String toNullSafeLowerCase(final String str) {
+ return str != null ? str.toLowerCase(Locale.ROOT) : null;
+ }
+
@Override
public String toString() {
final StringBuilder buffer = new StringBuilder();
- if (this.authScheme != null) {
- buffer.append(this.authScheme);
+ if (this.schemeName != null) {
+ buffer.append(this.schemeName);
} else {
buffer.append("<any auth scheme>");
}
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/config/RequestConfig.java b/httpclient5/src/main/java/org/apache/hc/client5/http/config/RequestConfig.java
index a5435a3..66cdf2f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/config/RequestConfig.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/config/RequestConfig.java
@@ -373,7 +373,7 @@ public class RequestConfig implements Cloneable {
/**
* Determines the order of preference for supported authentication schemes
- * when authenticating with the target host.
+ * by their names when authenticating with the target host.
* <p>
* Default: {@code null}
* </p>
@@ -385,7 +385,7 @@ public class RequestConfig implements Cloneable {
/**
* Determines the order of preference for supported authentication schemes
- * when authenticating with the proxy host.
+ * by their names when authenticating with the proxy host.
* <p>
* Default: {@code null}
* </p>
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java
index 3eb3762..7e41675 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java
@@ -97,13 +97,13 @@ public class DefaultAuthenticationStrategy implements AuthenticationStrategy {
this.log.debug("Authentication schemes in the order of preference: " + authPrefs);
}
- for (final String id: authPrefs) {
- final AuthChallenge challenge = challenges.get(id.toLowerCase(Locale.ROOT));
+ for (final String schemeName: authPrefs) {
+ final AuthChallenge challenge = challenges.get(schemeName.toLowerCase(Locale.ROOT));
if (challenge != null) {
- final AuthSchemeFactory authSchemeFactory = registry.lookup(id);
+ final AuthSchemeFactory authSchemeFactory = registry.lookup(schemeName);
if (authSchemeFactory == null) {
if (this.log.isWarnEnabled()) {
- this.log.warn("Authentication scheme " + id + " not supported");
+ this.log.warn("Authentication scheme " + schemeName + " not supported");
// Try again
}
continue;
@@ -112,7 +112,7 @@ public class DefaultAuthenticationStrategy implements AuthenticationStrategy {
options.add(authScheme);
} else {
if (this.log.isDebugEnabled()) {
- this.log.debug("Challenge for " + id + " authentication scheme not available");
+ this.log.debug("Challenge for " + schemeName + " authentication scheme not available");
}
}
}
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java
index 1675b6d..6ad6c39 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/AuthChallengeParser.java
@@ -88,42 +88,42 @@ public class AuthChallengeParser {
final ChallengeType challengeType, final CharSequence buffer, final ParserCursor cursor) throws ParseException {
final List<AuthChallenge> list = new ArrayList<>();
- String scheme = null;
+ String schemeName = null;
final List<NameValuePair> params = new ArrayList<>();
while (!cursor.atEnd()) {
final NameValuePair tokenOrParameter = parseTokenOrParameter(buffer, cursor);
if (tokenOrParameter.getValue() == null && !cursor.atEnd() && buffer.charAt(cursor.getPos()) != COMMA_CHAR) {
- if (scheme != null) {
+ if (schemeName != null) {
if (params.isEmpty()) {
throw new ParseException("Malformed auth challenge");
}
- list.add(createAuthChallenge(challengeType, scheme, params));
+ list.add(createAuthChallenge(challengeType, schemeName, params));
params.clear();
}
- scheme = tokenOrParameter.getName();
+ schemeName = tokenOrParameter.getName();
} else {
params.add(tokenOrParameter);
if (!cursor.atEnd() && buffer.charAt(cursor.getPos()) != COMMA_CHAR) {
- scheme = null;
+ schemeName = null;
}
}
if (!cursor.atEnd() && buffer.charAt(cursor.getPos()) == COMMA_CHAR) {
cursor.updatePos(cursor.getPos() + 1);
}
}
- list.add(createAuthChallenge(challengeType, scheme, params));
+ list.add(createAuthChallenge(challengeType, schemeName, params));
return list;
}
- private static AuthChallenge createAuthChallenge(final ChallengeType challengeType, final String scheme, final List<NameValuePair> params) throws ParseException {
- if (scheme != null) {
+ private static AuthChallenge createAuthChallenge(final ChallengeType challengeType, final String schemeName, final List<NameValuePair> params) throws ParseException {
+ if (schemeName != null) {
if (params.size() == 1) {
final NameValuePair nvp = params.get(0);
if (nvp.getValue() == null) {
- return new AuthChallenge(challengeType, scheme, nvp.getName(), null);
+ return new AuthChallenge(challengeType, schemeName, nvp.getName(), null);
}
}
- return new AuthChallenge(challengeType, scheme, null, params.size() > 0 ? params : null);
+ return new AuthChallenge(challengeType, schemeName, null, params.size() > 0 ? params : null);
}
if (params.size() == 1) {
final NameValuePair nvp = params.get(0);
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
index 3d8e944..8bcd124 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
@@ -195,9 +195,9 @@ public final class HttpAuthenticator {
continue;
}
for (final AuthChallenge authChallenge: authChallenges) {
- final String scheme = authChallenge.getScheme().toLowerCase(Locale.ROOT);
- if (!challengeMap.containsKey(scheme)) {
- challengeMap.put(scheme, authChallenge);
+ final String schemeName = authChallenge.getSchemeName().toLowerCase(Locale.ROOT);
+ if (!challengeMap.containsKey(schemeName)) {
+ challengeMap.put(schemeName, authChallenge);
}
}
}
@@ -220,8 +220,8 @@ public final class HttpAuthenticator {
case UNCHALLENGED:
final AuthScheme authScheme = authExchange.getAuthScheme();
if (authScheme != null) {
- final String id = authScheme.getName();
- final AuthChallenge challenge = challengeMap.get(id.toLowerCase(Locale.ROOT));
+ final String schemeName = authScheme.getName();
+ final AuthChallenge challenge = challengeMap.get(schemeName.toLowerCase(Locale.ROOT));
if (challenge != null) {
this.log.debug("Authorization challenge processed");
try {
@@ -259,8 +259,8 @@ public final class HttpAuthenticator {
final Queue<AuthScheme> authOptions = new LinkedList<>();
for (final AuthScheme authScheme: preferredSchemes) {
try {
- final String id = authScheme.getName();
- final AuthChallenge challenge = challengeMap.get(id.toLowerCase(Locale.ROOT));
+ final String schemeName = authScheme.getName();
+ final AuthChallenge challenge = challengeMap.get(schemeName.toLowerCase(Locale.ROOT));
authScheme.processChallenge(challenge, context);
if (authScheme.isResponseReady(host, credsProvider, context)) {
authOptions.add(authScheme);
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java
index dfb4d0b..7e7e201 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java
@@ -91,7 +91,7 @@ public class SystemDefaultCredentialsProvider implements CredentialsStore {
authScope.getPort(),
protocol,
authScope.getRealm(),
- authScope.getAuthScheme(),
+ authScope.getSchemeName(),
targetHostURL,
requestorType);
}
@@ -128,7 +128,7 @@ public class SystemDefaultCredentialsProvider implements CredentialsStore {
if (domain != null) {
return new NTCredentials(systemcreds.getUserName(), systemcreds.getPassword(), null, domain);
}
- if (StandardAuthScheme.NTLM.equalsIgnoreCase(authScope.getAuthScheme())) {
+ if (StandardAuthScheme.NTLM.equalsIgnoreCase(authScope.getSchemeName())) {
// Domain may be specified in a fully qualified user name
return new NTCredentials(
systemcreds.getUserName(), systemcreds.getPassword(), null, null);
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java b/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java
index 89ea358..ff26159 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthChallenge.java
@@ -38,7 +38,7 @@ public class TestAuthChallenge {
@Test
public void testAuthChallengeWithValue() {
final AuthChallenge authChallenge = new AuthChallenge(ChallengeType.TARGET, StandardAuthScheme.BASIC, "blah", null);
- Assert.assertEquals(StandardAuthScheme.BASIC, authChallenge.getScheme());
+ Assert.assertEquals(StandardAuthScheme.BASIC, authChallenge.getSchemeName());
Assert.assertEquals("blah", authChallenge.getValue());
Assert.assertEquals(null, authChallenge.getParams());
Assert.assertEquals(StandardAuthScheme.BASIC + " blah", authChallenge.toString());
@@ -48,7 +48,7 @@ public class TestAuthChallenge {
public void testAuthChallengeWithParams() {
final AuthChallenge authChallenge = new AuthChallenge(ChallengeType.TARGET, StandardAuthScheme.BASIC, null,
Arrays.asList(new BasicNameValuePair("blah", "this"), new BasicNameValuePair("blah", "that")));
- Assert.assertEquals(StandardAuthScheme.BASIC, authChallenge.getScheme());
+ Assert.assertEquals(StandardAuthScheme.BASIC, authChallenge.getSchemeName());
Assert.assertEquals(null, authChallenge.getValue());
Assert.assertNotNull(authChallenge.getParams());
Assert.assertEquals(StandardAuthScheme.BASIC + " [blah=this, blah=that]", authChallenge.toString());
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java b/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java
index b81926d..11841ef 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/auth/TestAuthScope.java
@@ -37,20 +37,20 @@ public class TestAuthScope {
@Test
public void testBasics() {
- final AuthScope authscope = new AuthScope("http", "somehost", 80, "somerealm", "somescheme");
- Assert.assertEquals("SOMESCHEME", authscope.getAuthScheme());
+ final AuthScope authscope = new AuthScope("http", "somehost", 80, "somerealm", "SomeScheme");
+ Assert.assertEquals("SomeScheme", authscope.getSchemeName());
Assert.assertEquals("http", authscope.getProtocol());
Assert.assertEquals("somehost", authscope.getHost());
Assert.assertEquals(80, authscope.getPort());
Assert.assertEquals("somerealm", authscope.getRealm());
- Assert.assertEquals("SOMESCHEME 'somerealm' http://somehost:80", authscope.toString());
+ Assert.assertEquals("SomeScheme 'somerealm' http://somehost:80", authscope.toString());
}
@Test
public void testByOrigin() {
final HttpHost host = new HttpHost("http", "somehost", 8080);
final AuthScope authscope = new AuthScope(host);
- Assert.assertEquals(null, authscope.getAuthScheme());
+ Assert.assertEquals(null, authscope.getSchemeName());
Assert.assertEquals("somehost", authscope.getHost());
Assert.assertEquals(8080, authscope.getPort());
Assert.assertEquals(null, authscope.getRealm());
@@ -61,7 +61,7 @@ public class TestAuthScope {
@Test
public void testMixedCaseHostname() {
final AuthScope authscope = new AuthScope("SomeHost", 80);
- Assert.assertEquals(null, authscope.getAuthScheme());
+ Assert.assertEquals(null, authscope.getSchemeName());
Assert.assertEquals("somehost", authscope.getHost());
Assert.assertEquals(80, authscope.getPort());
Assert.assertEquals(null, authscope.getRealm());
@@ -78,7 +78,7 @@ public class TestAuthScope {
@Test
public void testBasicsAllOptional() {
final AuthScope authscope = new AuthScope(null, null, -1, null, null);
- Assert.assertEquals(null, authscope.getAuthScheme());
+ Assert.assertEquals(null, authscope.getSchemeName());
Assert.assertEquals(null, authscope.getHost());
Assert.assertEquals(-1, authscope.getPort());
Assert.assertEquals(null, authscope.getRealm());
@@ -125,6 +125,7 @@ public class TestAuthScope {
final AuthScope authscope5 = new AuthScope("http", "somehost", 80, "someotherrealm", "somescheme");
final AuthScope authscope6 = new AuthScope("http", "somehost", 80, "somerealm", "someotherscheme");
final AuthScope authscope7 = new AuthScope("https", "somehost", 80, "somerealm", "somescheme");
+ final AuthScope authscope8 = new AuthScope("https", "somehost", 80, "somerealm", "SomeScheme");
Assert.assertTrue(authscope1.equals(authscope1));
Assert.assertFalse(authscope1.equals(authscope2));
Assert.assertTrue(authscope1.equals(authscope3));
@@ -132,6 +133,7 @@ public class TestAuthScope {
Assert.assertFalse(authscope1.equals(authscope5));
Assert.assertFalse(authscope1.equals(authscope6));
Assert.assertFalse(authscope1.equals(authscope7));
+ Assert.assertTrue(authscope7.equals(authscope8));
}
@Test
@@ -143,6 +145,7 @@ public class TestAuthScope {
final AuthScope authscope5 = new AuthScope("http", "somehost", 80, "someotherrealm", "somescheme");
final AuthScope authscope6 = new AuthScope("http", "somehost", 80, "somerealm", "someotherscheme");
final AuthScope authscope7 = new AuthScope("https", "somehost", 80, "somerealm", "somescheme");
+ final AuthScope authscope8 = new AuthScope("https", "somehost", 80, "somerealm", "SomeScheme");
Assert.assertTrue(authscope1.hashCode() == authscope1.hashCode());
Assert.assertFalse(authscope1.hashCode() == authscope2.hashCode());
Assert.assertTrue(authscope1.hashCode() == authscope3.hashCode());
@@ -150,6 +153,7 @@ public class TestAuthScope {
Assert.assertFalse(authscope1.hashCode() == authscope5.hashCode());
Assert.assertFalse(authscope1.hashCode() == authscope6.hashCode());
Assert.assertFalse(authscope1.hashCode() == authscope7.hashCode());
+ Assert.assertTrue(authscope7.hashCode() == authscope8.hashCode());
}
}
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java
index 0f99926..12506ac 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java
@@ -157,7 +157,7 @@ public class TestAuthChallengeParser {
Assert.assertNotNull(challenges);
Assert.assertEquals(1, challenges.size());
final AuthChallenge challenge1 = challenges.get(0);
- Assert.assertEquals(StandardAuthScheme.BASIC, challenge1.getScheme());
+ Assert.assertEquals(StandardAuthScheme.BASIC, challenge1.getSchemeName());
Assert.assertEquals(null, challenge1.getValue());
final List<NameValuePair> params = challenge1.getParams();
Assert.assertNotNull(params);
@@ -174,7 +174,7 @@ public class TestAuthChallengeParser {
Assert.assertNotNull(challenges);
Assert.assertEquals(1, challenges.size());
final AuthChallenge challenge1 = challenges.get(0);
- Assert.assertEquals(StandardAuthScheme.BASIC, challenge1.getScheme());
+ Assert.assertEquals(StandardAuthScheme.BASIC, challenge1.getSchemeName());
Assert.assertEquals(null, challenge1.getValue());
final List<NameValuePair> params = challenge1.getParams();
Assert.assertNotNull(params);
@@ -193,12 +193,12 @@ public class TestAuthChallengeParser {
Assert.assertEquals(2, challenges.size());
final AuthChallenge challenge1 = challenges.get(0);
- Assert.assertEquals("This", challenge1.getScheme());
+ Assert.assertEquals("This", challenge1.getSchemeName());
Assert.assertEquals("xxxxxxxxxxxxxxxxxxxxxx", challenge1.getValue());
Assert.assertNull(challenge1.getParams());
final AuthChallenge challenge2 = challenges.get(1);
- Assert.assertEquals("That", challenge2.getScheme());
+ Assert.assertEquals("That", challenge2.getSchemeName());
Assert.assertEquals("yyyyyyyyyyyyyyyyyyyyyy", challenge2.getValue());
Assert.assertNull(challenge2.getParams());
}
@@ -214,7 +214,7 @@ public class TestAuthChallengeParser {
Assert.assertEquals(2, challenges.size());
final AuthChallenge challenge1 = challenges.get(0);
- Assert.assertEquals(StandardAuthScheme.BASIC, challenge1.getScheme());
+ Assert.assertEquals(StandardAuthScheme.BASIC, challenge1.getSchemeName());
Assert.assertEquals(null, challenge1.getValue());
final List<NameValuePair> params1 = challenge1.getParams();
Assert.assertNotNull(params1);
@@ -224,7 +224,7 @@ public class TestAuthChallengeParser {
assertNameValuePair(new BasicNameValuePair("param2", "that"), params1.get(2));
final AuthChallenge challenge2 = challenges.get(1);
- Assert.assertEquals(StandardAuthScheme.BASIC, challenge2.getScheme());
+ Assert.assertEquals(StandardAuthScheme.BASIC, challenge2.getSchemeName());
Assert.assertEquals(null, challenge2.getValue());
final List<NameValuePair> params2 = challenge2.getParams();
Assert.assertNotNull(params2);
@@ -245,7 +245,7 @@ public class TestAuthChallengeParser {
Assert.assertEquals(1, challenges.size());
final AuthChallenge challenge1 = challenges.get(0);
- Assert.assertEquals("This", challenge1.getScheme());
+ Assert.assertEquals("This", challenge1.getSchemeName());
Assert.assertEquals(null, challenge1.getValue());
Assert.assertNull(challenge1.getParams());
}
@@ -284,7 +284,7 @@ public class TestAuthChallengeParser {
Assert.assertEquals(1, challenges.size());
final AuthChallenge challenge1 = challenges.get(0);
- Assert.assertEquals("blah", challenge1.getScheme());
+ Assert.assertEquals("blah", challenge1.getSchemeName());
Assert.assertEquals("blah", challenge1.getValue());
Assert.assertNull(challenge1.getParams());
}
@@ -299,7 +299,7 @@ public class TestAuthChallengeParser {
Assert.assertEquals(1, challenges.size());
final AuthChallenge challenge1 = challenges.get(0);
- Assert.assertEquals("blah", challenge1.getScheme());
+ Assert.assertEquals("blah", challenge1.getSchemeName());
Assert.assertEquals(null, challenge1.getValue());
final List<NameValuePair> params1 = challenge1.getParams();
Assert.assertNotNull(params1);
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java
index 11016a8..416b5ee 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestSystemDefaultCredentialsProvider.java
@@ -28,7 +28,6 @@ package org.apache.hc.client5.http.impl.auth;
import java.net.Authenticator;
import java.net.Authenticator.RequestorType;
-import java.util.Locale;
import java.net.InetAddress;
import java.net.PasswordAuthentication;
import java.net.URL;
@@ -101,7 +100,7 @@ public class TestSystemDefaultCredentialsProvider {
new SystemDefaultCredentialsProvider().getCredentials(authScope, coreContext);
Mockito.verify(authenticatorDelegate).getPasswordAuthentication(PROXY_HOST1, null, PROXY_PORT1, PROXY_PROTOCOL1,
- PROMPT1, StandardAuthScheme.BASIC.toUpperCase(Locale.ROOT), httpRequestUrl,
+ PROMPT1, StandardAuthScheme.BASIC, httpRequestUrl,
RequestorType.SERVER);
Assert.assertNotNull(receivedCredentials);
Assert.assertEquals(AUTH1.getUserName(), receivedCredentials.getUserPrincipal().getName());
@@ -119,7 +118,7 @@ public class TestSystemDefaultCredentialsProvider {
new SystemDefaultCredentialsProvider().getCredentials(authScope, null);
Mockito.verify(authenticatorDelegate).getPasswordAuthentication(PROXY_HOST1, null, PROXY_PORT1, PROXY_PROTOCOL1,
- PROMPT1, StandardAuthScheme.BASIC.toUpperCase(Locale.ROOT), null,
+ PROMPT1, StandardAuthScheme.BASIC, null,
RequestorType.SERVER);
Assert.assertNotNull(receivedCredentials);
Assert.assertEquals(AUTH1.getUserName(), receivedCredentials.getUserPrincipal().getName());