You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/26 23:11:17 UTC

[isis] branch master updated: ISIS-2501: WebModuleShiro: add DispatcherType.ASYNC to the Servlet mapping

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 373d73b  ISIS-2501: WebModuleShiro: add DispatcherType.ASYNC to the Servlet mapping
373d73b is described below

commit 373d73b479ff08b4c78af00942e27d1243493bb7
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 27 00:11:01 2021 +0100

    ISIS-2501: WebModuleShiro: add DispatcherType.ASYNC to the Servlet
    mapping
---
 .../java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
index 6f0d61c..55b6f6a 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
@@ -19,11 +19,13 @@
 package org.apache.isis.security.shiro.webmodule;
 
 import java.util.Collection;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.servlet.DispatcherType;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
@@ -187,7 +189,7 @@ public class WebModuleShiro extends WebModuleAbstract {
         registerFilter(ctx, SHIRO_FILTER_NAME, ShiroFilter.class)
             .ifPresent(filterReg -> {
                 filterReg.addMappingForUrlPatterns(
-                        null,
+                        EnumSet.of(DispatcherType.REQUEST, DispatcherType.ASYNC), 
                         false, // filter is forced first
                         "/*");
             });