You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/06/23 11:30:08 UTC
svn commit: r1687005 - in
/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic:
JaspicAuthenticator.java MessageInfoImpl.java
Author: markt
Date: Tue Jun 23 09:30:08 2015
New Revision: 1687005
URL: http://svn.apache.org/r1687005
Log:
Store JASPIC auth method in security message
Patch by fjodorver
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java?rev=1687005&r1=1687004&r2=1687005&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java Tue Jun 23 09:30:08 2015
@@ -46,7 +46,7 @@ public class JaspicAuthenticator extends
private static final Log log = LogFactory.getLog(JaspicAuthenticator.class);
private static final String AUTH_TYPE = "JASPIC";
- private static final String MESSAGE_LAYER = "HttpServlet";
+ public static final String MESSAGE_LAYER = "HttpServlet";
private Subject serviceSubject;
@@ -65,7 +65,7 @@ public class JaspicAuthenticator extends
@Override
public boolean authenticate(Request request, HttpServletResponse response) throws IOException {
- MessageInfo messageInfo = new MessageInfoImpl(request, response, true);
+ MessageInfo messageInfo = new MessageInfoImpl(request, response, true, getAuthMethod());
AuthConfigFactory factory = AuthConfigFactory.getFactory();
String appContext = getAppContextId(request);
@@ -149,6 +149,6 @@ public class JaspicAuthenticator extends
@Override
protected String getAuthMethod() {
- return AUTH_TYPE;
+ return context.getLoginConfig().getAuthMethod();
}
}
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java?rev=1687005&r1=1687004&r2=1687005&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java Tue Jun 23 09:30:08 2015
@@ -26,7 +26,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.catalina.connector.Request;
public class MessageInfoImpl implements MessageInfo {
- private static final String IS_MANDATORY = "javax.security.auth.message.MessagePolicy.isMandatory";
+ public static final String IS_MANDATORY = "javax.security.auth.message.MessagePolicy.isMandatory";
+ public static final String AUTH_METHOD = "javax.servlet.http.authType";
private final Map<String, Object> map = new HashMap<>();
private HttpServletRequest request;
@@ -35,10 +36,12 @@ public class MessageInfoImpl implements
public MessageInfoImpl() {
}
- public MessageInfoImpl(Request request, HttpServletResponse response, boolean authMandatory) {
+ public MessageInfoImpl(Request request, HttpServletResponse response, boolean authMandatory,
+ String authMethod) {
this.request = request;
this.response = response;
map.put(IS_MANDATORY, Boolean.toString(authMandatory));
+ map.put(AUTH_METHOD, authMethod);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org