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

HTTPCLIENT-1557: minor code improvements 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1629130 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2014-10-03 07:58:47 +00:00
parent de48ae0c85
commit b47a2333bf
1 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,10 @@ import org.apache.http.util.EncodingUtils;
@NotThreadSafe @NotThreadSafe
final class NTLMEngineImpl implements NTLMEngine { final class NTLMEngineImpl implements NTLMEngine {
/** Unicode encoding */
private static final Charset UNICODE_LITTLE_UNMARKED = CharsetUtils.lookup("UnicodeLittleUnmarked"); private static final Charset UNICODE_LITTLE_UNMARKED = CharsetUtils.lookup("UnicodeLittleUnmarked");
/** Character encoding */
private static final Charset DEFAULT_CHARSET = Consts.ASCII;
// Flags we use; descriptions according to: // Flags we use; descriptions according to:
// http://davenport.sourceforge.net/ntlm.html // http://davenport.sourceforge.net/ntlm.html
@ -85,9 +88,6 @@ final class NTLMEngineImpl implements NTLMEngine {
RND_GEN = rnd; RND_GEN = rnd;
} }
/** Character encoding */
static final Charset DEFAULT_CHARSET = Consts.ASCII;
/** The signature string as bytes in the default encoding */ /** The signature string as bytes in the default encoding */
private static final byte[] SIGNATURE; private static final byte[] SIGNATURE;
@ -98,6 +98,8 @@ final class NTLMEngineImpl implements NTLMEngine {
SIGNATURE[bytesWithoutNull.length] = (byte) 0x00; SIGNATURE[bytesWithoutNull.length] = (byte) 0x00;
} }
private static final Type1Message TYPE_1_MESSAGE = new Type1Message();
/** /**
* Returns the response for the given message. * Returns the response for the given message.
* *
@ -115,7 +117,7 @@ final class NTLMEngineImpl implements NTLMEngine {
* @throws org.apache.http.HttpException * @throws org.apache.http.HttpException
* If the messages cannot be retrieved. * If the messages cannot be retrieved.
*/ */
final String getResponseFor(final String message, final String username, final String password, static String getResponseFor(final String message, final String username, final String password,
final String host, final String domain) throws NTLMEngineException { final String host, final String domain) throws NTLMEngineException {
final String response; final String response;
@ -140,8 +142,10 @@ final class NTLMEngineImpl implements NTLMEngine {
* The domain to authenticate with. * The domain to authenticate with.
* @return String the message to add to the HTTP request header. * @return String the message to add to the HTTP request header.
*/ */
String getType1Message(final String host, final String domain) { static String getType1Message(final String host, final String domain) throws NTLMEngineException {
return new Type1Message(domain, host).getResponse(); // For compatibility reason do not include domain and host in type 1 message
//return new Type1Message(domain, host).getResponse();
return TYPE_1_MESSAGE.getResponse();
} }
/** /**
@ -164,7 +168,7 @@ final class NTLMEngineImpl implements NTLMEngine {
* @throws NTLMEngineException * @throws NTLMEngineException
* If {@encrypt(byte[],byte[])} fails. * If {@encrypt(byte[],byte[])} fails.
*/ */
String getType3Message(final String user, final String password, final String host, final String domain, static String getType3Message(final String user, final String password, final String host, final String domain,
final byte[] nonce, final int type2Flags, final String target, final byte[] targetInformation) final byte[] nonce, final int type2Flags, final String target, final byte[] targetInformation)
throws NTLMEngineException { throws NTLMEngineException {
return new Type3Message(domain, host, user, password, nonce, type2Flags, target, return new Type3Message(domain, host, user, password, nonce, type2Flags, target,
@ -973,22 +977,31 @@ final class NTLMEngineImpl implements NTLMEngine {
/** Type 1 message assembly class */ /** Type 1 message assembly class */
static class Type1Message extends NTLMMessage { static class Type1Message extends NTLMMessage {
protected byte[] hostBytes;
protected byte[] domainBytes;
/** Constructor. Include the arguments the message will need */ private final byte[] hostBytes;
Type1Message(final String domain, final String host) { private final byte[] domainBytes;
Type1Message(final String domain, final String host) throws NTLMEngineException {
super(); super();
if (UNICODE_LITTLE_UNMARKED == null) {
throw new NTLMEngineException("Unicode not supported");
}
// Strip off domain name from the host! // Strip off domain name from the host!
final String unqualifiedHost = convertHost(host); final String unqualifiedHost = convertHost(host);
// Use only the base domain name! // Use only the base domain name!
final String unqualifiedDomain = convertDomain(domain); final String unqualifiedDomain = convertDomain(domain);
hostBytes = unqualifiedHost != null? unqualifiedHost.getBytes(Consts.ASCII) : null; hostBytes = unqualifiedHost != null ?
domainBytes = unqualifiedDomain != null ? unqualifiedDomain unqualifiedHost.getBytes(UNICODE_LITTLE_UNMARKED) : null;
.toUpperCase(Locale.ROOT).getBytes(Consts.ASCII) : null; domainBytes = unqualifiedDomain != null ?
unqualifiedDomain.toUpperCase(Locale.ROOT).getBytes(UNICODE_LITTLE_UNMARKED) : null;
} }
Type1Message() {
super();
hostBytes = null;
domainBytes = null;
}
/** /**
* Getting the response involves building the message before returning * Getting the response involves building the message before returning
* it * it
@ -1049,13 +1062,14 @@ final class NTLMEngineImpl implements NTLMEngine {
// NTLM revision // NTLM revision
addUShort(0x0f00); addUShort(0x0f00);
// Host (workstation) String. // Host (workstation) String.
//addBytes(hostBytes); if (hostBytes != null) {
addBytes(hostBytes);
}
// Domain String. // Domain String.
//addBytes(domainBytes); if (domainBytes != null) {
addBytes(domainBytes);
}
return super.getResponse(); return super.getResponse();
} }