[java-identity-provider COMMIT] in /trunk/idp-conf/src: main/resources/conf/idp.properties test/java/net/shibboleth/i...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov 10 12:42:19 2014
New Revision: 6870

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6870&view=rev
Log:
Pull IPAddress as default login method.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6870&r1=6869&r2=6870&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Nov 10 12:42:19 2014
@@ -94,7 +94,7 @@
 #idp.session.activeResultExtraction = net.shibboleth.idp.session.impl.ExtractActiveAuthenticationResults
 
 # Regular expression matching login flows to enable 
-idp.authn.flows = IPAddress|Password
+idp.authn.flows = Password
 
 # Regular expression of forced "initial" methods when no session exists,
 # usually in conjunction with the idp.authn.resolveAttribute property below.
@@ -120,9 +120,6 @@
 # for use by user interface logic; adds overhead so off by default.
 #idp.logout.elaboration = false
 
-#Set true to generate audit log entries for errors trapped locally
-#idp.logging.auditLocalErrors=false
-
 # Message freshness and replay cache tuning
 #idp.policy.messageLifetime = PT3M
 #idp.policy.clockSkew = PT3M
@@ -133,6 +130,9 @@
 # May differ to direct SAML 2 artifact lookups to specific server nodes
 #idp.artifact.endpointIndex = 1
 
+#Set true to generate audit log entries for errors trapped locally
+#idp.logging.auditLocalErrors=false
+
 # Name of access control policy for various admin flows
 idp.status.accessPolicy = AccessByIPAddress
 idp.resolvertest.accessPolicy = AccessByIPAddress

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java?rev=6870&r1=6869&r2=6870&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java Mon Nov 10 12:42:19 2014
@@ -385,6 +385,9 @@
      * bean.
      */
     @BeforeMethod(dependsOnMethods = {"initializeFlowExecutor"}) public void overrideIPBasedAuthn() {
+        
+        System.setProperty("idp.authn.flows", "IPAddress|Password");
+        
         final Flow flow = getFlow(IP_ADDRESS_AUTHN_FLOW_ID);
 
         final Map map = flow.getApplicationContext().getBean(IP_ADDRESS_AUTHN_MAP_BEAN_NAME, Map.class);