[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl: pom.xml src/main/java/net/shibboleth/idp/attri...

[noreply at shibboleth.net]

Author: dfisher
Date: Tue Oct 29 23:04:15 2013
New Revision: 4906

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4906&view=rev
Log:
Update TemplatedExecutableSearchFilterBuilder to use an EventCartridge for LDAP filter escaping.
Add unit tests for escaping.
See IDP-325.

Modified:
    trunk/idp-attribute-resolver-impl/pom.xml
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/AbstractExecutableSearchFilterBuilder.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ExecutableSearchFilter.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/LdapDataConnectorTest.java

Modified: trunk/idp-attribute-resolver-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/pom.xml?rev=4906&r1=4905&r2=4906&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/pom.xml (original)
+++ trunk/idp-attribute-resolver-impl/pom.xml Tue Oct 29 23:04:15 2013
@@ -52,6 +52,11 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+            <version>2.0.8</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/AbstractExecutableSearchFilterBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/AbstractExecutableSearchFilterBuilder.java?rev=4906&r1=4905&r2=4906&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/AbstractExecutableSearchFilterBuilder.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/AbstractExecutableSearchFilterBuilder.java Tue Oct 29 23:04:15 2013
@@ -62,6 +62,11 @@
             }
 
             /** {@inheritDoc} */
+            @Nonnull public SearchFilter getSearchFilter() {
+                return searchFilter;
+            }
+
+            /** {@inheritDoc} */
             public String toString() {
                 return searchFilter.toString();
             }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ExecutableSearchFilter.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ExecutableSearchFilter.java?rev=4906&r1=4905&r2=4906&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ExecutableSearchFilter.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ExecutableSearchFilter.java Tue Oct 29 23:04:15 2013
@@ -22,6 +22,7 @@
 import org.ldaptive.ConnectionFactory;
 import org.ldaptive.LdapException;
 import org.ldaptive.SearchExecutor;
+import org.ldaptive.SearchFilter;
 import org.ldaptive.SearchResult;
 
 import net.shibboleth.idp.attribute.resolver.impl.dc.ExecutableSearch;
@@ -39,6 +40,13 @@
      * 
      * @throws LdapException thrown if there is an error performing the search
      */
-    @Nonnull public SearchResult execute(@Nonnull SearchExecutor executor, @Nonnull ConnectionFactory factory)
+    @Nonnull SearchResult execute(@Nonnull SearchExecutor executor, @Nonnull ConnectionFactory factory)
             throws LdapException;
+
+    /**
+     * Returns the search filter associated with this executable search filter.
+     *
+     * @return  search filter
+     */
+    @Nonnull SearchFilter getSearchFilter();
 }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java?rev=4906&r1=4905&r2=4906&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java (original)

[... 95 lines stripped ...]