[java-idp-oidc] branch main updated: Wire up proxied requester metadata and adjust unit test.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-idp-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=d25abd73602fc1093d6694d6612368d126b4ef83

The following commit(s) were added to refs/heads/main by this push:
     new d25abd73 Wire up proxied requester metadata and adjust unit test.
d25abd73 is described below

commit d25abd73602fc1093d6694d6612368d126b4ef83
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 16 10:49:44 2022 -0500

    Wire up proxied requester metadata and adjust unit test.
---
 .../shibboleth/idp/flows/oidc/token/token-beans.xml   | 17 +++++++++--------
 .../src/test/resources/conf/attribute-filter.xml      | 19 +++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
index ffeafeab..96f6559d 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
@@ -289,7 +289,12 @@
         c:filterService-ref="shibboleth.AttributeFilterService"
         p:maskFailures="%{idp.service.attribute.filter.maskFailures:true}"
         p:issuerLookupStrategy-ref="AudienceIssuerLookupFunction"
-        p:proxiedRequesterContextLookupStrategy-ref="AudienceProxiedRequesterLookupFunction" />
+        p:proxiedRequesterContextLookupStrategy-ref="AudienceProxiedRequesterLookupFunction"
+        p:proxiedRequesterMetadataContextLookupStrategy-ref="LookupOutboundSAMLEntityContext" />
+
+    <bean id="AudienceIssuerLookupFunction"
+        class="net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction"
+        p:relyingPartyContextLookupStrategy-ref="AudienceRelyingPartyCreationStrategy" />
 
     <bean id="AudienceProxiedRequesterLookupFunction" parent="shibboleth.Functions.Compose">
         <constructor-arg name="g">
@@ -301,13 +306,9 @@
         </constructor-arg>
     </bean>
 
-    <bean id="AudienceIssuerLookupFunction"
-        class="net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction"
-        p:relyingPartyContextLookupStrategy-ref="AudienceRelyingPartyCreationStrategy" />
-
-    <bean id="AudienceIDLookupFunction"
-        class="net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction"
-        p:relyingPartyContextLookupStrategy-ref="AudienceRelyingPartyCreationStrategy" />
+    <bean id="LookupOutboundSAMLEntityContext" parent="shibboleth.Functions.Compose"
+        c:g-ref="shibboleth.ChildLookup.SAMLMetadataContext"
+        c:f-ref="LookupOutboundPeerEntityContext"/>
 
     <!-- Back to token prep. -->
     
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml b/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml
index 7b3ed91d..840261ae 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml
@@ -43,10 +43,16 @@
     Same as above but more efficient form for an attribute with multiple values.
     -->
     <AttributeFilterPolicy id="Per-Attribute-Affiliation">
-        <PolicyRequirementRule xsi:type="EntityAttributeExactMatch"
-            attributeName="http://shibboleth.net/ns/attributes/releaseAllValues"
-            attributeNameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-            attributeValue="eduPersonScopedAffiliation" />
+        <PolicyRequirementRule xsi:type="OR">
+            <Rule xsi:type="EntityAttributeExactMatch"
+                attributeName="http://shibboleth.net/ns/attributes/releaseAllValues"
+                attributeNameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                attributeValue="eduPersonScopedAffiliation" />
+            <Rule xsi:type="ProxiedRequesterEntityAttributeExactMatch"
+                attributeName="http://shibboleth.net/ns/attributes/releaseAllValues"
+                attributeNameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                attributeValue="eduPersonScopedAffiliation" />
+        </PolicyRequirementRule>
      
         <AttributeRule attributeID="eduPersonScopedAffiliation" permitAny="true" />
     </AttributeFilterPolicy>
@@ -95,10 +101,7 @@
                     <Rule xsi:type="Requester" value="mockClientId" />
                     <Rule xsi:type="Requester" value="mockSamlClientId" />
                 </Rule>
-                <Rule xsi:type="OR">
-                    <Rule xsi:type="ProxiedRequester" value="https://rp.example.org" />
-                    <Rule xsi:type="ProxiedRequester" value="https://resource.example.org" />
-                </Rule>
+                <Rule xsi:type="ProxiedRequester" value="https://rp.example.org" />
             </Rule>
             <Rule xsi:type="Requester" value="https://another.example.org/shibboleth" />
         </PolicyRequirementRule>

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