Author: violetagg
Date: Sat Feb 11 10:04:35 2017
New Revision: 1782572
URL: http://svn.apache.org/viewvc?rev=1782572&view=rev
Log:
Replace "Negotiate" literal with static final AUTH_HEADER_VALUE_NEGOTIATE in
SpnegoAuthenticator.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1782572&r1=1782571&r2=1782572&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
Sat Feb 11 10:04:35 2017
@@ -56,6 +56,7 @@ import org.ietf.jgss.Oid;
public class SpnegoAuthenticator extends AuthenticatorBase {
private static final Log log =
LogFactory.getLog(SpnegoAuthenticator.class);
+ private static final String AUTH_HEADER_VALUE_NEGOTIATE = "Negotiate";
private String loginConfigName = Constants.DEFAULT_LOGIN_MODULE_NAME;
public String getLoginConfigName() {
@@ -149,7 +150,7 @@ public class SpnegoAuthenticator extends
if (log.isDebugEnabled()) {
log.debug(sm.getString("authenticator.noAuthHeader"));
}
- response.setHeader(AUTH_HEADER_NAME, "Negotiate");
+ response.setHeader(AUTH_HEADER_NAME, AUTH_HEADER_VALUE_NEGOTIATE);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
}
@@ -162,7 +163,7 @@ public class SpnegoAuthenticator extends
log.debug(sm.getString(
"spnegoAuthenticator.authHeaderNotNego"));
}
- response.setHeader(AUTH_HEADER_NAME, "Negotiate");
+ response.setHeader(AUTH_HEADER_NAME, AUTH_HEADER_VALUE_NEGOTIATE);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
}
@@ -182,7 +183,7 @@ public class SpnegoAuthenticator extends
log.debug(sm.getString(
"spnegoAuthenticator.authHeaderNoToken"));
}
- response.setHeader(AUTH_HEADER_NAME, "Negotiate");
+ response.setHeader(AUTH_HEADER_NAME, AUTH_HEADER_VALUE_NEGOTIATE);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
}
@@ -235,7 +236,7 @@ public class SpnegoAuthenticator extends
"spnegoAuthenticator.ticketValidateFail"));
}
// Start again
- response.setHeader(AUTH_HEADER_NAME, "Negotiate");
+ response.setHeader(AUTH_HEADER_NAME,
AUTH_HEADER_VALUE_NEGOTIATE);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
}
@@ -247,7 +248,7 @@ public class SpnegoAuthenticator extends
if (log.isDebugEnabled()) {
log.debug(sm.getString("spnegoAuthenticator.ticketValidateFail"), e);
}
- response.setHeader(AUTH_HEADER_NAME, "Negotiate");
+ response.setHeader(AUTH_HEADER_NAME, AUTH_HEADER_VALUE_NEGOTIATE);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
} catch (PrivilegedActionException e) {
@@ -259,7 +260,7 @@ public class SpnegoAuthenticator extends
} else {
log.error(sm.getString("spnegoAuthenticator.serviceLoginFail"), e);
}
- response.setHeader(AUTH_HEADER_NAME, "Negotiate");
+ response.setHeader(AUTH_HEADER_NAME, AUTH_HEADER_VALUE_NEGOTIATE);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
} finally {
@@ -280,7 +281,7 @@ public class SpnegoAuthenticator extends
}
// Send response token on success and failure
- response.setHeader(AUTH_HEADER_NAME, "Negotiate "
+ response.setHeader(AUTH_HEADER_NAME, AUTH_HEADER_VALUE_NEGOTIATE + " "
+ Base64.encodeBase64String(outToken));
if (principal != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
