[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: dfisher
Date: Wed Apr 22 23:28:45 2015
New Revision: 7485

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7485&view=rev
Log:
IDP-653
Update LDAPDataConnectorParser to also split return attributes on comma.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java?rev=7485&r1=7484&r2=7485&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java	Wed Apr 22 23:28:45 2015
@@ -618,14 +618,14 @@
         }
 
         /**
-         * Converts the supplied value to a list of strings delimited by {@link XMLConstants#LIST_DELIMITERS}.
+         * Converts the supplied value to a list of strings delimited by {@link XMLConstants#LIST_DELIMITERS} and comma.
          *
          * @param value to convert to a list
          *
          * @return list of strings
          */
         @Nonnull public static List<String> buildStringList(final String value) {
-            return StringSupport.stringToList(value, XMLConstants.LIST_DELIMITERS);
+            return StringSupport.stringToList(value, XMLConstants.LIST_DELIMITERS + ",");
         }
 
         /**

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml?rev=7485&r1=7484&r2=7485&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml	(original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml	Wed Apr 22 23:28:45 2015
@@ -62,7 +62,7 @@
             </bean>
         </property>
     </bean>
-    <bean class="org.ldaptive.SearchExecutor" p:baseDn="ou=people,dc=shibboleth,dc=net">
+    <bean class="org.ldaptive.SearchExecutor" p:baseDn="ou=people,dc=shibboleth,dc=net" p:returnAttributes="uid,homephone,mail">
         <property name="searchFilter">
             <bean class="org.ldaptive.SearchFilter" p:filter="(uid=${recipientContext.principal})" />
         </property>

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties?rev=7485&r1=7484&r2=7485&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties	(original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties	Wed Apr 22 23:28:45 2015
@@ -8,7 +8,7 @@
 
 search.baseDn=ou=people,dc=shibboleth,dc=net
 search.filter=(uid=${recipientContext.principal})
-search.returnAttributes=uid homephone mail
+search.returnAttributes=uid,homephone,mail
 
 jndi.property1=value1
 jndi.property2=value2

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=7485&r1=7484&r2=7485&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	Wed Apr 22 23:28:45 2015
@@ -88,6 +88,7 @@
                 %{idp.attribute.resolver.LDAP.searchFilter}
             ]]>

[... 32 lines stripped ...]