Repository: hadoop Updated Branches: refs/heads/trunk d9f73f1b7 -> 5a5a72473
HADOOP-13417. Fix javac and checkstyle warnings in hadoop-auth package. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5a5a7247 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5a5a7247 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5a5a7247 Branch: refs/heads/trunk Commit: 5a5a724731b74df9eed2de5f3370bcb8023fa2eb Parents: d9f73f1 Author: Akira Ajisaka <aajis...@apache.org> Authored: Fri Oct 14 14:45:55 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Fri Oct 14 14:45:55 2016 +0900 ---------------------------------------------------------------------- .../client/AuthenticatorTestCase.java | 49 ++++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5a5a7247/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java index 8f35e13..35e40d8 100644 --- a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java +++ b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java @@ -20,14 +20,15 @@ import org.apache.hadoop.security.authentication.server.AuthenticationFilter; import org.apache.http.HttpResponse; import org.apache.http.auth.AuthScope; import org.apache.http.auth.Credentials; +import org.apache.http.client.CredentialsProvider; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.params.AuthPolicy; import org.apache.http.entity.InputStreamEntity; -import org.apache.http.impl.auth.SPNegoSchemeFactory; -import org.apache.http.impl.client.SystemDefaultHttpClient; +import org.apache.http.impl.auth.SPNegoScheme; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.Context; @@ -53,6 +54,7 @@ import java.net.ServerSocket; import java.net.URL; import java.security.Principal; import java.util.Properties; + import org.junit.Assert; public class AuthenticatorTestCase { @@ -241,22 +243,29 @@ public class AuthenticatorTestCase { } } - private SystemDefaultHttpClient getHttpClient() { - final SystemDefaultHttpClient httpClient = new SystemDefaultHttpClient(); - httpClient.getAuthSchemes().register(AuthPolicy.SPNEGO, new SPNegoSchemeFactory(true)); - Credentials use_jaas_creds = new Credentials() { - public String getPassword() { - return null; - } - - public Principal getUserPrincipal() { - return null; - } - }; - - httpClient.getCredentialsProvider().setCredentials( - AuthScope.ANY, use_jaas_creds); - return httpClient; + private HttpClient getHttpClient() { + HttpClientBuilder builder = HttpClientBuilder.create(); + // Register auth schema + builder.setDefaultAuthSchemeRegistry( + s-> httpContext -> new SPNegoScheme(true, true) + ); + + Credentials useJaasCreds = new Credentials() { + public String getPassword() { + return null; + } + public Principal getUserPrincipal() { + return null; + } + }; + + CredentialsProvider jaasCredentialProvider + = new BasicCredentialsProvider(); + jaasCredentialProvider.setCredentials(AuthScope.ANY, useJaasCreds); + // Set credential provider + builder.setDefaultCredentialsProvider(jaasCredentialProvider); + + return builder.build(); } private void doHttpClientRequest(HttpClient httpClient, HttpUriRequest request) throws Exception { @@ -273,7 +282,7 @@ public class AuthenticatorTestCase { protected void _testAuthenticationHttpClient(Authenticator authenticator, boolean doPost) throws Exception { start(); try { - SystemDefaultHttpClient httpClient = getHttpClient(); + HttpClient httpClient = getHttpClient(); doHttpClientRequest(httpClient, new HttpGet(getBaseURL())); // Always do a GET before POST to trigger the SPNego negotiation --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
