HADOOP-11628. SPNEGO auth does not work with CNAMEs in JDK8. (Daryn Sharp via stevel).

This commit is contained in:
Steve Loughran 2015-10-18 11:45:11 +01:00
parent 58590fef49
commit bafeb6c7bc
2 changed files with 6 additions and 1 deletions

View File

@ -37,6 +37,7 @@
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress;
import java.security.PrivilegedActionException; import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction; import java.security.PrivilegedExceptionAction;
import java.util.ArrayList; import java.util.ArrayList;
@ -342,7 +343,8 @@ public AuthenticationToken authenticate(HttpServletRequest request, final HttpSe
authorization = authorization.substring(KerberosAuthenticator.NEGOTIATE.length()).trim(); authorization = authorization.substring(KerberosAuthenticator.NEGOTIATE.length()).trim();
final Base64 base64 = new Base64(0); final Base64 base64 = new Base64(0);
final byte[] clientToken = base64.decode(authorization); final byte[] clientToken = base64.decode(authorization);
final String serverName = request.getServerName(); final String serverName = InetAddress.getByName(request.getServerName())
.getCanonicalHostName();
try { try {
token = Subject.doAs(serverSubject, new PrivilegedExceptionAction<AuthenticationToken>() { token = Subject.doAs(serverSubject, new PrivilegedExceptionAction<AuthenticationToken>() {

View File

@ -1234,6 +1234,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12479. ProtocMojo does not log the reason for a protoc compilation HADOOP-12479. ProtocMojo does not log the reason for a protoc compilation
failure. (cnauroth) failure. (cnauroth)
HADOOP-11628. SPNEGO auth does not work with CNAMEs in JDK8.
(Daryn Sharp via stevel).
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString() HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()