[java-identity-provider] 05/07: IDP-1184 Test for (existing) warning for duplicate elements in flattened schema
Rod Widdowson
rdw at steadingsoftware.com
Fri Jul 14 09:10:25 EDT 2017
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=93ed7082ad2498d386e8df1ba787fab33fc57e47
commit 93ed7082ad2498d386e8df1ba787fab33fc57e47
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jul 14 13:07:31 2017 +0100
IDP-1184 Test for (existing) warning for duplicate elements in flattened schema
https://issues.shibboleth.net/jira/browse/IDP-1184
---
.../dc/ldap/LDAPDataConnectorParserTest.java | 9 +++++
...v2.xml => ldap-attribute-resolver-v2-multi.xml} | 42 ++++++++++++----------
.../ldap/resolver/ldap-attribute-resolver-v2.xml | 32 +++++++++++++++++
3 files changed, 64 insertions(+), 19 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
index 2fb247d..dded785 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
@@ -165,6 +165,15 @@ public class LDAPDataConnectorParserTest {
Assert.assertNotNull(attrs);
Assert.assertNotNull(attrs.get("entryDN"));
}
+
+ @Test public void v2ResolverOtherDups() throws Exception {
+ final LDAPDataConnector dataConnector =
+ getLdapDataConnector(new String[] {"net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-multi.xml",
+ "net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml"});
+ Assert.assertNotNull(dataConnector);
+ doTest(dataConnector);
+ }
+
@Test public void v2MinimalConfig() throws Exception {
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-multi.xml
similarity index 55%
copy from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
copy to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-multi.xml
index 9662fd6..e374061 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-multi.xml
@@ -9,22 +9,17 @@
principal="cn=Directory Manager"
principalCredential="password"
useStartTLS="true"
+ executableSearchBuilderRef="filter" mappingStrategyRef="mappings" validatorRef="validator" noRetryDelay="PT5M"
searchTimeLimit="PT7S"
noResultIsError="true"
multipleResultsIsError="true"
- noRetryDelay="PT5M"
- trustFile="net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap.crt"
connectTimeout="PT2S"
responseTimeout="PT4S">
- <FailoverDataConnector ref="2123"/>
-
<ResultCache elementTimeToLive="PT10S" maximumCachedElements="25"/>
<Column columnName="homephone" attributeID="phonenumber" />
- <Dependency ref="321"/>
-
<ConnectionPool
minPoolSize="5"
maxPoolSize="10"
@@ -37,28 +32,37 @@
failFastInitialize="false" />
- <StartTLSAuthenticationCredential xsi:type="sec:X509ResourceBacked" id="IdPtoLDAPCredential">
+ <StartTLSTrustCredential xsi:type="security:X509Inline" xmlns:security="urn:mace:shibboleth:2.0:security"
+ id="LDAPtoIdPCredential">
+ <security:Certificate>
+ MIICATCCAWoCCQCZy4ovDlQTvDANBgkqhkiG9w0BAQUFADBFMRMwEQYKCZImiZPy
+ LGQBGRYDbmV0MRowGAYKCZImiZPyLGQBGRYKc2hpYmJvbGV0aDESMBAGA1UEAxMJ
+ bG9jYWxob3N0MB4XDTEzMDkyMDA0NDE1OFoXDTIzMDkxODA0NDE1OFowRTETMBEG
+ CgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkWCnNoaWJib2xldGgxEjAQ
+ BgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA+Pj+
+ Rk0FosrK8tdNJLASSbfRFEJDf0498bnwtor76PONwkTLjnm7paTMAy7oGIAccuBf
+ n7183mlo/yh22x+7Fdux4ESvdp1FWl7nGlBBWUrLZzXwwGybC0qv3/Cmvfkvm6zh
+ zgY7YyQYlA/RCjTk/pUfrXaIIaKwd+B2miBDrDUCAwEAATANBgkqhkiG9w0BAQUF
+ AAOBgQCKQsndxYjsGIvK3lnlztIuKQmRlj7IHL/T6abBYwmQcyMa5o3hv6/Rx+Ze
+ NSRfyhakPY4v5yUBi1fyIVIGcAbnak+GQIfsO8uDhzZt6DwshzHrnCbHTLQx6NTB
+ 4mvLjAdt7riBIl5y5n3tbtrZdpTgFhQxjLWTBpWIO0XKxqtBhw==
+ </security:Certificate>
+ </StartTLSTrustCredential>
+
+ <StartTLSTrustCredential xsi:type="sec:X509ResourceBacked" id="IdPtoLDAPCredential">
<sec:PrivateKey>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.key</sec:PrivateKey>
<sec:Certificate>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.crt</sec:Certificate>
- </StartTLSAuthenticationCredential>
+ </StartTLSTrustCredential>
- <Dependency ref="321"/>
<LDAPProperty name="name2" value="value2"/>
- <ReturnAttributes>a b g t</ReturnAttributes>
-
<LDAPProperty name="name1" value="value1"/>
- <ReturnAttributes>a b g t</ReturnAttributes>
-
- <FilterTemplate>
- <![CDATA[
- (uid=${resolutionContext.principal})
- ]]>
- </FilterTemplate>
+ <ResultCacheBean>cache</ResultCacheBean>
+ <ResultCacheBean>cache</ResultCacheBean>
- <ResultCache maximumCachedElements="20"/>
+
</DataConnector>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
index 9662fd6..19746a5 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
@@ -42,6 +42,21 @@
<sec:Certificate>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.crt</sec:Certificate>
</StartTLSAuthenticationCredential>
+ <StartTLSAuthenticationCredential xsi:type="sec:X509ResourceBacked" id="IdPtoLDAPCredential">
+ <sec:PrivateKey>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.key</sec:PrivateKey>
+ <sec:Certificate>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.crt</sec:Certificate>
+ </StartTLSAuthenticationCredential>
+
+ <StartTLSTrustCredential xsi:type="sec:X509ResourceBacked" id="IdPtoLDAPCredential">
+ <sec:PrivateKey>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.key</sec:PrivateKey>
+ <sec:Certificate>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.crt</sec:Certificate>
+ </StartTLSTrustCredential>
+
+ <StartTLSTrustCredential xsi:type="sec:X509ResourceBacked" id="IdPtoLDAPCredential">
+ <sec:PrivateKey>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.key</sec:PrivateKey>
+ <sec:Certificate>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.crt</sec:Certificate>
+ </StartTLSTrustCredential>
+
<Dependency ref="321"/>
<LDAPProperty name="name2" value="value2"/>
@@ -60,6 +75,23 @@
<ResultCache maximumCachedElements="20"/>
+ <FilterTemplate>
+ <![CDATA[
+ (uid=${resolutionContext.principal})
+ ]]>
+ </FilterTemplate>
+
+ <ConnectionPool
+ minPoolSize="5"
+ maxPoolSize="10"
+ blockWaitTime="PT5S"
+ expirationTime="PT10M"
+ validatePeriodically="true"
+ validateTimerPeriod="PT15M"
+ validateDN="dc=shibboleth,dc=net"
+ validateFilter="(ou=people)"
+ failFastInitialize="false" />
+
</DataConnector>
</AttributeResolver>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list