[java-identity-provider] branch feature/IDP-1434 updated: Extend test to verify resolver is lazily parsed.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch feature/IDP-1434
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=741c6cc8a96e9261cf83921bb7dcef88c3d5b354

The following commit(s) were added to refs/heads/feature/IDP-1434 by this push:
       new  741c6cc   Extend test to verify resolver is lazily parsed.
741c6cc is described below

commit 741c6cc8a96e9261cf83921bb7dcef88c3d5b354
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu May 9 15:52:12 2019 -0400

    Extend test to verify resolver is lazily parsed.
---
 .../resolver/spring/mapperTest-attributes.xml      | 42 +++++++++++-----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml
index 76b690b..6dacf39 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml
@@ -2,47 +2,45 @@
 <AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                             xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
 
-    <!-- ========================================== -->
-    <!--      Attribute Definitions                 -->
-    <!-- ========================================== -->
-
-    <DataConnector id="staticAttributes" xsi:type="Static">
-        <Attribute id="assurance">
-            <Value>tin</Value>
-            <Value>pewter</Value>
-        </Attribute>
-        <Attribute id="oAssurance">
-            <Value>bakelite</Value>
-            <Value>dross</Value>
-        </Attribute>
-        <Attribute id="eduPersonEntitlement">
-            <Value>urn:example.org:entitlement:entitlement1</Value>
-            <Value>urn:mace:dir:entitlement:common-lib-terms</Value>
-        </Attribute>
+    <!--
+    Unusable connector to ensure it's being lazily eval'd.
+    -->
+    <DataConnector id="myLDAP" xsi:type="LDAPDirectory"
+        ldapURL="ldaps://localhost:6666" 
+        baseDN="dc=shibboleth,dc=net"
+        connectTimeout="PT2S"
+        responseTimeout="PT2S"
+        principal="cn=Directory Manager"
+        principalCredential="password">
+        <FilterTemplate>
+            <![CDATA[
+                (uid=$resolutionContext.principal)
+            ]]>
+        </FilterTemplate>
     </DataConnector>
 
     <AttributeDefinition xsi:type="Simple" id="eduPersonAssurance">
-        <InputDataConnector allAttributes="true" ref="staticAttributes" />
+        <InputDataConnector allAttributes="true" ref="myLDAP" />
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
         <AttributeEncoder xsi:type="SAML2String" nameFormat="http://example.org/Format" name="http://example.org/name/for/Attribute" friendlyName="fotherSAMLName" />
     </AttributeDefinition>
 
     <AttributeDefinition xsi:type="Simple" id="otherPersonAssurance" >
-        <InputDataConnector allAttributes="true"  ref="staticAttributes" />
+        <InputDataConnector allAttributes="true"  ref="myLDAP" />
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
     </AttributeDefinition>
         
     <AttributeDefinition xsi:type="Simple" id="otherFormatPersonAssurance" >
-        <InputDataConnector allAttributes="true"  ref="staticAttributes" />
+        <InputDataConnector allAttributes="true"  ref="myLDAP" />
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" nameFormat="http://example.org/Format" friendlyName="fOeduPersonAssurance" />
     </AttributeDefinition>
 
     <AttributeDefinition xsi:type="Scoped" id="eduPersonScopedAffiliation" scope="example.org" 
                                   >
-        <InputDataConnector allAttributes="true"  ref="staticAttributes" />
+        <InputDataConnector allAttributes="true"  ref="myLDAP" />
         <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
         <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="feduPersonScopedAffiliation" 
                scopeDelimiter='#'/>
@@ -50,7 +48,7 @@
     
     <AttributeDefinition xsi:type="SAML2NameID" id="eduPersonTID" 
                                   nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" >
-        <InputDataConnector allAttributes="true"  ref="staticAttributes" />
+        <InputDataConnector allAttributes="true"  ref="myLDAP" />
         <AttributeEncoder xsi:type="SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
         <AttributeEncoder xsi:type="SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="feduPersonTargetedID" />
     </AttributeDefinition>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.