[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/ipaddress-authn-config.xml conf/remoteuse...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct 18 17:37:32 2013
New Revision: 4879

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4879&view=rev
Log:
Sync with testbed

Added:
    trunk/idp-conf/src/main/resources/conf/remoteuser-authn-config.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml
    trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml?rev=4879&r1=4878&r2=4879&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml Fri Oct 18 17:37:32 2013
@@ -14,7 +14,7 @@
     Do not change the name of the bean.
     -->
 
-    <util:map id="shibboleth.Authn.IPAddress.Mappings">
+    <util:map id="shibboleth.authn.IPAddress.Mappings">
         <entry key="jdoe">
             <list>
                 <value>127.0.0.1/32</value>

Modified: trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-beans.xml?rev=4879&r1=4878&r2=4879&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-beans.xml Fri Oct 18 17:37:32 2013
@@ -20,6 +20,6 @@
         p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
         
     <bean id="ValidateUserAgentAddress" class="net.shibboleth.idp.authn.impl.ValidateUserAgentAddress" scope="prototype"
-        p:mappings-ref="shibboleth.Authn.IPAddress.Mappings" />
+        p:mappings-ref="shibboleth.authn.IPAddress.Mappings" />
 
 </beans>

Modified: trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-beans.xml?rev=4879&r1=4878&r2=4879&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-beans.xml Fri Oct 18 17:37:32 2013
@@ -11,27 +11,20 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
+    
+    <import resource="../../conf/remoteuser-authn-config.xml" />
 
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     
     <bean id="ExtractRemoteUser" class="net.shibboleth.idp.authn.impl.ExtractRemoteUser" scope="prototype"
-            p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:checkRemoteUser="true">
+            p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+            p:checkRemoteUser-ref="shibboleth.authn.RemoteUser.checkRemoteUser"
+            p:checkHeaders-ref="shibboleth.authn.RemoteUser.checkHeaders"
+            p:checkAttributes-ref="shibboleth.authn.RemoteUser.checkAttributes" />
         
-        <!-- Also supports extraction from a header or server attribute. -->
-        <!--
-        <property name="checkHeaders">
-            <list>
-                <value>HeaderToCheck</value>
-            </list>
-        </property>
-        <property name="checkAttributes">
-            <list>
-                <value>AttributeToCheck</value>
-            </list>
-        </property>
-        -->
-    </bean>
-        
-    <bean id="ValidateRemoteUser" class="net.shibboleth.idp.authn.impl.ValidateRemoteUser" scope="prototype"/>
+    <bean id="ValidateRemoteUser" class="net.shibboleth.idp.authn.impl.ValidateRemoteUser" scope="prototype"
+        p:matchExpression="#{getObject('shibboleth.authn.RemoteUser.matchExpression')}"
+        p:whitelistedUsernames-ref="shibboleth.authn.RemoteUser.whitelistedUsernames"
+        p:blacklistedUsernames-ref="shibboleth.authn.RemoteUser.blacklistedUsernames" />
 
 </beans>