[java-plugin-shibd-saml] branch main updated: Supplement SOAP client beans to redirect IdP code into SP config.

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-plugin-shibd-saml.

View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd-saml/commit/53970426a42544bb7b2bc73bc15585950d76ddcf

The following commit(s) were added to refs/heads/main by this push:
     new 5397042  Supplement SOAP client beans to redirect IdP code into SP config.
5397042 is described below

commit 53970426a42544bb7b2bc73bc15585950d76ddcf
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Mon Oct 26 18:29:35 2026 -0400

    Supplement SOAP client beans to redirect IdP code into SP config.
---
 .../META-INF/net.shibboleth.idp/sp-soap-client.xml | 30 ++++++++++++++++++++--
 .../sp/consumer/saml2/artifact/artifact-beans.xml  |  2 +-
 .../consumer/saml2/artifact/artifact-beans.xml     |  2 +-
 .../shibboleth/idp/flows/sp/saml2-common-beans.xml | 14 ----------
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/sp-soap-client.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/sp-soap-client.xml
index 9ed24d6..3c6899f 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/sp-soap-client.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/sp-soap-client.xml
@@ -11,7 +11,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
     
-    <!-- As a rule, any beans starting with SIAPClient. alone and not SOAPClient.sp are in the original IdP client config. -->
+    <!-- As a rule, any beans starting with SOAPClient. alone and not SOAPClient.sp are in the original IdP client config. -->
     
     <!-- Aliases used for wiring, especially by other components. In case we want to switch strategies, can do it here -->
     <alias alias="shibboleth.sp.SOAPClient.SAML" name="SOAPClient.sp.SAML.LocatorMap" />
@@ -130,5 +130,31 @@
                 p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
         </constructor-arg>
     </bean>
-        
+    
+    <-- Other beans of relevance to uses of the SOAP client. -->
+    
+    <bean id="shibboleth.sp.SelfEntityIDResolver" lazy-init="true"
+            class="net.shibboleth.profile.relyingparty.impl.CriteriaSelfEntityIDResolver">
+        <property name="relyingPartyConfigurationResolver">
+            <bean class="net.shibboleth.sp.service.impl.SupplierBackedReloadableService">
+                <constructor-arg>
+                    <bean class="net.shibboleth.sp.service.impl.ActiveApplicationSupplier"
+                        p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
+                </constructor-arg>
+            </bean>
+        </property>
+    </bean>
+    
+    <bean id="shibboleth.sp.DecryptionConfigurationResolver" 
+            class="net.shibboleth.profile.relyingparty.impl.CriteriaDecryptionConfigurationResolver">
+        <property name="relyingPartyConfigurationResolver">
+            <bean class="net.shibboleth.sp.service.impl.SupplierBackedReloadableService">
+                <constructor-arg>
+                    <bean class="net.shibboleth.sp.service.impl.ActiveApplicationSupplier"
+                        p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
+                </constructor-arg>
+            </bean>
+        </property>
+    </bean>
+    
 </beans>
\ No newline at end of file
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/artifact/artifact-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/artifact/artifact-beans.xml
index 68d30a0..a5827b4 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/artifact/artifact-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/artifact/artifact-beans.xml
@@ -25,7 +25,7 @@
                 p:peerEntityRole="#{T(org.opensaml.saml.saml2.metadata.IDPSSODescriptor).DEFAULT_ELEMENT_NAME}"
                 p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
                 p:identifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy"
-                p:selfEntityIDResolver-ref="ArtifactSupport.SelfEntityIDResolver"
+                p:selfEntityIDResolver-ref="shibboleth.sp.SelfEntityIDResolver"
                 p:artifactEndpointResolver-ref="shibboleth.EndpointResolver"
                 p:SOAPClient-ref="shibboleth.sp.SOAPClient.SAML"
                 p:SOAPPipelineName="SAML2.ArtifactDecoder"
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/artifact/artifact-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/artifact/artifact-beans.xml
index faf2689..a660cbd 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/artifact/artifact-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/logout/consumer/saml2/artifact/artifact-beans.xml
@@ -20,7 +20,7 @@
                 p:peerEntityRole="#{T(org.opensaml.saml.saml2.metadata.IDPSSODescriptor).DEFAULT_ELEMENT_NAME}"
                 p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
                 p:identifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy"
-                p:selfEntityIDResolver-ref="ArtifactSupport.SelfEntityIDResolver"
+                p:selfEntityIDResolver-ref="shibboleth.sp.SelfEntityIDResolver"
                 p:artifactEndpointResolver-ref="shibboleth.EndpointResolver"
                 p:SOAPClient-ref="shibboleth.sp.SOAPClient.SAML"
                 p:SOAPPipelineName="SAML2.ArtifactDecoder"
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml
index 5bde824..09ae6c2 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/saml2-common-beans.xml
@@ -250,19 +250,5 @@
         p:id="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
         p:shortName="PAOS"
         p:encoderBeanId="shibboleth.Encoders.SAML2PAOSEncoder" />
-
-    <!-- Artifact-related. -->
-    
-    <bean id="ArtifactSupport.SelfEntityIDResolver" lazy-init="true"
-            class="net.shibboleth.profile.relyingparty.impl.CriteriaSelfEntityIDResolver">
-        <property name="relyingPartyConfigurationResolver">
-            <bean class="net.shibboleth.sp.service.impl.SupplierBackedReloadableService">
-                <constructor-arg>
-                    <bean class="net.shibboleth.sp.service.impl.ActiveApplicationSupplier"
-                        p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
-                </constructor-arg>
-            </bean>
-        </property>
-    </bean>
     
 </beans>

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