Respect the filters option when using Undertow.

projectodd · Sep 4, 2015 · 6f37133 · 6f37133
1 parent 3831e28
commit 6f37133
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/modules/web-undertow/src/main/java/org/projectodd/wunderboss/web/undertow/UndertowWeb.java b/modules/web-undertow/src/main/java/org/projectodd/wunderboss/web/undertow/UndertowWeb.java
@@ -36,6 +36,9 @@
 import io.undertow.servlet.Servlets;
 import io.undertow.servlet.api.DeploymentInfo;
 import io.undertow.servlet.api.DeploymentManager;
+import io.undertow.servlet.api.FilterInfo;
+import io.undertow.servlet.api.InstanceFactory;
+import io.undertow.servlet.api.InstanceHandle;
 import io.undertow.servlet.api.ServletInfo;
 import io.undertow.servlet.util.ImmediateInstanceFactory;
 import io.undertow.util.Headers;
@@ -47,6 +50,8 @@
 import org.xnio.OptionMap;
 import org.xnio.Xnio;
 
+import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import java.io.File;
@@ -152,7 +157,9 @@ public boolean registerServlet(Servlet servlet, Map<RegisterOption, Object> opts
         final ServletInfo servletInfo = Servlets.servlet(servletName != null ? servletName : servletClass.getSimpleName(),
                                                          servletClass,
                                                          new ImmediateInstanceFactory(servlet));
-        servletInfo.addMapping("/*");
+        final String mapping = "/*";
+
+        servletInfo.addMapping(mapping);
         // LoadOnStartup is required for any websocket Endpoints to work
         servletInfo.setLoadOnStartup(1);
         // Support async servlets
@@ -166,6 +173,20 @@ public boolean registerServlet(Servlet servlet, Map<RegisterOption, Object> opts
                 .setDeploymentName(UUID.randomUUID().toString())
                 .addServlet(servletInfo);
 
+        Map<String, Filter> filterMap = (Map<String, Filter>) options.get(RegisterOption.FILTER_MAP);
+        if (filterMap != null) {
+            for (Map.Entry<String, Filter> entry : filterMap.entrySet()) {
+                final String filterName = entry.getKey() + servletName;
+                final Filter filter = entry.getValue();
+                FilterInfo filterInfo = Servlets.filter(filterName, filter.getClass(),
+                                                        new ImmediateInstanceFactory<>(filter));
+                filterInfo.setAsyncSupported(true);
+
+                servletBuilder.addFilterUrlMapping(filterName, mapping, DispatcherType.REQUEST);
+                servletBuilder.addFilter(filterInfo);
+            }
+        }
+
         // Required for any websocket support in undertow
         final WebSocketDeploymentInfo wsInfo = new WebSocketDeploymentInfo();
 

diff --git a/modules/wildfly/src/main/java/org/projectodd/wunderboss/as/ServletWeb.java b/modules/wildfly/src/main/java/org/projectodd/wunderboss/as/ServletWeb.java
@@ -72,7 +72,6 @@ public void run() {
                     servletRegistration.setAsyncSupported(true);
                     servletRegistration.setInitParameter(ORIGINAL_CONTEXT, context);
 
-                    // TODO: add this to UndertowWeb as well?
                     Map<String, Filter> filterMap = (Map<String, Filter>) options.get(RegisterOption.FILTER_MAP);
                     if (filterMap != null) {
                         for (Map.Entry<String, Filter> entry : filterMap.entrySet()) {