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

Convert control statement bodies to block. 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1558055 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2014-01-14 14:45:13 +00:00
parent 2bc42458a2
commit 9debe112db
1 changed files with 68 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
View File

@ -190,8 +190,9 @@ final class NTLMEngineImpl implements NTLMEngine {
return null; return null;
} }
final int index = value.indexOf("."); final int index = value.indexOf(".");
if (index != -1) if (index != -1) {
return value.substring(0, index); return value.substring(0, index);
}
return value; return value;
} }
@ -206,24 +207,27 @@ final class NTLMEngineImpl implements NTLMEngine {
} }
private static int readULong(final byte[] src, final int index) throws NTLMEngineException { private static int readULong(final byte[] src, final int index) throws NTLMEngineException {
if (src.length < index + 4) if (src.length < index + 4) {
throw new NTLMEngineException("NTLM authentication - buffer too small for DWORD"); throw new NTLMEngineException("NTLM authentication - buffer too small for DWORD");
}
return (src[index] & 0xff) | ((src[index + 1] & 0xff) << 8) return (src[index] & 0xff) | ((src[index + 1] & 0xff) << 8)
| ((src[index + 2] & 0xff) << 16) | ((src[index + 3] & 0xff) << 24); | ((src[index + 2] & 0xff) << 16) | ((src[index + 3] & 0xff) << 24);
} }
private static int readUShort(final byte[] src, final int index) throws NTLMEngineException { private static int readUShort(final byte[] src, final int index) throws NTLMEngineException {
if (src.length < index + 2) if (src.length < index + 2) {
throw new NTLMEngineException("NTLM authentication - buffer too small for WORD"); throw new NTLMEngineException("NTLM authentication - buffer too small for WORD");
}
return (src[index] & 0xff) | ((src[index + 1] & 0xff) << 8); return (src[index] & 0xff) | ((src[index + 1] & 0xff) << 8);
} }
private static byte[] readSecurityBuffer(final byte[] src, final int index) throws NTLMEngineException { private static byte[] readSecurityBuffer(final byte[] src, final int index) throws NTLMEngineException {
final int length = readUShort(src, index); final int length = readUShort(src, index);
final int offset = readULong(src, index + 4); final int offset = readULong(src, index + 4);
if (src.length < offset + length) if (src.length < offset + length) {
throw new NTLMEngineException( throw new NTLMEngineException(
"NTLM authentication - buffer too small for data item"); "NTLM authentication - buffer too small for data item");
}
final byte[] buffer = new byte[length]; final byte[] buffer = new byte[length];
System.arraycopy(src, offset, buffer, 0, length); System.arraycopy(src, offset, buffer, 0, length);
return buffer; return buffer;
@ -310,72 +314,81 @@ final class NTLMEngineImpl implements NTLMEngine {
/** Calculate and return client challenge */ /** Calculate and return client challenge */
public byte[] getClientChallenge() public byte[] getClientChallenge()
throws NTLMEngineException { throws NTLMEngineException {
if (clientChallenge == null) if (clientChallenge == null) {
clientChallenge = makeRandomChallenge(); clientChallenge = makeRandomChallenge();
}
return clientChallenge; return clientChallenge;
} }
/** Calculate and return second client challenge */ /** Calculate and return second client challenge */
public byte[] getClientChallenge2() public byte[] getClientChallenge2()
throws NTLMEngineException { throws NTLMEngineException {
if (clientChallenge2 == null) if (clientChallenge2 == null) {
clientChallenge2 = makeRandomChallenge(); clientChallenge2 = makeRandomChallenge();
}
return clientChallenge2; return clientChallenge2;
} }
/** Calculate and return random secondary key */ /** Calculate and return random secondary key */
public byte[] getSecondaryKey() public byte[] getSecondaryKey()
throws NTLMEngineException { throws NTLMEngineException {
if (secondaryKey == null) if (secondaryKey == null) {
secondaryKey = makeSecondaryKey(); secondaryKey = makeSecondaryKey();
}
return secondaryKey; return secondaryKey;
} }
/** Calculate and return the LMHash */ /** Calculate and return the LMHash */
public byte[] getLMHash() public byte[] getLMHash()
throws NTLMEngineException { throws NTLMEngineException {
if (lmHash == null) if (lmHash == null) {
lmHash = lmHash(password); lmHash = lmHash(password);
}
return lmHash; return lmHash;
} }
/** Calculate and return the LMResponse */ /** Calculate and return the LMResponse */
public byte[] getLMResponse() public byte[] getLMResponse()
throws NTLMEngineException { throws NTLMEngineException {
if (lmResponse == null) if (lmResponse == null) {
lmResponse = lmResponse(getLMHash(),challenge); lmResponse = lmResponse(getLMHash(),challenge);
}
return lmResponse; return lmResponse;
} }
/** Calculate and return the NTLMHash */ /** Calculate and return the NTLMHash */
public byte[] getNTLMHash() public byte[] getNTLMHash()
throws NTLMEngineException { throws NTLMEngineException {
if (ntlmHash == null) if (ntlmHash == null) {
ntlmHash = ntlmHash(password); ntlmHash = ntlmHash(password);
}
return ntlmHash; return ntlmHash;
} }
/** Calculate and return the NTLMResponse */ /** Calculate and return the NTLMResponse */
public byte[] getNTLMResponse() public byte[] getNTLMResponse()
throws NTLMEngineException { throws NTLMEngineException {
if (ntlmResponse == null) if (ntlmResponse == null) {
ntlmResponse = lmResponse(getNTLMHash(),challenge); ntlmResponse = lmResponse(getNTLMHash(),challenge);
}
return ntlmResponse; return ntlmResponse;
} }
/** Calculate the LMv2 hash */ /** Calculate the LMv2 hash */
public byte[] getLMv2Hash() public byte[] getLMv2Hash()
throws NTLMEngineException { throws NTLMEngineException {
if (lmv2Hash == null) if (lmv2Hash == null) {
lmv2Hash = lmv2Hash(domain, user, getNTLMHash()); lmv2Hash = lmv2Hash(domain, user, getNTLMHash());
}
return lmv2Hash; return lmv2Hash;
} }
/** Calculate the NTLMv2 hash */ /** Calculate the NTLMv2 hash */
public byte[] getNTLMv2Hash() public byte[] getNTLMv2Hash()
throws NTLMEngineException { throws NTLMEngineException {
if (ntlmv2Hash == null) if (ntlmv2Hash == null) {
ntlmv2Hash = ntlmv2Hash(domain, user, getNTLMHash()); ntlmv2Hash = ntlmv2Hash(domain, user, getNTLMHash());
}
return ntlmv2Hash; return ntlmv2Hash;
} }
@ -398,32 +411,36 @@ final class NTLMEngineImpl implements NTLMEngine {
/** Calculate the NTLMv2Blob */ /** Calculate the NTLMv2Blob */
public byte[] getNTLMv2Blob() public byte[] getNTLMv2Blob()
throws NTLMEngineException { throws NTLMEngineException {
if (ntlmv2Blob == null) if (ntlmv2Blob == null) {
ntlmv2Blob = createBlob(getClientChallenge2(), targetInformation, getTimestamp()); ntlmv2Blob = createBlob(getClientChallenge2(), targetInformation, getTimestamp());
}
return ntlmv2Blob; return ntlmv2Blob;
} }
/** Calculate the NTLMv2Response */ /** Calculate the NTLMv2Response */
public byte[] getNTLMv2Response() public byte[] getNTLMv2Response()
throws NTLMEngineException { throws NTLMEngineException {
if (ntlmv2Response == null) if (ntlmv2Response == null) {
ntlmv2Response = lmv2Response(getNTLMv2Hash(),challenge,getNTLMv2Blob()); ntlmv2Response = lmv2Response(getNTLMv2Hash(),challenge,getNTLMv2Blob());
}
return ntlmv2Response; return ntlmv2Response;
} }
/** Calculate the LMv2Response */ /** Calculate the LMv2Response */
public byte[] getLMv2Response() public byte[] getLMv2Response()
throws NTLMEngineException { throws NTLMEngineException {
if (lmv2Response == null) if (lmv2Response == null) {
lmv2Response = lmv2Response(getLMv2Hash(),challenge,getClientChallenge()); lmv2Response = lmv2Response(getLMv2Hash(),challenge,getClientChallenge());
}
return lmv2Response; return lmv2Response;
} }
/** Get NTLM2SessionResponse */ /** Get NTLM2SessionResponse */
public byte[] getNTLM2SessionResponse() public byte[] getNTLM2SessionResponse()
throws NTLMEngineException { throws NTLMEngineException {
if (ntlm2SessionResponse == null) if (ntlm2SessionResponse == null) {
ntlm2SessionResponse = ntlm2SessionResponse(getNTLMHash(),challenge,getClientChallenge()); ntlm2SessionResponse = ntlm2SessionResponse(getNTLMHash(),challenge,getClientChallenge());
}
return ntlm2SessionResponse; return ntlm2SessionResponse;
} }
@ -573,8 +590,9 @@ final class NTLMEngineImpl implements NTLMEngine {
System.arraycopy(digest, 0, sessionHash, 0, 8); System.arraycopy(digest, 0, sessionHash, 0, 8);
return lmResponse(ntlmHash, sessionHash); return lmResponse(ntlmHash, sessionHash);
} catch (Exception e) { } catch (Exception e) {
if (e instanceof NTLMEngineException) if (e instanceof NTLMEngineException) {
throw (NTLMEngineException) e; throw (NTLMEngineException) e;
}
throw new NTLMEngineException(e.getMessage(), e); throw new NTLMEngineException(e.getMessage(), e);
} }
} }
@ -833,21 +851,24 @@ final class NTLMEngineImpl implements NTLMEngine {
messageContents = Base64.decodeBase64(EncodingUtils.getBytes(messageBody, messageContents = Base64.decodeBase64(EncodingUtils.getBytes(messageBody,
DEFAULT_CHARSET)); DEFAULT_CHARSET));
// Look for NTLM message // Look for NTLM message
if (messageContents.length < SIGNATURE.length) if (messageContents.length < SIGNATURE.length) {
throw new NTLMEngineException("NTLM message decoding error - packet too short"); throw new NTLMEngineException("NTLM message decoding error - packet too short");
}
int i = 0; int i = 0;
while (i < SIGNATURE.length) { while (i < SIGNATURE.length) {
if (messageContents[i] != SIGNATURE[i]) if (messageContents[i] != SIGNATURE[i]) {
throw new NTLMEngineException( throw new NTLMEngineException(
"NTLM message expected - instead got unrecognized bytes"); "NTLM message expected - instead got unrecognized bytes");
}
i++; i++;
} }
// Check to be sure there's a type 2 message indicator next // Check to be sure there's a type 2 message indicator next
final int type = readULong(SIGNATURE.length); final int type = readULong(SIGNATURE.length);
if (type != expectedType) if (type != expectedType) {
throw new NTLMEngineException("NTLM type " + Integer.toString(expectedType) throw new NTLMEngineException("NTLM type " + Integer.toString(expectedType)
+ " message expected - instead got type " + Integer.toString(type)); + " message expected - instead got type " + Integer.toString(type));
}
currentOutputPosition = messageContents.length; currentOutputPosition = messageContents.length;
} }
@ -867,15 +888,17 @@ final class NTLMEngineImpl implements NTLMEngine {
/** Read a byte from a position within the message buffer */ /** Read a byte from a position within the message buffer */
protected byte readByte(final int position) throws NTLMEngineException { protected byte readByte(final int position) throws NTLMEngineException {
if (messageContents.length < position + 1) if (messageContents.length < position + 1) {
throw new NTLMEngineException("NTLM: Message too short"); throw new NTLMEngineException("NTLM: Message too short");
}
return messageContents[position]; return messageContents[position];
} }
/** Read a bunch of bytes from a position in the message buffer */ /** Read a bunch of bytes from a position in the message buffer */
protected void readBytes(final byte[] buffer, final int position) throws NTLMEngineException { protected void readBytes(final byte[] buffer, final int position) throws NTLMEngineException {
if (messageContents.length < position + buffer.length) if (messageContents.length < position + buffer.length) {
throw new NTLMEngineException("NTLM: Message too short"); throw new NTLMEngineException("NTLM: Message too short");
}
System.arraycopy(messageContents, position, buffer, 0, buffer.length); System.arraycopy(messageContents, position, buffer, 0, buffer.length);
} }
@ -1095,10 +1118,11 @@ final class NTLMEngineImpl implements NTLMEngine {
flags = readULong(20); flags = readULong(20);
if ((flags & FLAG_REQUEST_UNICODE_ENCODING) == 0) if ((flags & FLAG_REQUEST_UNICODE_ENCODING) == 0) {
throw new NTLMEngineException( throw new NTLMEngineException(
"NTLM type 2 message has flags that make no sense: " "NTLM type 2 message has flags that make no sense: "
+ Integer.toString(flags)); + Integer.toString(flags));
}
// Do the target! // Do the target!
target = null; target = null;
@ -1189,45 +1213,50 @@ final class NTLMEngineImpl implements NTLMEngine {
// NTLMv2 // NTLMv2
ntResp = gen.getNTLMv2Response(); ntResp = gen.getNTLMv2Response();
lmResp = gen.getLMv2Response(); lmResp = gen.getLMv2Response();
if ((type2Flags & FLAG_REQUEST_LAN_MANAGER_KEY) != 0) if ((type2Flags & FLAG_REQUEST_LAN_MANAGER_KEY) != 0) {
userSessionKey = gen.getLanManagerSessionKey(); userSessionKey = gen.getLanManagerSessionKey();
else } else {
userSessionKey = gen.getNTLMv2UserSessionKey(); userSessionKey = gen.getNTLMv2UserSessionKey();
}
} else { } else {
// NTLMv1 // NTLMv1
if ((type2Flags & FLAG_REQUEST_NTLM2_SESSION) != 0) { if ((type2Flags & FLAG_REQUEST_NTLM2_SESSION) != 0) {
// NTLM2 session stuff is requested // NTLM2 session stuff is requested
ntResp = gen.getNTLM2SessionResponse(); ntResp = gen.getNTLM2SessionResponse();
lmResp = gen.getLM2SessionResponse(); lmResp = gen.getLM2SessionResponse();
if ((type2Flags & FLAG_REQUEST_LAN_MANAGER_KEY) != 0) if ((type2Flags & FLAG_REQUEST_LAN_MANAGER_KEY) != 0) {
userSessionKey = gen.getLanManagerSessionKey(); userSessionKey = gen.getLanManagerSessionKey();
else } else {
userSessionKey = gen.getNTLM2SessionResponseUserSessionKey(); userSessionKey = gen.getNTLM2SessionResponseUserSessionKey();
}
} else { } else {
ntResp = gen.getNTLMResponse(); ntResp = gen.getNTLMResponse();
lmResp = gen.getLMResponse(); lmResp = gen.getLMResponse();
if ((type2Flags & FLAG_REQUEST_LAN_MANAGER_KEY) != 0) if ((type2Flags & FLAG_REQUEST_LAN_MANAGER_KEY) != 0) {
userSessionKey = gen.getLanManagerSessionKey(); userSessionKey = gen.getLanManagerSessionKey();
else } else {
userSessionKey = gen.getNTLMUserSessionKey(); userSessionKey = gen.getNTLMUserSessionKey();
} }
} }
}
} catch (NTLMEngineException e) { } catch (NTLMEngineException e) {
// This likely means we couldn't find the MD4 hash algorithm - // This likely means we couldn't find the MD4 hash algorithm -
// fail back to just using LM // fail back to just using LM
ntResp = new byte[0]; ntResp = new byte[0];
lmResp = gen.getLMResponse(); lmResp = gen.getLMResponse();
if ((type2Flags & FLAG_REQUEST_LAN_MANAGER_KEY) != 0) if ((type2Flags & FLAG_REQUEST_LAN_MANAGER_KEY) != 0) {
userSessionKey = gen.getLanManagerSessionKey(); userSessionKey = gen.getLanManagerSessionKey();
else } else {
userSessionKey = gen.getLMUserSessionKey(); userSessionKey = gen.getLMUserSessionKey();
} }
}
if ((type2Flags & FLAG_REQUEST_SIGN) != 0) { if ((type2Flags & FLAG_REQUEST_SIGN) != 0) {
if ((type2Flags & FLAG_REQUEST_EXPLICIT_KEY_EXCH) != 0) if ((type2Flags & FLAG_REQUEST_EXPLICIT_KEY_EXCH) != 0) {
sessionKey = RC4(gen.getSecondaryKey(), userSessionKey); sessionKey = RC4(gen.getSecondaryKey(), userSessionKey);
else } else {
sessionKey = userSessionKey; sessionKey = userSessionKey;
}
} else { } else {
sessionKey = null; sessionKey = null;
} }
@ -1253,10 +1282,11 @@ final class NTLMEngineImpl implements NTLMEngine {
final int hostLen = hostBytes != null ? hostBytes.length: 0; final int hostLen = hostBytes != null ? hostBytes.length: 0;
final int userLen = userBytes.length; final int userLen = userBytes.length;
final int sessionKeyLen; final int sessionKeyLen;
if (sessionKey != null) if (sessionKey != null) {
sessionKeyLen = sessionKey.length; sessionKeyLen = sessionKey.length;
else } else {
sessionKeyLen = 0; sessionKeyLen = 0;
}
// Calculate the layout within the packet // Calculate the layout within the packet
final int lmRespOffset = 72; // allocate space for the version final int lmRespOffset = 72; // allocate space for the version
@ -1353,8 +1383,9 @@ final class NTLMEngineImpl implements NTLMEngine {
addBytes(domainBytes); addBytes(domainBytes);
addBytes(userBytes); addBytes(userBytes);
addBytes(hostBytes); addBytes(hostBytes);
if (sessionKey != null) if (sessionKey != null) {
addBytes(sessionKey); addBytes(sessionKey);
}
return super.getResponse(); return super.getResponse();
} }