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

HTTPCLIENT-1712: SPNego schemes to take service scheme into account when generating auth token 

Contributed by Georg Romstorfer <georg.romstorfer at gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1724851 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2016-01-15 16:37:48 +00:00
parent 9465651937
commit a4cd379311
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
View File

@ -28,6 +28,7 @@ package org.apache.http.impl.auth;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.security.Principal; import java.security.Principal;
import java.util.Locale;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -129,13 +130,14 @@ public abstract class GGSSchemeBase implements AuthScheme {
/** /**
* @since 4.4 * @since 4.4
*/ */
protected byte[] generateGSSToken(final byte[] input, final Oid oid, final String authServer) throws GSSException { protected byte[] generateGSSToken(
final byte[] input, final Oid oid, final String serviceName, final String authServer) throws GSSException {
byte[] inputBuff = input; byte[] inputBuff = input;
if (inputBuff == null) { if (inputBuff == null) {
inputBuff = new byte[0]; inputBuff = new byte[0];
} }
final GSSManager manager = getManager(); final GSSManager manager = getManager();
final GSSName serverName = manager.createName("HTTP@" + authServer, GSSName.NT_HOSTBASED_SERVICE); final GSSName serverName = manager.createName(serviceName + "@" + authServer, GSSName.NT_HOSTBASED_SERVICE);
final GSSContext gssContext = manager.createContext( final GSSContext gssContext = manager.createContext(
serverName.canonicalize(oid), oid, gssCredential, GSSContext.DEFAULT_LIFETIME); serverName.canonicalize(oid), oid, gssCredential, GSSContext.DEFAULT_LIFETIME);
@ -147,7 +149,7 @@ public abstract class GGSSchemeBase implements AuthScheme {
/** /**
* @since 4.4 * @since 4.4
*/ */
protected abstract byte[] generateToken(byte[] input, String authServer) throws GSSException; protected abstract byte[] generateToken(byte[] input, String serviceName, String authServer) throws GSSException;
@Override @Override
public boolean isChallengeComplete() { public boolean isChallengeComplete() {
@ -204,11 +206,12 @@ public abstract class GGSSchemeBase implements AuthScheme {
} else { } else {
authServer = hostname + ":" + host.getPort(); authServer = hostname + ":" + host.getPort();
} }
final String serviceName = host.getSchemeName().toUpperCase(Locale.ROOT);
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("init " + authServer); log.debug("init " + authServer);
} }
token = generateToken(token, authServer); token = generateToken(token, serviceName, authServer);
state = State.TOKEN_GENERATED; state = State.TOKEN_GENERATED;
} catch (final GSSException gsse) { } catch (final GSSException gsse) {
state = State.FAILED; state = State.FAILED;

4
httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java
View File

@ -62,8 +62,8 @@ public class KerberosScheme extends GGSSchemeBase {
} }
@Override @Override
protected byte[] generateToken(final byte[] input, final String authServer) throws GSSException { protected byte[] generateToken(final byte[] input, final String serviceName, final String authServer) throws GSSException {
return generateGSSToken(input, new Oid(KERBEROS_OID), authServer); return generateGSSToken(input, new Oid(KERBEROS_OID), serviceName, authServer);
} }
@Override @Override

4
httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java
View File

@ -63,8 +63,8 @@ public class SPNegoScheme extends GGSSchemeBase {
} }
@Override @Override
protected byte[] generateToken(final byte[] input, final String authServer) throws GSSException { protected byte[] generateToken(final byte[] input, final String serviceName, final String authServer) throws GSSException {
return generateGSSToken(input, new Oid(SPNEGO_OID), authServer); return generateGSSToken(input, new Oid(SPNEGO_OID), serviceName, authServer);
} }
@Override @Override