[java-identity-provider] 27/51: IDP-2250 - Duplicated bean factory processor for class relocation checks

[Rod Widdowson]

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

rdw pushed a commit to branch dev/IDP-2147
in repository java-identity-provider.

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

commit 5bbc772fdd142de27b52f677bf87d747d804167b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 21 12:40:34 2024 -0500

    IDP-2250 - Duplicated bean factory processor for class relocation checks
    
    https://shibboleth.atlassian.net/browse/IDP-2250
---
 .../resources/net/shibboleth/idp/conf/access-control-system.xml     | 3 ---
 .../resources/net/shibboleth/idp/conf/attribute-filter-system.xml   | 3 ---
 .../resources/net/shibboleth/idp/conf/attribute-registry-system.xml | 3 ---
 .../resources/net/shibboleth/idp/conf/attribute-resolver-system.xml | 3 ---
 .../resources/net/shibboleth/idp/conf/metadata-providers-system.xml | 6 +++---
 .../main/resources/net/shibboleth/idp/conf/relying-party-system.xml | 3 ---
 .../main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml   | 3 ---
 7 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/access-control-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/access-control-system.xml
index 050ef740c..41b62a8b3 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/access-control-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/access-control-system.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <!-- Pull in class rewrite rules. -->
-    <bean parent="shibboleth.RelocatedBeanFactoryPostProcessor" />
-
     <bean class="net.shibboleth.shared.security.impl.BasicAccessControlService"
         p:id="shibboleth.AccessControlService"
         p:policyMap-ref="shibboleth.AccessControlPolicies" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-filter-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-filter-system.xml
index 3fb315149..4167596cb 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-filter-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-filter-system.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <!-- Pull in class rewrite rules. -->
-    <bean parent="shibboleth.RelocatedBeanFactoryPostProcessor" />
-
     <!-- This extends scripted plugins with access to the SubjectContext, if present. -->
     <bean class="net.shibboleth.idp.authn.context.impl.SubjectScriptContextExtender" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-registry-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-registry-system.xml
index 5b7af53ec..1f56dfb27 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-registry-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-registry-system.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <!-- Pull in class rewrite rules. -->
-    <bean parent="shibboleth.RelocatedBeanFactoryPostProcessor" />
-
     <bean id="SAML2MetadataNamingStrategy" parent="shibboleth.TagLookupSet"
         p:profileMetadataLookupStrategy-ref="shibboleth.EntityDescriptorLookup.RelyingParty"
         p:propertyName="#{T(net.shibboleth.idp.saml.attribute.transcoding.SAML2AttributeTranscoder).METADATA_TAG_NAME}"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-resolver-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-resolver-system.xml
index 614c44b0b..229376bd6 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-resolver-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-resolver-system.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <!-- Pull in class rewrite rules. -->
-    <bean parent="shibboleth.RelocatedBeanFactoryPostProcessor" />
-
     <!-- This extends scripted plugins with access to the SubjectContext, if present. -->
     <bean class="net.shibboleth.idp.authn.context.impl.SubjectScriptContextExtender" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metadata-providers-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metadata-providers-system.xml
index ecadb0560..7ae9c08e8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metadata-providers-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metadata-providers-system.xml
@@ -14,9 +14,6 @@
 
     <context:annotation-config />
 
-    <!-- Pull in class rewrite rules. -->
-    <bean parent="shibboleth.RelocatedBeanFactoryPostProcessor" />
-
     <!-- BeanPostProcessors that auto-install MetadataFilters for internal use. -->
     
     <bean class="net.shibboleth.spring.metadata.ByReferenceFilterBeanPostProcessor"
@@ -53,6 +50,9 @@
     <bean id="shibboleth.Metadata.MDQ.URLBuilder.SAMLArtifact" lazy-init="true"
         class="org.opensaml.saml.metadata.resolver.impl.SAMLArtifactURLBuilder" />
     
+    <bean id="shibboleth.CSPDigester" class="net.shibboleth.utilities.java.support.codec.StringDigester"
+        c:algorithm="SHA256" c:format="BASE64" />
+    
     <!-- Wildcard import hook for plugins. -->
     <import resource="classpath*:/META-INF/net/shibboleth/idp/service/saml/metadata/postconfig.xml" />
     
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
index edcbc7615..c4ad93026 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
@@ -14,9 +14,6 @@
 
     <context:annotation-config/>
 
-    <!-- Pull in class rewrite rules. -->
-    <bean parent="shibboleth.RelocatedBeanFactoryPostProcessor" />
-
     <!-- This is one of the few properties we rely on that has no default. -->
     <bean id="entityID" class="java.lang.String" c:_0="%{idp.entityID}" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml
index 0bf6e5be1..0a8c3cf5e 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <!-- Pull in class rewrite rules. -->
-    <bean parent="shibboleth.RelocatedBeanFactoryPostProcessor" />
-
     <!-- Bean templates for defining generators that produce custom formats based on attributes. -->
 
     <bean id="shibboleth.SAML2AttributeSourcedGenerator" abstract="true"

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