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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jul 30 15:47:10 2014
New Revision: 6363

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6363&view=rev
Log:
- Remove duplicated browser profile signal.
- Clean up fall-through behavior in authn flows and get rid of copy/paste errors from the password flow.

Modified:
    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/FilterFlowsByNonBrowserSupport.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FilterFlowsByNonBrowserSupportTest.java
    trunk/idp-conf/src/main/resources/conf/authn/external-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/remoteuser-authn-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-flow.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeAuthenticationContext.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java?rev=6363&r1=6362&r2=6363&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java Wed Jul 30 15:47:10 2014
@@ -57,24 +57,21 @@
 
     /** Whether authentication must not involve subject interaction. */
     private boolean isPassive;
-
-    /** Whether the surrounding profile is browser-based. */
-    private boolean isBrowserProfile;
     
     /** A non-normative hint some protocols support to indicate who the subject might be. */
     @Nullable private String hintedName;
     
     /** Flows that could potentially be used to authenticate the user. */
-    @Nonnull @NonnullElements private final Map<String, AuthenticationFlowDescriptor> potentialFlows;
+    @Nonnull @NonnullElements private final Map<String,AuthenticationFlowDescriptor> potentialFlows;
 
     /** Authentication results associated with an active session and available for (re)use. */
-    @Nonnull @NonnullElements private final Map<String, AuthenticationResult> activeResults;
+    @Nonnull @NonnullElements private final Map<String,AuthenticationResult> activeResults;
         
     /** The registry of predicate factories for custom principal evaluation. */
     @Nonnull private PrincipalEvalPredicateFactoryRegistry evalRegistry;
 
     /** Previously attempted flows (could be failures or intermediate results). */
-    @Nonnull @NonnullElements private final Map<String, AuthenticationFlowDescriptor> intermediateFlows;
+    @Nonnull @NonnullElements private final Map<String,AuthenticationFlowDescriptor> intermediateFlows;
     
     /** Authentication flow being attempted to authenticate the user. */
     @Nullable private AuthenticationFlowDescriptor attemptedFlow;
@@ -114,7 +111,7 @@
      * 
      * @return authentication results currently active for the subject
      */
-    @Nonnull @NonnullElements @Unmodifiable public Map<String, AuthenticationResult> getActiveResults() {
+    @Nonnull @NonnullElements @Unmodifiable public Map<String,AuthenticationResult> getActiveResults() {
         return ImmutableMap.copyOf(activeResults);
     }
 
@@ -142,7 +139,7 @@
      * 
      * @return the potential flows
      */
-    @Nonnull @NonnullElements @Live public Map<String, AuthenticationFlowDescriptor> getPotentialFlows() {
+    @Nonnull @NonnullElements @Live public Map<String,AuthenticationFlowDescriptor> getPotentialFlows() {
         return potentialFlows;
     }
 
@@ -152,7 +149,7 @@
      * 
      * @return the intermediately executed flows
      */
-    @Nonnull @NonnullElements @Live public Map<String, AuthenticationFlowDescriptor> getIntermediateFlows() {
+    @Nonnull @NonnullElements @Live public Map<String,AuthenticationFlowDescriptor> getIntermediateFlows() {
         return intermediateFlows;
     }
     
@@ -193,27 +190,6 @@
      */
     @Nonnull public AuthenticationContext setIsPassive(final boolean passive) {
         isPassive = passive;
-        return this;
-    }
-
-    /**
-     * Get whether the surrounding profile is browser-based.
-     * 
-     * @return whether surrounding profile is browser-based
-     */
-    public boolean isBrowserProfile() {
-        return isBrowserProfile;
-    }
-    
-    /**
-     * Set whether the surrounding profile is browser-based.
-     * 
-     * @param browser whether surrounding profile is browser-based
-     * 

[... 197 lines stripped ...]