[java-idp-testbed COMMIT] in /trunk/src/main/resources: conf/idp.properties flows/authn/ipaddress-authn-beans.xml

[noreply at shibboleth.net]

Author: scantor
Date: Thu Oct 17 11:30:09 2013
New Revision: 14

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=14&view=rev
Log:
Improve address-based login config.

Modified:
    trunk/src/main/resources/conf/idp.properties
    trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml

Modified: trunk/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/idp.properties?rev=14&r1=13&r2=14&view=diff
==============================================================================
--- trunk/src/main/resources/conf/idp.properties (original)
+++ trunk/src/main/resources/conf/idp.properties Thu Oct 17 11:30:09 2013
@@ -29,7 +29,7 @@
 idp.session.secondaryServiceIndex = false
 
 # Regular expression expressing flows to enable 
-idp.authn.flows = JAASForm
+idp.authn.flows = IPAddress
 
 # Default lifetime and timeout of various authentication methods
 idp.authn.defaultLifetime = PT60M

Modified: trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml?rev=14&r1=13&r2=14&view=diff
==============================================================================
--- trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml (original)
+++ trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml Thu Oct 17 11:30:09 2013
@@ -17,19 +17,17 @@
     <bean id="ExtractUserAgentAddress" class="net.shibboleth.idp.authn.impl.ExtractUserAgentAddress" scope="prototype"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
         
-    <bean id="ValidateUserAgentAddress" class="net.shibboleth.idp.authn.impl.ValidateUserAgentAddress" scope="prototype"
-            p:principalName="jdoe">
-        <property name="designatedRanges">
-            <list>
-                <value>127.0.0.1/32</value>
-            </list>
+    <bean id="ValidateUserAgentAddress" class="net.shibboleth.idp.authn.impl.ValidateUserAgentAddress" scope="prototype">
+        <property name="mappings">
+            <map>
+                <entry key="jdoe">
+                    <list>
+                        <value>127.0.0.1/32</value>
+                        <value>::1/128</value>
+                    </list>
+                </entry>
+            </map>
         </property>
     </bean>
 
-    <!--
-    You can add additional ValidateUserAgentAddress bean definitions if you want to map
-    different ranges to different users. Just give the bean(s) different ids and wire them
-    in sequence into the ipaddress-authn-flow.xml file.
-    -->
-
 </beans>