[java-identity-provider COMMIT] in /trunk/idp-authn-impl/src/main/resources/flows: authn-flow-descriptors.xml ipaddre...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Aug 28 13:21:00 2013
New Revision: 4733

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4733&view=rev
Log:
Added remoteuser flow and additional comments.

Added:
    trunk/idp-authn-impl/src/main/resources/flows/remoteuser-authn-beans.xml   (with props)
    trunk/idp-authn-impl/src/main/resources/flows/remoteuser-authn-flow.xml   (with props)
Modified:
    trunk/idp-authn-impl/src/main/resources/flows/authn-flow-descriptors.xml
    trunk/idp-authn-impl/src/main/resources/flows/ipaddress-authn-beans.xml
    trunk/idp-authn-impl/src/main/resources/flows/ipaddress-authn-flow.xml
    trunk/idp-authn-impl/src/main/resources/flows/subject-c14n-beans.xml

Modified: trunk/idp-authn-impl/src/main/resources/flows/authn-flow-descriptors.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/resources/flows/authn-flow-descriptors.xml?rev=4733&r1=4732&r2=4733&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/resources/flows/authn-flow-descriptors.xml (original)
+++ trunk/idp-authn-impl/src/main/resources/flows/authn-flow-descriptors.xml Wed Aug 28 13:21:00 2013
@@ -18,21 +18,17 @@
 
     <util:list id="AvailableAuthenticationFlows">
         <!--
-        <value>
-            <bean c:id="AuthenticationFlow/IPAddress" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
-                    p:passiveAuthenticationSupported="true"
-                    p:forcedAuthenticationSupported="false"
-                    p:lifetime="60000" p:inactivityTimeout="0">
-                <prop name="supportedPrincipals">
-                    <list>
-                        <value>
-                            <bean class="net.shibboleth.idp.saml.authn.AuthnContextClassRefPrincipal"
-                                c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocol" />
-                        </value>
-                    </list>
-                </prop>
-            </bean>
-        </value>
+        <bean c:id="AuthenticationFlow/IPAddress" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
+                p:passiveAuthenticationSupported="true"
+                p:forcedAuthenticationSupported="false"
+                p:lifetime="PT60S" p:inactivityTimeout="0">
+            <property name="supportedPrincipals">
+                <list>
+                    <bean class="net.shibboleth.idp.saml.authn.AuthnContextClassRefPrincipal"
+                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocol" />
+                </list>
+            </property>
+        </bean>
         -->
     </util:list>
 

Modified: trunk/idp-authn-impl/src/main/resources/flows/ipaddress-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/resources/flows/ipaddress-authn-beans.xml?rev=4733&r1=4732&r2=4733&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/resources/flows/ipaddress-authn-beans.xml (original)
+++ trunk/idp-authn-impl/src/main/resources/flows/ipaddress-authn-beans.xml Wed Aug 28 13:21:00 2013
@@ -14,20 +14,18 @@
     <bean id="ExtractUserAgentAddress" class="net.shibboleth.idp.authn.impl.ExtractUserAgentAddress" scope="prototype" />
         
     <bean id="ValidateUserAgentAddress" class="net.shibboleth.idp.authn.impl.ValidateUserAgentAddress" scope="prototype"
-        p:principalName="jdoe" p:designatedRanges-ref="AddressRangesToValidate" />
-
-    <!-- Address range(s) to allow are specified in the list below. -->
-    
-    <util:list id="AddressRangesToValidate">
-        <value>
-            <bean class="net.shibboleth.utilities.java.support.net.IPRange" factory-method="parseCIDRBlock" c:cidrBlock="127.0.0.1/32" />
-        </value>
-    </util:list>
+            p:principalName="jdoe">
+        <property name="designatedRanges">
+            <list>
+                <bean class="net.shibboleth.utilities.java.support.net.IPRange" factory-method="parseCIDRBlock" c:cidrBlock="127.0.0.1/32" />
+            </list>
+        </property>
+    </bean>
 
     <!--
-    You can add additional range lists and 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.
+    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>

Modified: trunk/idp-authn-impl/src/main/resources/flows/ipaddress-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/resources/flows/ipaddress-authn-flow.xml?rev=4733&r1=4732&r2=4733&view=diff
==============================================================================

[... 26 lines stripped ...]