[java-identity-provider] branch main updated: Remove duplicate properties, and default authn property to Password.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=0651fe7a9dfc6cb987d30a899e684eb83204c824

The following commit(s) were added to refs/heads/main by this push:
       new  0651fe7a9 Remove duplicate properties, and default authn property to Password.
0651fe7a9 is described below

commit 0651fe7a9dfc6cb987d30a899e684eb83204c824
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 21 09:09:16 2020 -0400

    Remove duplicate properties, and default authn property to Password.
---
 .../net/shibboleth/idp/flows/authn/authn-beans.xml    |  2 +-
 .../src/main/resources/conf/authn/authn.properties    |  2 +-
 idp-conf/src/main/resources/conf/idp.properties       | 19 -------------------
 idp-conf/src/test/resources/test/test-cas-beans.xml   |  2 +-
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
index ebcebd65c..af662e19b 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
@@ -21,7 +21,7 @@
     <bean id="PopulateAuthenticationContext"
         class="net.shibboleth.idp.authn.impl.PopulateAuthenticationContext" scope="prototype"
         p:availableFlows="#{@'shibboleth.AuthenticationFlowDescriptorManager'.getComponents()}"
-        p:potentialFlows="#{@'shibboleth.AuthenticationFlowDescriptorManager'.getComponents().?[id matches 'authn/(' + '%{idp.authn.flows:}'.trim() + ')']}"
+        p:potentialFlows="#{@'shibboleth.AuthenticationFlowDescriptorManager'.getComponents().?[id matches 'authn/(' + '%{idp.authn.flows:Password}'.trim() + ')']}"
         p:principalEvalPredicateFactoryRegistry-ref="shibboleth.AuthnComparisonRegistry"
         p:fixedEventLookupStrategy="#{getObject('shibboleth.FixedAuthenticationEventStrategy')}" />
 
diff --git a/idp-conf/src/main/resources/conf/authn/authn.properties b/idp-conf/src/main/resources/conf/authn/authn.properties
index 60475a52c..a3a22cccf 100644
--- a/idp-conf/src/main/resources/conf/authn/authn.properties
+++ b/idp-conf/src/main/resources/conf/authn/authn.properties
@@ -2,7 +2,7 @@
 # specific methods.
 
 # Regular expression matching login flows to enable, e.g. IPAddress|Password
-idp.authn.flows = Password
+#idp.authn.flows = Password
 
 # Default settings for most authentication methods.
 #idp.authn.defaultLifetime = PT1H
diff --git a/idp-conf/src/main/resources/conf/idp.properties b/idp-conf/src/main/resources/conf/idp.properties
index 6c2cc29ed..d8310bb89 100644
--- a/idp-conf/src/main/resources/conf/idp.properties
+++ b/idp-conf/src/main/resources/conf/idp.properties
@@ -127,25 +127,6 @@ idp.session.secondaryServiceIndex = true
 # Length of time to track SP sessions
 #idp.session.defaultSPlifetime = PT2H
 
-# Regular expression matching login flows to enable, e.g. IPAddress|Password
-idp.authn.flows = Password
-
-# Default lifetime and timeout of various authentication methods
-#idp.authn.defaultLifetime = PT60M
-#idp.authn.defaultTimeout = PT30M
-
-# Whether to populate relying party user interface information for display
-# during authentication, consent, terms-of-use.
-#idp.authn.rpui = true
-
-# Whether to prioritize "active" results when an SP requests more than
-# one possible matching login method (V2 behavior was to favor them)
-#idp.authn.favorSSO = false
-
-# Whether to fail requests when a user identity after authentication
-# doesn't match the identity in a pre-existing session.
-#idp.authn.identitySwitchIsError = false
-
 # Set to "shibboleth.StorageService" or custom bean for alternate storage of consent
 #idp.consent.StorageService = shibboleth.ClientPersistentStorageService
 
diff --git a/idp-conf/src/test/resources/test/test-cas-beans.xml b/idp-conf/src/test/resources/test/test-cas-beans.xml
index 2d0ae8dca..ea9b0b36e 100644
--- a/idp-conf/src/test/resources/test/test-cas-beans.xml
+++ b/idp-conf/src/test/resources/test/test-cas-beans.xml
@@ -13,7 +13,7 @@
           depends-on="shibboleth.OpenSAMLConfig"
           p:httpServletRequest-ref="shibboleth.HttpServletRequest"
           p:httpServletResponse-ref="shibboleth.HttpServletResponse"
-          p:authenticationFlowDescriptors="#{@'shibboleth.AuthenticationFlowDescriptorManager'.getComponents().?[id matches 'authn/(' + '%{idp.authn.flows:}'.trim() + ')']}"
+          p:authenticationFlowDescriptors="#{@'shibboleth.AuthenticationFlowDescriptorManager'.getComponents().?[id matches 'authn/(' + '%{idp.authn.flows:Password}'.trim() + ')']}"
           p:cookieManager-ref="shibboleth.CookieManager"
           p:storageService-ref="shibboleth.StorageService"
           p:consistentAddress="%{idp.session.consistentAddress:true}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.