[java-idp-testbed COMMIT] in /trunk/src/main/config: conf/authn-flow-descriptors.xml conf/idp.properties conf/ldap-au...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 10 14:18:15 2013
New Revision: 75

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=75&view=rev
Log:
Changes to LDAP flow/config for consistency.

Modified:
    trunk/src/main/config/conf/authn-flow-descriptors.xml
    trunk/src/main/config/conf/idp.properties
    trunk/src/main/config/conf/ldap-authn-config.xml
    trunk/src/main/config/system/flows/authn/ldap-authn-beans.xml
    trunk/src/main/config/system/flows/authn/ldap-authn-flow.xml

Modified: trunk/src/main/config/conf/authn-flow-descriptors.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/authn-flow-descriptors.xml?rev=75&r1=74&r2=75&view=diff
==============================================================================
--- trunk/src/main/config/conf/authn-flow-descriptors.xml (original)
+++ trunk/src/main/config/conf/authn-flow-descriptors.xml Tue Dec 10 14:18:15 2013
@@ -65,7 +65,7 @@
 
         <bean c:id="AuthenticationFlow/LDAP" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
                 p:resultSerializer-ref="shibboleth.DefaultAuthenticationResultSerializer"
-                p:passiveAuthenticationSupported="false"
+                p:passiveAuthenticationSupported="true"
                 p:forcedAuthenticationSupported="true"
                 p:lifetime="${idp.authn.defaultLifetime}" p:inactivityTimeout="${idp.authn.defaultTimeout}">
             <property name="supportedPrincipals">

Modified: trunk/src/main/config/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/idp.properties?rev=75&r1=74&r2=75&view=diff
==============================================================================
--- trunk/src/main/config/conf/idp.properties (original)
+++ trunk/src/main/config/conf/idp.properties Tue Dec 10 14:18:15 2013
@@ -50,8 +50,8 @@
 idp.session.activeResultExtraction = net.shibboleth.idp.session.impl.ExtractActiveAuthenticationResults
 
 # Regular expression expressing flows to enable 
-idp.authn.flows = IPAddress|JAAS
-#idp.authn.flows = IPAddress|LDAP
+#idp.authn.flows = IPAddress|JAAS
+idp.authn.flows = IPAddress|LDAP
 
 # Default lifetime and timeout of various authentication methods
 idp.authn.defaultLifetime = PT60M
@@ -60,13 +60,6 @@
 # Whether to prioritize "active" results when an SP requests more than
 # one possible matching login method (V2 behavior was to favor them)
 idp.authn.favorSSO = false
-
-# LDAP authentication configuration
-# uses the in-memory directory by default, see src/test/config/ldap.ldif
-idp.authn.ldap.ldapUrl = ldap://localhost:10389
-idp.authn.ldap.baseDn = ou=people,dc=shibboleth,dc=net
-idp.authn.ldap.subtreeSearch = false
-idp.authn.ldap.userFilter = (uid={user})
 
 # Reload "failfast" (stop the IdP if a configuration is bad)
 # and reload check interval (0 == never reload). Specified in milliseconds

Modified: trunk/src/main/config/conf/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/ldap-authn-config.xml?rev=75&r1=74&r2=75&view=diff
==============================================================================
--- trunk/src/main/config/conf/ldap-authn-config.xml (original)
+++ trunk/src/main/config/conf/ldap-authn-config.xml Tue Dec 10 14:18:15 2013
@@ -36,5 +36,21 @@
         <bean class="net.shibboleth.utilities.java.support.collection.Pair" p:first="^(.+)@example\.edu$" p:second="$1" />
         -->
     </util:list>
+    
+    <!-- LDAP configuration (uses the in-memory directory by default, see src/test/config/ldap.ldif). -->
+    
+    <bean id="shibboleth.authn.LDAP.ldapUrl" class="java.lang.String" c:_0="ldap://localhost:10389" />
+    <bean id="shibboleth.authn.LDAP.baseDn" class="java.lang.String" c:_0="ou=people,dc=shibboleth,dc=net" />
+    <bean id="shibboleth.authn.LDAP.userFilter" class="java.lang.String" c:_0="(uid={user})" />
 
+    <bean id="shibboleth.authn.LDAP.subtreeSearch" class="java.lang.Boolean">
+        <constructor-arg type="boolean" value="false" />
+    </bean>
+
+    <util:list id="shibboleth.authn.LDAP.returnAttributes">
+        <value>cn</value>
+        <value>businessCategory</value>
+        <value>mail</value>
+    </util:list>
+    
 </beans>

Modified: trunk/src/main/config/system/flows/authn/ldap-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/system/flows/authn/ldap-authn-beans.xml?rev=75&r1=74&r2=75&view=diff
==============================================================================
--- trunk/src/main/config/system/flows/authn/ldap-authn-beans.xml (original)
+++ trunk/src/main/config/system/flows/authn/ldap-authn-beans.xml Tue Dec 10 14:18:15 2013
@@ -15,6 +15,13 @@
     <import resource="../../../conf/ldap-authn-config.xml" />
 
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
+
+    <bean id="ExtractUsernamePasswordFromBasicAuth" class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromBasicAuth" scope="prototype"
+        p:httpServletRequest-ref="shibboleth.HttpServletRequest"

[... 104 lines stripped ...]