[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/attribute-resolver-ldap.xml conf/authn/ld...

[noreply at shibboleth.net]

Author: dfisher
Date: Thu Mar 19 09:50:11 2015
New Revision: 7433

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7433&view=rev
Log:
Revert IDP-653.
Must wait for 3.2.0.

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml?rev=7433&r1=7432&r2=7433&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml Thu Mar 19 09:50:11 2015
@@ -88,7 +88,6 @@
                 %{idp.attribute.resolver.LDAP.searchFilter}
             ]]>
         </dc:FilterTemplate>
-        <dc:ReturnAttributes>%{idp.attribute.resolver.LDAP.returnAttributes}</dc:ReturnAttributes>
         <dc:StartTLSTrustCredential id="LDAPtoIdPCredential" xsi:type="sec:X509ResourceBacked">
             <sec:Certificate>%{idp.attribute.resolver.LDAP.trustCertificates}</sec:Certificate>
         </dc:StartTLSTrustCredential>

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml?rev=7433&r1=7432&r2=7433&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml Thu Mar 19 09:50:11 2015
@@ -11,9 +11,8 @@
        default-lazy-init="true">
 
     <alias name="%{idp.authn.LDAP.authenticator:anonSearchAuthenticator}" alias="shibboleth.authn.LDAP.authenticator" />
-    <bean id="shibboleth.authn.LDAP.returnAttributes" parent="shibboleth.DelimStringArray">
+    <bean id="shibboleth.authn.LDAP.returnAttributes" parent="shibboleth.CommaDelimStringArray">
         <constructor-arg type="java.lang.String" value="%{idp.authn.LDAP.returnAttributes}" />
-        <constructor-arg type="java.lang.String" value=", " />
     </bean>
 
     <alias name="ValidateUsernamePasswordAgainstLDAP" alias="ValidateUsernamePassword" />

Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=7433&r1=7432&r2=7433&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties Thu Mar 19 09:50:11 2015
@@ -17,8 +17,9 @@
 idp.authn.LDAP.trustStore                       = %{idp.home}/credentials/ldap-server.truststore
 
 ## Return attributes during authentication
-## NOTE: there is a separate property used for attribute resolution
-idp.authn.LDAP.returnAttributes                 = passwordExpirationTime loginGraceRemaining
+## NOTE: this is not used during attribute resolution; configure that directly in the
+## attribute-resolver.xml configuration via a DataConnector's <dc:ReturnAttributes> element
+idp.authn.LDAP.returnAttributes                 = cn,businessCategory,mail
 
 ## DN resolution properties ##
 
@@ -44,7 +45,6 @@
 idp.attribute.resolver.LDAP.useStartTLS         = %{idp.authn.LDAP.useStartTLS:true}
 idp.attribute.resolver.LDAP.trustCertificates   = %{idp.authn.LDAP.trustCertificates}
 idp.attribute.resolver.LDAP.searchFilter        = (uid=$requestContext.principalName)
-idp.attribute.resolver.LDAP.returnAttributes    = cn homephone mail
 
 # LDAP pool configuration, used for both authn and DN resolution
 #idp.pool.LDAP.minSize                          = 3

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=7433&r1=7432&r2=7433&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Thu Mar 19 09:50:11 2015
@@ -14,11 +14,9 @@
 
     <bean id="shibboleth.Pair" class="net.shibboleth.utilities.java.support.collection.Pair" abstract="true" />
     
-    <bean id="shibboleth.DelimStringArray"
-        class="org.springframework.util.StringUtils" factory-method="tokenizeToStringArray" abstract="true" />
     <bean id="shibboleth.CommaDelimStringArray"
         class="org.springframework.util.StringUtils" factory-method="commaDelimitedListToStringArray" abstract="true" />
-              
+    
     <bean id="shibboleth.Conditions.AND"

[... 3 lines stripped ...]