Merge pull request #218 from adrienlauer/fix-215-cors-filter-below-security

adrienlauer · web-flow · commit 64f9a11d6d3b · 2016-11-04T13:45:09.000+01:00
Fixes #215 CORS filter no longer before security
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Version 2.3.2 (2016-11-04)
 
+* [fix] Fix wrong priority of CORS filter which was below security filter.
 * [fix] Fix binding of `X509CertificateFilter` which was bound multiple times.
 
 # Version 2.3.1 (2016-09-07)
diff --git a/cli/pom.xml b/cli/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-core</artifactId>
diff --git a/crypto/pom.xml b/crypto/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-crypto</artifactId>
diff --git a/el/pom.xml b/el/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-el</artifactId>
diff --git a/metrics/pom.xml b/metrics/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-metrics</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
     <groupId>org.seedstack.seed</groupId>
     <artifactId>seed</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.3.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/rest/core/pom.xml b/rest/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-core</artifactId>
diff --git a/rest/jersey1/pom.xml b/rest/jersey1/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-jersey1</artifactId>
diff --git a/rest/jersey2/pom.xml b/rest/jersey2/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-jersey2</artifactId>
diff --git a/rest/pom.xml b/rest/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest</artifactId>
diff --git a/rest/specs/pom.xml b/rest/specs/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-specs</artifactId>
diff --git a/security/core/pom.xml b/security/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-security</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-security-core</artifactId>
diff --git a/security/pom.xml b/security/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-security</artifactId>
diff --git a/security/specs/pom.xml b/security/specs/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.seedstack.seed</groupId>
 		<artifactId>seed-security</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.3.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>seed-security-specs</artifactId>
diff --git a/shell/pom.xml b/shell/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-shell</artifactId>
diff --git a/specs/pom.xml b/specs/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-specs</artifactId>
diff --git a/testing/pom.xml b/testing/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-testing</artifactId>
diff --git a/transaction/pom.xml b/transaction/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-transaction</artifactId>
diff --git a/web/core/pom.xml b/web/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-core</artifactId>
diff --git a/web/core/src/main/java/org/seedstack/seed/web/internal/cors/WebCORSPlugin.java b/web/core/src/main/java/org/seedstack/seed/web/internal/cors/WebCORSPlugin.java
@@ -17,6 +17,7 @@
 import org.seedstack.seed.core.utils.SeedConfigurationUtils;
 import org.seedstack.seed.web.spi.FilterDefinition;
 import org.seedstack.seed.web.spi.ListenerDefinition;
+import org.seedstack.seed.web.spi.SeedFilterPriority;
 import org.seedstack.seed.web.spi.ServletDefinition;
 import org.seedstack.seed.web.spi.WebProvider;
 import org.slf4j.Logger;
@@ -82,7 +83,7 @@ public List<FilterDefinition> filters() {
             LOGGER.info("CORS support enabled on {}", corsMapping);
 
             FilterDefinition filterDefinition = new FilterDefinition("web-cors", CORSFilter.class);
-            filterDefinition.setPriority(1000);
+            filterDefinition.setPriority(SeedFilterPriority.CORS);
             filterDefinition.setAsyncSupported(true);
             filterDefinition.addInitParameters(corsParameters);
             filterDefinition.addMappings(new FilterDefinition.Mapping("/*"));
diff --git a/web/core/src/main/java/org/seedstack/seed/web/internal/diagnostic/WebDiagnosticPlugin.java b/web/core/src/main/java/org/seedstack/seed/web/internal/diagnostic/WebDiagnosticPlugin.java
@@ -16,6 +16,7 @@
 import org.seedstack.seed.core.spi.configuration.ConfigurationProvider;
 import org.seedstack.seed.web.spi.FilterDefinition;
 import org.seedstack.seed.web.spi.ListenerDefinition;
+import org.seedstack.seed.web.spi.SeedFilterPriority;
 import org.seedstack.seed.web.spi.ServletDefinition;
 import org.seedstack.seed.web.spi.WebProvider;
 import org.slf4j.Logger;
@@ -86,7 +87,7 @@ public List<FilterDefinition> filters() {
             LOGGER.info("Per-request diagnostic enabled, a diagnostic file will be dumped for each request exception");
 
             FilterDefinition filterDefinition = new FilterDefinition("web-diagnostic", WebDiagnosticFilter.class);
-            filterDefinition.setPriority(10000);
+            filterDefinition.setPriority(SeedFilterPriority.DIAGNOSTIC);
             filterDefinition.setAsyncSupported(true);
             filterDefinition.addMappings(new FilterDefinition.Mapping("/*"));
             return Lists.newArrayList(filterDefinition);
diff --git a/web/core/src/main/java/org/seedstack/seed/web/internal/resources/WebResourcesPlugin.java b/web/core/src/main/java/org/seedstack/seed/web/internal/resources/WebResourcesPlugin.java
@@ -14,6 +14,7 @@
 import org.seedstack.seed.core.spi.configuration.ConfigurationProvider;
 import org.seedstack.seed.web.spi.FilterDefinition;
 import org.seedstack.seed.web.spi.ListenerDefinition;
+import org.seedstack.seed.web.spi.SeedFilterPriority;
 import org.seedstack.seed.web.spi.ServletDefinition;
 import org.seedstack.seed.web.spi.WebProvider;
 import org.slf4j.Logger;
@@ -74,7 +75,7 @@ public List<FilterDefinition> filters() {
             LOGGER.info("Static Web resources served on /*");
 
             FilterDefinition resourcesFilter = new FilterDefinition("web-resources", WebResourcesFilter.class);
-            resourcesFilter.setPriority(-1000);
+            resourcesFilter.setPriority(SeedFilterPriority.RESOURCES);
             resourcesFilter.setAsyncSupported(true);
             resourcesFilter.addMappings(new FilterDefinition.Mapping("/*"));
             return Lists.newArrayList(resourcesFilter);
diff --git a/web/pom.xml b/web/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web</artifactId>
diff --git a/web/security/pom.xml b/web/security/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-security</artifactId>
diff --git a/web/security/src/main/java/org/seedstack/seed/web/security/internal/WebSecurityPlugin.java b/web/security/src/main/java/org/seedstack/seed/web/security/internal/WebSecurityPlugin.java
@@ -20,11 +20,12 @@
 import org.seedstack.seed.core.internal.application.ApplicationPlugin;
 import org.seedstack.seed.security.internal.SecurityGuiceConfigurer;
 import org.seedstack.seed.security.internal.SecurityProvider;
+import org.seedstack.seed.web.security.SecurityFilter;
 import org.seedstack.seed.web.spi.FilterDefinition;
 import org.seedstack.seed.web.spi.ListenerDefinition;
+import org.seedstack.seed.web.spi.SeedFilterPriority;
 import org.seedstack.seed.web.spi.ServletDefinition;
 import org.seedstack.seed.web.spi.WebProvider;
-import org.seedstack.seed.web.security.SecurityFilter;
 
 import javax.servlet.Filter;
 import javax.servlet.ServletContext;
@@ -106,7 +107,7 @@ public List<ServletDefinition> servlets() {
     @Override
     public List<FilterDefinition> filters() {
         FilterDefinition securityFilter = new FilterDefinition("security", GuiceShiroFilter.class);
-        securityFilter.setPriority(Integer.MAX_VALUE);
+        securityFilter.setPriority(SeedFilterPriority.SECURITY);
         securityFilter.setAsyncSupported(true);
         securityFilter.addMappings(new FilterDefinition.Mapping("/*"));
         return Lists.newArrayList(securityFilter);
diff --git a/web/specs/pom.xml b/web/specs/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
+        <version>2.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-specs</artifactId>
diff --git a/web/specs/src/main/java/org/seedstack/seed/web/spi/AbstractDefinition.java b/web/specs/src/main/java/org/seedstack/seed/web/spi/AbstractDefinition.java
@@ -11,6 +11,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * This class holds common attributes for {@link FilterDefinition} and {@link ServletDefinition}.
+ */
 public abstract class AbstractDefinition {
     private final String name;
     private final Map<String, String> initParams = new HashMap<String, String>();
@@ -20,22 +23,41 @@ public abstract class AbstractDefinition {
         this.name = name;
     }
 
+    /**
+     * @return the name of the filter or servlet.
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * @return the init parameters of the filter or servlet.
+     */
     public Map<String, String> getInitParameters() {
         return Collections.unmodifiableMap(initParams);
     }
 
+    /**
+     * Add multiple init parameters to the filter or servlet definition.
+     *
+     * @param initParams the init parameters to add.
+     */
     public void addInitParameters(Map<String, String> initParams) {
         this.initParams.putAll(initParams);
     }
 
+    /**
+     * @return true if asynchronous request are supported by this filter or servlet.
+     */
     public boolean isAsyncSupported() {
         return asyncSupported;
     }
 
+    /**
+     * Sets if asynchronous requests are supported by this filter or servlet.
+     *
+     * @param asyncSupported true if asynchronous requests are supported, false otherwise.
+     */
     public void setAsyncSupported(boolean asyncSupported) {
         this.asyncSupported = asyncSupported;
     }
diff --git a/web/specs/src/main/java/org/seedstack/seed/web/spi/FilterDefinition.java b/web/specs/src/main/java/org/seedstack/seed/web/spi/FilterDefinition.java
diff --git a/web/specs/src/main/java/org/seedstack/seed/web/spi/ListenerDefinition.java b/web/specs/src/main/java/org/seedstack/seed/web/spi/ListenerDefinition.java
diff --git a/web/specs/src/main/java/org/seedstack/seed/web/spi/SeedFilterPriority.java b/web/specs/src/main/java/org/seedstack/seed/web/spi/SeedFilterPriority.java
diff --git a/web/specs/src/main/java/org/seedstack/seed/web/spi/SeedListenerPriority.java b/web/specs/src/main/java/org/seedstack/seed/web/spi/SeedListenerPriority.java
diff --git a/web/specs/src/main/java/org/seedstack/seed/web/spi/ServletDefinition.java b/web/specs/src/main/java/org/seedstack/seed/web/spi/ServletDefinition.java
diff --git a/web/undertow/pom.xml b/web/undertow/pom.xml
