[jboss-cvs] JBossAS SVN: r65639 - in branches/Branch_5_0/tomcat/src: resources and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2007-09-26 18:45:57 -0400 (Wed, 26 Sep 2007)
New Revision: 65639

Added:
   branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/security/PrincipalSessionAttributeFilter.java
Modified:
   branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/security/SecurityFlushSessionListener.java
   branches/Branch_5_0/tomcat/src/resources/web.xml
Log:
Created filter to add the principal to the http session, so it can be retrieved when the session expires.
Fix for JBAS-4752.

Added: branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/security/PrincipalSessionAttributeFilter.java
===================================================================
--- branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/security/PrincipalSessionAttributeFilter.java	                        (rev 0)
+++ branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/security/PrincipalSessionAttributeFilter.java	2007-09-26 22:45:57 UTC (rev 65639)
@@ -0,0 +1,85 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.web.tomcat.security;
+
+import java.io.IOException;
+import java.security.Principal;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.jboss.logging.Logger;
+
+/**
+ * A filter to keep track of principals in the sessions.
+ * 
+ * @author mmoyses at redhat.com
+ * @version $Revison:$
+ */
+public class PrincipalSessionAttributeFilter implements Filter
+{
+
+   private static Logger log = Logger.getLogger(PrincipalSessionAttributeFilter.class);
+
+   private boolean trace = log.isTraceEnabled();
+
+   private static final String JBOSS_PRINCIPAL = "org.jboss.web.tomcat.security.principal";
+
+   /**
+    * @see Filter#init(javax.servlet.FilterConfig)
+    */
+   public void init(FilterConfig filterConfig) throws ServletException
+   {
+   }
+
+   /**
+    * @see Filter#destroy()
+    */
+   public void destroy()
+   {
+   }
+
+   /**
+    * @see Filter#doFilter(javax.servlet.ServletRequest,
+    *      javax.servlet.ServletResponse, javax.servlet.FilterChain)
+    */
+   public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
+         ServletException
+   {
+      HttpSession session = ((HttpServletRequest) request).getSession();
+      Principal principal = (Principal) session.getAttribute(JBOSS_PRINCIPAL);
+      if (principal == null)
+      {
+         principal = ((HttpServletRequest) request).getUserPrincipal();
+         session.setAttribute(JBOSS_PRINCIPAL, principal);
+         if (trace)
+            log.trace("Placing principal in session");
+      }
+   }
+
+}

Modified: branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/security/SecurityFlushSessionListener.java
===================================================================
--- branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/security/SecurityFlushSessionListener.java	2007-09-26 22:20:40 UTC (rev 65638)
+++ branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/security/SecurityFlushSessionListener.java	2007-09-26 22:45:57 UTC (rev 65639)
@@ -55,6 +55,8 @@
    
    private String securityDomain = null; 
    
+   private static final String JBOSS_PRINCIPAL = "org.jboss.web.tomcat.security.principal";
+   
    /**
     * 
     * Create a new SecurityFlushSessionListener.
@@ -82,6 +84,12 @@
          if(securityDomain == null) 
             log.debug("Unable to obtain SecurityDomain"); 
          Principal principal = getPrincipal(subject);
+         if(principal == null)
+         {
+        	 if(trace)
+        		 log.trace("Searching for principal in the session");
+        	 principal = (Principal) httpSessionEvent.getSession().getAttribute(JBOSS_PRINCIPAL);
+         }
          if(principal != null && securityDomain != null)
             flushAuthenticationCache(principal);
       }catch(Exception e)

Modified: branches/Branch_5_0/tomcat/src/resources/web.xml
===================================================================
--- branches/Branch_5_0/tomcat/src/resources/web.xml	2007-09-26 22:20:40 UTC (rev 65638)
+++ branches/Branch_5_0/tomcat/src/resources/web.xml	2007-09-26 22:45:57 UTC (rev 65639)
@@ -38,6 +38,21 @@
       <filter-name>CommonHeadersFilter</filter-name>
       <url-pattern>/*</url-pattern>
    </filter-mapping>
+   
+   <!-- JBAS-4752: This filter should be enabled when authentication cache   -->
+   <!-- must be flushed as soon as the http sessions expire.                 -->
+   
+   <!--
+   <filter>
+      <filter-name>PrincipalSessionAttributeFilter</filter-name>
+      <filter-class>org.jboss.web.tomcat.security.PrincipalSessionAttributeFilter</filter-class>
+   </filter>
+
+   <filter-mapping>
+      <filter-name>PrincipalSessionAttributeFilter</filter-name>
+      <url-pattern>/*</url-pattern>
+   </filter-mapping>
+   -->
 	
    <!-- ================== Common Listener Configuration ==================== -->
    <listener>