[java-identity-provider] branch main updated: IDP-2288 - Injection of beans into BeanPostProcessor causes warnings
Scott Cantor
cantor.2 at osu.edu
Thu Oct 24 13:23:35 UTC 2024
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=a4d7e68f3bac9761fe7df4006c381ec424eb0ad4
The following commit(s) were added to refs/heads/main by this push:
new a4d7e68f3 IDP-2288 - Injection of beans into BeanPostProcessor causes warnings
a4d7e68f3 is described below
commit a4d7e68f3bac9761fe7df4006c381ec424eb0ad4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 24 09:23:31 2024 -0400
IDP-2288 - Injection of beans into BeanPostProcessor causes warnings
https://shibboleth.atlassian.net/browse/IDP-2288
Migrate ByReference filter into Spring parser also to fix ordering.
---
.../resources/net/shibboleth/idp/conf/metadata-providers-system.xml | 5 +++--
.../resources/net/shibboleth/idp/module/conf/services.properties | 2 +-
.../shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java | 5 +++++
idp-conf-impl/src/test/resources/metadata/example-metadata.xml | 4 ----
.../resources/net/shibboleth/idp/module/conf/metadata-providers.xml | 4 +---
.../main/resources/META-INF/net/shibboleth/spring/parser.properties | 1 +
6 files changed, 11 insertions(+), 10 deletions(-)
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 b11463b45..10d89d3f7 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,8 +14,9 @@
<context:annotation-config />
- <!-- Stand alone post-processor to auto-attach the ByReference filter bridge. -->
- <bean class="net.shibboleth.spring.metadata.ByReferenceFilterBeanPostProcessor"
+ <!-- Reserved bean ID that is auto-attached to all metadata resolvers by Spring parser. -->
+ <bean id="shibboleth.ByReferenceMetadataFilterBridge"
+ class="net.shibboleth.idp.saml.metadata.impl.ByReferenceMetadataFilterBridge"
p:enabled="%{idp.service.metadata.enableByReferenceFilters:true}" />
<!-- Reserved bean ID that is auto-attached to all metadata resolvers by Spring parser. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.properties
index ce0fbab78..6bd071232 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.properties
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.properties
@@ -16,7 +16,7 @@ idp.service.logging.checkInterval = PT5M
#idp.service.relyingparty.failFast = false
idp.service.relyingparty.checkInterval = PT15M
# See MetadataDrivenConfiguration wiki topic for details
-idp.service.relyingparty.ignoreUnmappedEntityAttributes=true
+idp.service.relyingparty.ignoreUnmappedEntityAttributes = true
#idp.service.metadata.resources = shibboleth.MetadataResolverResources
#idp.service.metadata.failFast = false
diff --git a/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java
index 954b03b78..dc13e3dde 100644
--- a/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java
+++ b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java
@@ -39,6 +39,11 @@ public class SAML1UnsolicitedSSOFlowTest extends AbstractSAML1FlowTest {
*/
@Test public void testSAML1UnsolicitedSSOFlow() throws Exception {
+ // NOTE: This test can fail for a subtle reason involving the use of attribute push with SAML 1.1
+ // We are triggering that setting by relying on a ByReference metadata filter to attach a
+ // profile setting to the test metadata, so it fails for reasons that can be non-obvious if that
+ // mechanism breaks, and will fail on the attribute statement checking step.
+
buildRequest();
overrideEndStateOutput(FLOW_ID);
diff --git a/idp-conf-impl/src/test/resources/metadata/example-metadata.xml b/idp-conf-impl/src/test/resources/metadata/example-metadata.xml
index 74ecf92bb..15493817e 100644
--- a/idp-conf-impl/src/test/resources/metadata/example-metadata.xml
+++ b/idp-conf-impl/src/test/resources/metadata/example-metadata.xml
@@ -20,10 +20,6 @@
<saml:AttributeValue>attribute-release</saml:AttributeValue>
</saml:Attribute>
-->
- <saml:Attribute Name="http://shibboleth.net/ns/profiles/saml1/sso/browser/includeAttributeStatement"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>true</saml:AttributeValue>
- </saml:Attribute>
<saml:Attribute Name="http://shibboleth.net/ns/profiles/saml2/sso/browser/encryptAssertions"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>true</saml:AttributeValue>
diff --git a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/metadata-providers.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/metadata-providers.xml
index 67faf6ac9..deb109a3d 100644
--- a/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/metadata-providers.xml
+++ b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/metadata-providers.xml
@@ -27,7 +27,7 @@
<!-- Example metadata provider. -->
<MetadataProvider id="URLMD" xsi:type="ResourceBackedMetadataProvider" maxRefreshDelay="PT5M" indexesRef="testbed.MetadataIndexes" resourceRef="exampleMetadata">
- <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="false"> <!-- TODO -->
+ <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="false">
<PublicKey>
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/
@@ -56,12 +56,10 @@
<MetadataProvider id="SP123MD" xsi:type="ResourceBackedMetadataProvider" maxRefreshDelay="PT5M" indexesRef="testbed.MetadataIndexes" resourceRef="exampleMetadata-sp123"/>
- <!--
<MetadataProvider id="ICMDQ" xsi:type="DynamicHTTPMetadataProvider"
minCacheDuration="PT5M" maxCacheDuration="PT24H" maxIdleEntityData="PT1H">
<MetadataFilter xsi:type="RequiredValidUntil" maxValidityInterval="P14D" />
<MetadataQueryProtocol>https://mdq.incommon.org/</MetadataQueryProtocol>
</MetadataProvider>
- -->
</MetadataProvider>
diff --git a/idp-schema/src/main/resources/META-INF/net/shibboleth/spring/parser.properties b/idp-schema/src/main/resources/META-INF/net/shibboleth/spring/parser.properties
index 17c654d57..1288b99a0 100644
--- a/idp-schema/src/main/resources/META-INF/net/shibboleth/spring/parser.properties
+++ b/idp-schema/src/main/resources/META-INF/net/shibboleth/spring/parser.properties
@@ -15,6 +15,7 @@ net.shibboleth.idp.attribute.resolver.spring.dc.impl.ComputedIdDataConnectorPars
net.shibboleth.spring.metadata.AbstractReloadingMetadataProviderParser.ParserPool.bean = shibboleth.ParserPool
net.shibboleth.spring.metadata.AbstractDynamicMetadataProviderParser.ParserPool.bean = shibboleth.ParserPool
+net.shibboleth.spring.metadata.AbstractMetadataProviderParser.ByReferenceMetadataFilterBridge.bean = shibboleth.ByReferenceMetadataFilterBridge
net.shibboleth.spring.metadata.AbstractMetadataProviderParser.AutoWiredNodeProcessingMetadataFilter.bean = shibboleth.AutoWiredNodeProcessingMetadataFilter
net.shibboleth.spring.metadata.filter.SchemaValidationParser.SchemaBuilder.bean = shibboleth.SchemaBuilder
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list