Resolve a Weblogic compatibility issue (patch thanks to Patrick Burleson).

changelog.txt

@@ -12,6 +12,7 @@ Changes in version 0.6 (2004-xx-xx)
 * Improved test coverage (now 98.3%)
 * Fixed Linux compatibility issues (directory case sensitivity etc)
 * Fixed AbstractProcessingFilter to handle servlet spec container differences
+* Fixed AbstractIntegrationFilter to resolve a Weblogic compatibility issue
 * Fixed CasAuthenticationToken if proxy granting ticket callback not requested
 * Documentation improvements
 

contributors.txt

@@ -20,4 +20,11 @@ contributions to the Acegi Security System for Spring project:
   public automated Maven build at the Monkey Machine
   (http://www.monkeymachine.co.uk/acegi).
 
+* Patrick Burleson contributed a patch for Weblogic support.
+
+* Anyone else I've forgotten (please let me know so I can correct this).
+
+Plus of course all the people who use the project and provide feedback, bug
+reports, suggestions and help fellow users.
+
 $Id$

core/src/main/java/org/acegisecurity/ui/AbstractIntegrationFilter.java

@@ -67,8 +67,14 @@ import javax.servlet.ServletResponse;
  * SecureContext}, one will be created. The created object will be of the
  * instance defined by the {@link #setSecureContext(Class)} method.
  * </p>
+ * 
+ * <P>
+ * This filter will only execute once per request, to resolve servlet container
+ * (specifically Weblogic) incompatibilities.
+ * </p>
  *
  * @author Ben Alex
+ * @author Patrick Burleson
  * @version $Id$
  */
 public abstract class AbstractIntegrationFilter implements InitializingBean,
@@ -76,6 +82,7 @@ public abstract class AbstractIntegrationFilter implements InitializingBean,
     //~ Static fields/initializers =============================================
 
     protected static final Log logger = LogFactory.getLog(AbstractIntegrationFilter.class);
+    private static final String FILTER_APPLIED = "__acegi_integration_fitlerapplied";
 
     //~ Instance fields ========================================================
 
@@ -114,68 +121,78 @@ public abstract class AbstractIntegrationFilter implements InitializingBean,
 
     public void doFilter(ServletRequest request, ServletResponse response,
         FilterChain chain) throws IOException, ServletException {
-        // Populate authentication information
+        if ((request != null) && (request.getAttribute(FILTER_APPLIED) != null)) {
-        Object extracted = this.extractFromContainer(request);
+            // ensure that filter is only applied once per request
-
+            chain.doFilter(request, response);
-        if (extracted instanceof Authentication) {
+        } else {
-            if (logger.isDebugEnabled()) {
+            if (request != null) {
-                logger.debug(
+                request.setAttribute(FILTER_APPLIED, Boolean.TRUE);
-                    "Authentication added to ContextHolder from container");
             }
 
-            Authentication auth = (Authentication) extracted;
+            // Populate authentication information
+            Object extracted = this.extractFromContainer(request);
 
-            // Get or create existing SecureContext
+            if (extracted instanceof Authentication) {
-            SecureContext sc = null;
+                if (logger.isDebugEnabled()) {
-
+                    logger.debug(
-            if ((ContextHolder.getContext() == null)
+                        "Authentication added to ContextHolder from container");
-                || !(ContextHolder.getContext() instanceof SecureContext)) {
-                try {
-                    sc = (SecureContext) this.secureContext.newInstance();
-                } catch (InstantiationException ie) {
-                    throw new ServletException(ie);
-                } catch (IllegalAccessException iae) {
-                    throw new ServletException(iae);
                 }
+
+                Authentication auth = (Authentication) extracted;
+
+                // Get or create existing SecureContext
+                SecureContext sc = null;
+
+                if ((ContextHolder.getContext() == null)
+                    || !(ContextHolder.getContext() instanceof SecureContext)) {
+                    try {
+                        sc = (SecureContext) this.secureContext.newInstance();
+                    } catch (InstantiationException ie) {
+                        throw new ServletException(ie);
+                    } catch (IllegalAccessException iae) {
+                        throw new ServletException(iae);
+                    }
+                } else {
+                    sc = (SecureContext) ContextHolder.getContext();
+                }
+
+                // Add Authentication to SecureContext, and save
+                sc.setAuthentication(auth);
+                ContextHolder.setContext((Context) sc);
             } else {
-                sc = (SecureContext) ContextHolder.getContext();
+                if (logger.isDebugEnabled()) {
+                    logger.debug(
+                        "Authentication not added to ContextHolder (could not extract an authentication object from the container which is an instance of Authentication)");
+                }
             }
 
-            // Add Authentication to SecureContext, and save
+            // Proceed with chain
-            sc.setAuthentication(auth);
+            chain.doFilter(request, response);
-            ContextHolder.setContext((Context) sc);
-        } else {
-            if (logger.isDebugEnabled()) {
-                logger.debug(
-                    "Authentication not added to ContextHolder (could not extract an authentication object from the container which is an instance of Authentication)");
-            }
-        }
 
-        // Proceed with chain
+            // Remove authentication information
-        chain.doFilter(request, response);
+            if ((ContextHolder.getContext() != null)
+                && ContextHolder.getContext() instanceof SecureContext) {
+                if (logger.isDebugEnabled()) {
+                    logger.debug(
+                        "Updating container with new Authentication object, and then removing Authentication from ContextHolder");
+                }
 
-        // Remove authentication information
+                // Get context holder
-        if ((ContextHolder.getContext() != null)
+                SecureContext secureContext = (SecureContext) ContextHolder
-            && ContextHolder.getContext() instanceof SecureContext) {
+                    .getContext();
-            if (logger.isDebugEnabled()) {
-                logger.debug(
-                    "Updating container with new Authentication object, and then removing Authentication from ContextHolder");
-            }
 
-            // Get context holder
+                // Update container with new Authentication object (may have been updated during method invocation)
-            SecureContext secureContext = (SecureContext) ContextHolder
+                this.commitToContainer(request,
-                .getContext();
+                    secureContext.getAuthentication());
 
-            // Update container with new Authentication object (may have been updated during method invocation)
+                // Remove authentication information from ContextHolder
-            this.commitToContainer(request, secureContext.getAuthentication());
+                secureContext.setAuthentication(null);
-
+                ContextHolder.setContext((Context) secureContext);
-            // Remove authentication information from ContextHolder
+            } else {
-            secureContext.setAuthentication(null);
+                if (logger.isDebugEnabled()) {
-            ContextHolder.setContext((Context) secureContext);
+                    logger.debug(
-        } else {
+                        "ContextHolder does not contain any authentication information");
-            if (logger.isDebugEnabled()) {
+                }
-                logger.debug(
-                    "ContextHolder does not contain any authentication information");
             }
         }
     }