[java-idp-testbed COMMIT] in /trunk/src/main/resources: conf/remoteuser-authn-config.xml flows/authn/remoteuser-authn...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct 18 17:35:22 2013
New Revision: 19

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=19&view=rev
Log:
Extract config for RemoteUser flow.

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

Modified: trunk/src/main/resources/flows/authn/remoteuser-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/flows/authn/remoteuser-authn-beans.xml?rev=19&r1=18&r2=19&view=diff
==============================================================================
--- trunk/src/main/resources/flows/authn/remoteuser-authn-beans.xml (original)
+++ trunk/src/main/resources/flows/authn/remoteuser-authn-beans.xml Fri Oct 18 17:35:22 2013
@@ -12,26 +12,21 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <context:property-placeholder location="classpath:conf/idp.properties" />
+    
+    <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>