[java-identity-provider COMMIT] in /trunk: idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDes...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun  2 12:43:25 2014
New Revision: 6024

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6024&view=rev
Log:
IDP-230 - add in hook for non-browser signaling, to avoid overloading isPassive with ECP

Added:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FilterFlowsByNonBrowserSupport.java   (with props)
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByNonBrowserSupportTest.java   (with props)
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FilterFlowsByForcedAuthn.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FilterFlowsByPassivity.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByForceAuthnTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByPassivityTest.java
    trunk/idp-conf/pom.xml
    trunk/idp-conf/src/main/resources/conf/authn/general-authn-config.xml
    trunk/idp-conf/src/main/resources/flows/authn/conditions/conditions-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java?rev=6024&r1=6023&r2=6024&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java Mon Jun  2 12:43:25 2014
@@ -61,6 +61,9 @@
     /** Additional allowance for storage of result records to avoid race conditions during use. */
     public static final long STORAGE_EXPIRATION_OFFSET;
 
+    /** Whether this flow supports non-browser clients. */
+    private boolean supportsNonBrowser;
+    
     /** Whether this flow supports passive authentication. */
     private boolean supportsPassive;
 
@@ -87,13 +90,32 @@
 
     /** Constructor. */
     public AuthenticationFlowDescriptor() {
+        supportsNonBrowser = true;
         supportedPrincipals = new Subject();
         activationCondition = Predicates.alwaysTrue();
         inactivityTimeout = 30 * 60 * 1000;
     }
-
-    /**
-     * Gets whether this flow supports passive authentication.
+    
+    /**
+     * Get whether this flow supports non-browser clients.
+     * 
+     * @return whether this flow supports non-browser clients
+     */
+    public boolean isNonBrowserSupported() {
+        return supportsNonBrowser;
+    }
+    
+    /**
+     * Set whether this flow supports non-browser clients.
+     * 
+     * @param isSupported whether this flow supports non-browser clients
+     */
+    public void setNonBrowserSupported(final boolean isSupported) {
+        supportsNonBrowser = isSupported;
+    }
+
+    /**
+     * Get whether this flow supports passive authentication.
      * 
      * @return whether this flow supports passive authentication
      */
@@ -102,18 +124,18 @@
     }
 
     /**
-     * Sets whether this flow supports passive authentication.
+     * Set whether this flow supports passive authentication.
      * 
      * @param isSupported whether this flow supports passive authentication
      */
-    public void setPassiveAuthenticationSupported(boolean isSupported) {
+    public void setPassiveAuthenticationSupported(final boolean isSupported) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
         supportsPassive = isSupported;
     }
 
     /**
-     * Gets whether this flow supports forced authentication.
+     * Get whether this flow supports forced authentication.
      * 
      * @return whether this flow supports forced authentication
      */
@@ -122,18 +144,18 @@
     }
 
     /**
-     * Sets whether this flow supports forced authentication.
+     * Set whether this flow supports forced authentication.
      * 
      * @param isSupported whether this flow supports forced authentication.
      */
-    public void setForcedAuthenticationSupported(boolean isSupported) {
+    public void setForcedAuthenticationSupported(final boolean isSupported) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
         supportsForced = isSupported;
     }
 
     /**
-     * Gets the maximum amount of time in milliseconds, since first usage, a flow should be considered active. A value

[... 403 lines stripped ...]