[jboss-cvs] JBossAS SVN: r97697 - in trunk: tomcat/src/main/java/org/jboss/web/tomcat/security and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 10 10:49:16 EST 2009
Author: remy.maucherat at jboss.com
Date: 2009-12-10 10:49:13 -0500 (Thu, 10 Dec 2009)
New Revision: 97697
Modified:
trunk/component-matrix/pom.xml
trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/GenericHeaderAuthenticator.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/JBossExtendedSecurityMgrRealm.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/authenticators/JASPIFormAuthenticator.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/sso/SingleSignOnEntry.java
trunk/tomcat/src/resources/web.xml
Log:
- JBoss Web alpha-22: Servlet fixes and JSP regression.
- Use auth type constants from HttpServletRequest, as they are supposed to be == comparable according to the specification.
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-12-10 14:01:21 UTC (rev 97696)
+++ trunk/component-matrix/pom.xml 2009-12-10 15:49:13 UTC (rev 97697)
@@ -48,7 +48,7 @@
<version.jboss.jbossws>3.2.1.GA</version.jboss.jbossws>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.messaging>1.4.1.GA</version.jboss.messaging>
- <version.jboss.web>3.0.0.alpha-22</version.jboss.web>
+ <version.jboss.web>3.0.0.alpha-23</version.jboss.web>
<version.jgroups>2.6.13.GA</version.jgroups>
<version.junit>3.8.2</version.junit>
<version.org.hibernate.annotations>3.5.0-Beta-2</version.org.hibernate.annotations>
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java 2009-12-10 14:01:21 UTC (rev 97696)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java 2009-12-10 15:49:13 UTC (rev 97697)
@@ -24,6 +24,7 @@
import javax.servlet.RequestDispatcher;
import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Realm;
@@ -174,7 +175,7 @@
session.setNote(Constants.FORM_PRINCIPAL_NOTE, principal);
if (!matchRequest(request)) {
register(request, response, principal,
- Constants.FORM_METHOD,
+ HttpServletRequest.FORM_AUTH,
username, password);
return (true);
}
@@ -193,7 +194,7 @@
+ "'");
principal = (Principal)
session.getNote(Constants.FORM_PRINCIPAL_NOTE);
- register(request, response, principal, Constants.FORM_METHOD,
+ register(request, response, principal, HttpServletRequest.FORM_AUTH,
(String) session.getNote(Constants.SESS_USERNAME_NOTE),
(String) session.getNote(Constants.SESS_PASSWORD_NOTE));
// If we're caching principals we no longer need the username
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/GenericHeaderAuthenticator.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/GenericHeaderAuthenticator.java 2009-12-10 14:01:21 UTC (rev 97696)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/GenericHeaderAuthenticator.java 2009-12-10 15:49:13 UTC (rev 97697)
@@ -28,6 +28,7 @@
import javax.management.JMException;
import javax.management.ObjectName;
import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.Realm;
import org.apache.catalina.Session;
@@ -166,7 +167,7 @@
session.setNote(Constants.SESS_PASSWORD_NOTE, password);
request.setUserPrincipal(principal);
- register(request, response, principal, Constants.FORM_METHOD, username, password);
+ register(request, response, principal, HttpServletRequest.FORM_AUTH, username, password);
return true;
}
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/JBossExtendedSecurityMgrRealm.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/JBossExtendedSecurityMgrRealm.java 2009-12-10 14:01:21 UTC (rev 97696)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/JBossExtendedSecurityMgrRealm.java 2009-12-10 15:49:13 UTC (rev 97697)
@@ -37,6 +37,7 @@
import javax.security.auth.message.MessageInfo;
import javax.security.auth.message.AuthStatus;
import javax.security.jacc.PolicyContext;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Context;
@@ -200,7 +201,7 @@
private Map getSharedState(Request request, LoginConfig config)
{
Map map = new HashMap();
- if(config.getAuthMethod().equals(Constants.FORM_METHOD))
+ if(config.getAuthMethod().equals(HttpServletRequest.FORM_AUTH))
{
map.put("javax.security.auth.login.name",
getPrincipal(request.getParameter(Constants.FORM_USERNAME)));
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/authenticators/JASPIFormAuthenticator.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/authenticators/JASPIFormAuthenticator.java 2009-12-10 14:01:21 UTC (rev 97696)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/authenticators/JASPIFormAuthenticator.java 2009-12-10 15:49:13 UTC (rev 97697)
@@ -24,13 +24,13 @@
import java.io.IOException;
import java.security.Principal;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Session;
import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.authenticator.FormAuthenticator;
import org.apache.catalina.connector.Request;
-import org.apache.catalina.connector.Response;
import org.apache.catalina.deploy.LoginConfig;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
@@ -118,7 +118,7 @@
session.setNote(Constants.FORM_PRINCIPAL_NOTE, principal);
if (!matchRequest(request)) {
register(request, response, principal,
- Constants.FORM_METHOD,
+ HttpServletRequest.FORM_AUTH,
username, password);
return (true);
}
@@ -138,7 +138,7 @@
+ "'");
principal = (Principal)
session.getNote(Constants.FORM_PRINCIPAL_NOTE);
- register(request, response, principal, Constants.FORM_METHOD,
+ register(request, response, principal, HttpServletRequest.FORM_AUTH,
(String) session.getNote(Constants.SESS_USERNAME_NOTE),
(String) session.getNote(Constants.SESS_PASSWORD_NOTE));
// If we're caching principals we no longer need the username
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/sso/SingleSignOnEntry.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/sso/SingleSignOnEntry.java 2009-12-10 14:01:21 UTC (rev 97696)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/sso/SingleSignOnEntry.java 2009-12-10 15:49:13 UTC (rev 97697)
@@ -17,6 +17,8 @@
import java.security.Principal;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.catalina.Session;
import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.authenticator.SingleSignOn;
@@ -231,8 +233,8 @@
this.username = username;
this.password = password;
this.canReauthenticate =
- (Constants.BASIC_METHOD.equals(authType)
- || Constants.FORM_METHOD.equals(authType));
+ (HttpServletRequest.BASIC_AUTH.equals(authType)
+ || HttpServletRequest.FORM_AUTH.equals(authType));
return changed;
}
Modified: trunk/tomcat/src/resources/web.xml
===================================================================
--- trunk/tomcat/src/resources/web.xml 2009-12-10 14:01:21 UTC (rev 97696)
+++ trunk/tomcat/src/resources/web.xml 2009-12-10 15:49:13 UTC (rev 97697)
@@ -3,6 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
+
<!-- ======================== Introduction ============================== -->
<!-- This document defines default values for *all* web applications -->
<!-- loaded into this instance of Tomcat. As each application is -->
@@ -105,34 +106,6 @@
</servlet>
- <!-- The "invoker" servlet, which executes anonymous servlet classes -->
- <!-- that have not been defined in a web.xml file. Traditionally, this -->
- <!-- servlet is mapped to the URL pattern "/servlet/*", but you can map -->
- <!-- it to other patterns as well. The extra path info portion of such a -->
- <!-- request must be the fully qualified class name of a Java class that -->
- <!-- implements Servlet (or extends HttpServlet), or the servlet name -->
- <!-- of an existing servlet definition. This servlet supports the -->
- <!-- following initialization parameters (default values are in square -->
- <!-- brackets): -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
-
- <!--
- <servlet>
- <servlet-name>invoker</servlet-name>
- <servlet-class>
- org.apache.catalina.servlets.InvokerServlet
- </servlet-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
- -->
-
-
<!-- The JSP page compiler and execution servlet, which is the mechanism -->
<!-- used by Tomcat to support JSP pages. Traditionally, this servlet -->
<!-- is mapped to the URL pattern "*.jsp". This servlet supports the -->
@@ -324,20 +297,11 @@
<url-pattern>/</url-pattern>
</servlet-mapping>
- <!-- The mapping for the invoker servlet -->
- <!--
- <servlet-mapping>
- <servlet-name>invoker</servlet-name>
- <url-pattern>/servlet/*</url-pattern>
- </servlet-mapping>
- -->
-
<!-- The mapping for the JSP servlet -->
<servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>*.jsp</url-pattern>
</servlet-mapping>
-
<servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>*.jspx</url-pattern>
More information about the jboss-cvs-commits
mailing list