WFLY-3590 Add ability to turn off proactive authentication

yersan · May 18, 2015 · 007b366 · 007b366
1 parent 834354a
commit 007b366
Show file tree

Hide file tree

Showing 18 changed files with 702 additions and 9 deletions.
diff --git a/appclient/pom.xml b/appclient/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-as-parent-metadata</artifactId>
-        <version>9.0.1.Final-SNAPSHOT</version>
+        <version>10.0.0.Beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>jboss-metadata-appclient</artifactId>

diff --git a/build-config/pom.xml b/build-config/pom.xml
@@ -29,5 +29,5 @@
     <groupId>org.jboss.metadata</groupId>
     <artifactId>metadata-build-config</artifactId>
     <name>Metadata Build Configuration</name>
-    <version>9.0.1.Final-SNAPSHOT</version>
+    <version>10.0.0.Beta1-SNAPSHOT</version>
 </project>
diff --git a/common/pom.xml b/common/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-as-parent-metadata</artifactId>
-        <version>9.0.1.Final-SNAPSHOT</version>
+        <version>10.0.0.Beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>jboss-metadata-common</artifactId>

diff --git a/ear/pom.xml b/ear/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-as-parent-metadata</artifactId>
-        <version>9.0.1.Final-SNAPSHOT</version>
+        <version>10.0.0.Beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>jboss-metadata-ear</artifactId>

diff --git a/ejb/pom.xml b/ejb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-as-parent-metadata</artifactId>
-        <version>9.0.1.Final-SNAPSHOT</version>
+        <version>10.0.0.Beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>jboss-metadata-ejb</artifactId>

diff --git a/permissions/pom.xml b/permissions/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-as-parent-metadata</artifactId>
-        <version>9.0.1.Final-SNAPSHOT</version>
+        <version>10.0.0.Beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>jboss-metadata-permissions</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
 
     <groupId>org.jboss.metadata</groupId>
     <artifactId>jboss-as-parent-metadata</artifactId>
-    <version>9.0.1.Final-SNAPSHOT</version>
+    <version>10.0.0.Beta1-SNAPSHOT</version>
 
     <name>JBoss Application Server: Metadata Aggregator</name>
     <description>JBoss Application Server: Metadata Aggregator</description>

diff --git a/test/pom.xml b/test/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-as-parent-metadata</artifactId>
-        <version>9.0.1.Final-SNAPSHOT</version>
+        <version>10.0.0.Beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>jboss-metadata-test</artifactId>

diff --git a/web/pom.xml b/web/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-as-parent-metadata</artifactId>
-        <version>9.0.1.Final-SNAPSHOT</version>
+        <version>10.0.0.Beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>jboss-metadata-web</artifactId>

diff --git a/web/src/main/java/org/jboss/metadata/merge/web/jboss/JBossWebMetaDataMerger.java b/web/src/main/java/org/jboss/metadata/merge/web/jboss/JBossWebMetaDataMerger.java
@@ -278,5 +278,8 @@ else if (original != null && original.getVersion() != null)
         if(override != null && override.getDefaultEncoding() != null) {
             dest.setDefaultEncoding(override.getDefaultEncoding());
         }
+        if(override != null && !override.isProactiveAuthentication()) {
+            dest.setProactiveAuthentication(override.isProactiveAuthentication());
+        }
     }
 }
diff --git a/web/src/main/java/org/jboss/metadata/parser/jbossweb/Element.java b/web/src/main/java/org/jboss/metadata/parser/jbossweb/Element.java
@@ -73,6 +73,7 @@ public enum Element {
     OVERLAY("overlay"),
 
     PARAM("param"),
+    PROACTIVE_AUTHENTICATION("proactive-authentication"),
 
     REPLICATION_CONFIG("replication-config"),
     REPLICATION_GRANULARITY("replication-granularity"),

diff --git a/web/src/main/java/org/jboss/metadata/parser/jbossweb/JBossWebMetaDataParser.java b/web/src/main/java/org/jboss/metadata/parser/jbossweb/JBossWebMetaDataParser.java
@@ -118,6 +118,9 @@ public static JBossWebMetaData parse(XMLStreamReader reader, PropertyReplacer pr
             case JBOSS_WEB_8_0:
                 wmd = new JBoss80WebMetaData();
                 break;
+            case JBOSS_WEB_10_0:
+                wmd = new JBoss80WebMetaData();
+                break;
         }
 
         // Handle attributes
@@ -269,6 +272,9 @@ public static JBossWebMetaData parse(XMLStreamReader reader, PropertyReplacer pr
                 case EXECUTOR_NAME:
                     wmd.setExecutorName(getElementText(reader, propertyReplacer));
                     break;
+                case PROACTIVE_AUTHENTICATION:
+                    wmd.setProactiveAuthentication(Boolean.parseBoolean(getElementText(reader, propertyReplacer)));
+                    break;
                 default: {
                     if (DEPRECATED_ELEMENTS.contains(localName)) {
                         log.warnf("<%s/> is no longer supported and will be ignored", localName);

diff --git a/web/src/main/java/org/jboss/metadata/parser/jbossweb/Location.java b/web/src/main/java/org/jboss/metadata/parser/jbossweb/Location.java
@@ -38,6 +38,7 @@ public class Location {
         bindings.put("http://www.jboss.org/j2ee/schema/jboss-web_7_0.xsd", Version.JBOSS_WEB_7_0);
         bindings.put("http://www.jboss.org/j2ee/schema/jboss-web_7_1.xsd", Version.JBOSS_WEB_7_1);
         bindings.put("http://www.jboss.org/j2ee/schema/jboss-web_8_0.xsd", Version.JBOSS_WEB_8_0);
+        bindings.put("http://www.jboss.org/j2ee/schema/jboss-web_10_0.xsd", Version.JBOSS_WEB_10_0);
     }
 
     public static Version getVersion(String location) {

diff --git a/web/src/main/java/org/jboss/metadata/parser/jbossweb/Version.java b/web/src/main/java/org/jboss/metadata/parser/jbossweb/Version.java
@@ -29,4 +29,5 @@ public enum Version {
     JBOSS_WEB_6_0, JBOSS_WEB_7_0,
     JBOSS_WEB_7_1,
     JBOSS_WEB_8_0,
+    JBOSS_WEB_10_0,
 }
diff --git a/web/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java b/web/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
@@ -167,6 +167,11 @@ public class JBossWebMetaData extends NamedModuleImpl {
 
     private String defaultEncoding;
 
+    /**
+     * If Undertow should always attempt to authenticate if credentials are present
+     */
+    private boolean proactiveAuthentication = true;
+
 
     public static final int SESSION_COOKIES_DEFAULT = 0;
     public static final int SESSION_COOKIES_ENABLED = 1;
@@ -809,4 +814,12 @@ public String getDefaultEncoding() {
     public void setDefaultEncoding(String defaultEncoding) {
         this.defaultEncoding = defaultEncoding;
     }
+
+    public boolean isProactiveAuthentication() {
+        return proactiveAuthentication;
+    }
+
+    public void setProactiveAuthentication(boolean proactiveAuthentication) {
+        this.proactiveAuthentication = proactiveAuthentication;
+    }
 }