Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-936: Test cases 

Contributed by Francois Rigault <francois dot rigault.amadeus.com>


git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@943284 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2010-05-11 20:36:26 +00:00
parent bcfe063e96
commit c7f3b744e6
4 changed files with 219 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
httpclient/pom.xml
View File

@ -70,6 +70,12 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.4</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>

18
httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
View File

@ -78,7 +78,7 @@ public class NegotiateScheme implements ContextAwareAuthScheme {
private int state;
/** base64 decoded challenge **/
byte[] token = new byte[0];
private byte[] token;
private Oid negotiationOid = null;
@ -128,6 +128,10 @@ public class NegotiateScheme implements ContextAwareAuthScheme {
return authenticate(credentials, request, null);
}
protected GSSManager getManager() {
return GSSManager.getInstance();
}
/**
* Produces Negotiate authorization Header based on token created by
* processChallenge.
@ -193,7 +197,7 @@ public class NegotiateScheme implements ContextAwareAuthScheme {
boolean tryKerberos = false;
try {
GSSManager manager = GSSManager.getInstance();
GSSManager manager = getManager();
GSSName serverName = manager.createName("HTTP/" + authServer, null);
gssContext = manager.createContext(
serverName.canonicalize(negotiationOid), negotiationOid, null,
@ -215,7 +219,7 @@ public class NegotiateScheme implements ContextAwareAuthScheme {
/* Kerberos v5 GSS-API mechanism defined in RFC 1964.*/
log.debug("Using Kerberos MECH " + KERBEROS_OID);
negotiationOid = new Oid(KERBEROS_OID);
GSSManager manager = GSSManager.getInstance();
GSSManager manager = getManager();
GSSName serverName = manager.createName("HTTP/" + authServer, null);
gssContext = manager.createContext(
serverName.canonicalize(negotiationOid), negotiationOid, null,
@ -225,12 +229,18 @@ public class NegotiateScheme implements ContextAwareAuthScheme {
}
state = INITIATED;
if (token == null) {
token = new byte[0];
}
// HTTP 1.1 issue:
// Mutual auth will never complete to do 200 instead of 401 in
// return from server. "state" will never reach ESTABLISHED
// but it works anyway
token = gssContext.initSecContext(token, 0, token.length);
if (token == null) {
throw new AuthenticationException("Failed to initialize security context");
}
/*
* IIS accepts Kerberos and SPNEGO tokens. Some other servers Jboss, Glassfish?
@ -261,7 +271,7 @@ public class NegotiateScheme implements ContextAwareAuthScheme {
throw new AuthenticationException(ex.getMessage());
}
return new BasicHeader("Authorization", "Negotiate " +
new String(new Base64().encode(token)) );
new String(Base64.encodeBase64(token, false)) );
}

2
httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
View File

@ -54,7 +54,6 @@ import org.apache.http.localserver.BasicServerTestBase;
import org.apache.http.localserver.LocalTestServer;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
/**
@ -180,7 +179,6 @@ public class TestSSLSocketFactory extends BasicServerTestBase {
}
@Test
@Ignore
public void testSSLTrustVerificationOverride() throws Exception {
// Use default SSL context
SSLContext defaultsslcontext = SSLContext.getInstance("TLS");

199
httpclient/src/test/java/org/apache/http/impl/auth/TestNegotiateScheme.java Normal file
View File

@ -0,0 +1,199 @@
/*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.http.impl.auth;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import java.io.IOException;
import java.security.Principal;
import org.apache.http.HttpEntity;
import org.apache.http.HttpException;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScheme;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.params.AuthPolicy;
import org.apache.http.client.params.ClientPNames;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.auth.NegotiateScheme;
import org.apache.http.impl.auth.NegotiateSchemeFactory;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.localserver.BasicServerTestBase;
import org.apache.http.localserver.LocalTestServer;
import org.apache.http.message.BasicHeader;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSManager;
import org.ietf.jgss.GSSName;
import org.ietf.jgss.Oid;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
/**
* Tests for {@link NegotiateScheme}.
*/
public class TestNegotiateScheme extends BasicServerTestBase {
@Before
public void setUp() throws Exception {
localServer = new LocalTestServer(null, null);
localServer.registerDefaultHandlers();
localServer.start();
}
/**
* This service will continue to ask for authentication.
*/
private static class PleaseNegotiateService implements HttpRequestHandler {
public void handle(final HttpRequest request,
final HttpResponse response,
final HttpContext context) throws HttpException, IOException {
response.setStatusCode(401);
response.addHeader(new BasicHeader("WWW-Authenticate", "Negotiate blablabla"));
response.setEntity(new StringEntity("auth required "));
response.addHeader(new BasicHeader("Connection", "Keep-Alive"));
}
}
/**
* NegotatieScheme with a custom GSSManager that does not require any Jaas or
* Kerberos configuration.
*
*/
private static class NegotiateSchemeWithMockGssManager extends NegotiateScheme {
GSSManager manager = mock(GSSManager.class);
GSSName name = mock(GSSName.class);
GSSContext context = mock(GSSContext.class);
NegotiateSchemeWithMockGssManager() throws Exception {
super(null, true);
when(context.initSecContext(any(byte[].class), anyInt(), anyInt()))
.thenReturn("12345678".getBytes());
when(manager.createName(any(String.class), any(Oid.class)))
.thenReturn(name);
when(manager.createContext(any(GSSName.class), any(Oid.class), any(GSSCredential.class), anyInt()))
.thenReturn(context);
}
@Override
protected GSSManager getManager() {
return manager;
}
}
private static class UseJaasCredentials implements Credentials {
public String getPassword() {
return null;
}
public Principal getUserPrincipal() {
return null;
}
}
private static class NegotiateSchemeFactoryWithMockGssManager extends NegotiateSchemeFactory {
NegotiateSchemeWithMockGssManager scheme;
NegotiateSchemeFactoryWithMockGssManager() throws Exception {
scheme = new NegotiateSchemeWithMockGssManager();
}
@Override
public AuthScheme newInstance(HttpParams params) {
return scheme;
}
}
/**
* Tests that the client will stop connecting to the server if
* the server still keep asking for a valid ticket.
*/
@Test
@Ignore
public void testDontTryToAuthenticateEndlessly() throws Exception {
int port = this.localServer.getServiceAddress().getPort();
this.localServer.register("*", new PleaseNegotiateService());
HttpHost target = new HttpHost("localhost", port);
DefaultHttpClient client = new DefaultHttpClient();
NegotiateSchemeFactory nsf = new NegotiateSchemeFactoryWithMockGssManager();
client.getAuthSchemes().register(AuthPolicy.SPNEGO, nsf);
Credentials use_jaas_creds = new UseJaasCredentials();
client.getCredentialsProvider().setCredentials(
new AuthScope(null, -1, null), use_jaas_creds);
client.getParams().setParameter(ClientPNames.DEFAULT_HOST, target);
String s = "/path";
HttpGet httpget = new HttpGet(s);
HttpResponse response = client.execute(httpget);
HttpEntity e = response.getEntity();
e.consumeContent();
}
/**
* Javadoc specifies that {@link GSSContext#initSecContext(byte[], int, int)} can return null
* if no token is generated. Client should be able to deal with this response.
*
*/
@Test
@Ignore
public void testNoTokenGeneratedGenerateAnError() throws Exception {
int port = this.localServer.getServiceAddress().getPort();
this.localServer.register("*", new PleaseNegotiateService());
HttpHost target = new HttpHost("localhost", port);
DefaultHttpClient client = new DefaultHttpClient();
NegotiateSchemeFactoryWithMockGssManager nsf = new NegotiateSchemeFactoryWithMockGssManager();
when(nsf.scheme.context.initSecContext(any(byte[].class), anyInt(), anyInt())).thenReturn(null);
client.getAuthSchemes().register(AuthPolicy.SPNEGO, nsf);
Credentials use_jaas_creds = new UseJaasCredentials();
client.getCredentialsProvider().setCredentials(
new AuthScope(null, -1, null), use_jaas_creds);
client.getParams().setParameter(ClientPNames.DEFAULT_HOST, target);
String s = "/path";
HttpGet httpget = new HttpGet(s);
HttpResponse response = client.execute(httpget);
HttpEntity e = response.getEntity();
e.consumeContent();
}
}