[java-identity-provider] branch main updated: Move default SecurityConfiguration to RelyingPartyConfiguration.
Scott Cantor
cantor.2 at osu.edu
Thu Mar 16 18:42:39 UTC 2023
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=9a2c10bc18f5dad08398339f0e94e30a18d7a2e1
The following commit(s) were added to refs/heads/main by this push:
new 9a2c10bc1 Move default SecurityConfiguration to RelyingPartyConfiguration.
9a2c10bc1 is described below
commit 9a2c10bc18f5dad08398339f0e94e30a18d7a2e1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Mar 16 14:42:35 2023 -0400
Move default SecurityConfiguration to RelyingPartyConfiguration.
---
.../net/shibboleth/idp/conf/relying-party-system.xml | 6 +++---
.../resources/net/shibboleth/idp/conf/security-system.xml | 15 +++++----------
.../resources/net/shibboleth/idp/conf/soap-client.xml | 9 +++------
.../net/shibboleth/idp/flows/authn/saml-authn-beans.xml | 4 +---
.../idp/flows/saml/logout/saml2-logoutprop-beans.xml | 1 -
.../profile/impl/SelectRelyingPartyConfigurationTest.java | 6 ------
6 files changed, 12 insertions(+), 29 deletions(-)
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 bd4cca62d..b6d4259c2 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
@@ -21,8 +21,7 @@
<bean class="net.shibboleth.profile.relyingparty.impl.DefaultRelyingPartyConfigurationResolver"
p:unverifiedConfiguration-ref="shibboleth.UnverifiedRelyingParty"
p:defaultConfiguration-ref="shibboleth.DefaultRelyingParty"
- p:relyingPartyConfigurations-ref="shibboleth.RelyingPartyOverrides"
- p:defaultSecurityConfiguration-ref="%{idp.security.config:shibboleth.DefaultSecurityConfiguration}" />
+ p:relyingPartyConfigurations-ref="shibboleth.RelyingPartyOverrides" />
<!--
Auto-wiring exposers for credentials to get them loaded into the bean above.
@@ -40,7 +39,8 @@
<!-- Parent bean for generic RelyingParty overrides that establishes defaults. -->
<bean id="RelyingParty" abstract="true" class="net.shibboleth.profile.relyingparty.BasicRelyingPartyConfiguration"
p:issuer="#{getObject('entityID')}"
- p:detailedErrorsPredicate="%{idp.errors.detailed:false}" />
+ p:detailedErrorsPredicate="%{idp.errors.detailed:false}"
+ p:securityConfiguration-ref="%{idp.security.config:shibboleth.DefaultSecurityConfiguration}" />
<!-- Parent bean for RelyingParty overrides based on activation by name(s). -->
<bean id="RelyingPartyByName" abstract="true" parent="RelyingParty"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/security-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/security-system.xml
index a835ebdbb..06621d1ad 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/security-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/security-system.xml
@@ -65,20 +65,15 @@
<!-- Lookup functions to locate security configurations on profile beans. -->
<bean id="shibboleth.SignatureValidationConfigurationLookup" lazy-init="true"
- class="net.shibboleth.profile.config.navigate.SignatureValidationConfigurationLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService" />
+ class="net.shibboleth.profile.config.navigate.SignatureValidationConfigurationLookupFunction" />
<bean id="shibboleth.SignatureSigningConfigurationLookup" lazy-init="true"
- class="net.shibboleth.profile.config.navigate.SignatureSigningConfigurationLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService" />
+ class="net.shibboleth.profile.config.navigate.SignatureSigningConfigurationLookupFunction" />
<bean id="shibboleth.DecryptionConfigurationLookup" lazy-init="true"
- class="net.shibboleth.profile.config.navigate.DecryptionConfigurationLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService" />
+ class="net.shibboleth.profile.config.navigate.DecryptionConfigurationLookupFunction" />
<bean id="shibboleth.EncryptionConfigurationLookup" lazy-init="true"
- class="net.shibboleth.profile.config.navigate.EncryptionConfigurationLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService" />
+ class="net.shibboleth.profile.config.navigate.EncryptionConfigurationLookupFunction" />
<bean id="shibboleth.ClientTLSValidationConfigurationLookup" lazy-init="true"
- class="net.shibboleth.profile.config.navigate.ClientTLSValidationConfigurationLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService" />
+ class="net.shibboleth.profile.config.navigate.ClientTLSValidationConfigurationLookupFunction" />
<!-- Beans that implement the mashing of security configurations into final parameter sets. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/soap-client.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/soap-client.xml
index 312b0b819..1d1f3d77c 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/soap-client.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/soap-client.xml
@@ -18,14 +18,11 @@
<!-- Security Configuration lookup -->
<bean id="shibboleth.MessageContext.SignatureValidationConfigurationLookup"
- class="net.shibboleth.profile.config.navigate.messaging.SignatureValidationConfigurationLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService" />
+ class="net.shibboleth.profile.config.navigate.messaging.SignatureValidationConfigurationLookupFunction" />
<bean id="shibboleth.MessageContext.SignatureSigningConfigurationLookup"
- class="net.shibboleth.profile.config.navigate.messaging.SignatureSigningConfigurationLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService" />
+ class="net.shibboleth.profile.config.navigate.messaging.SignatureSigningConfigurationLookupFunction" />
<bean id="shibboleth.MessageContext.HttpClientSecurityConfigurationLookup"
- class="net.shibboleth.profile.config.navigate.messaging.HttpClientSecurityConfigurationLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService" />
+ class="net.shibboleth.profile.config.navigate.messaging.HttpClientSecurityConfigurationLookupFunction" />
<!-- SOAP client and pipeline factory definitions. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
index 9154abf42..9535adfd3 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
@@ -154,11 +154,9 @@
class="net.shibboleth.idp.saml.saml2.profile.impl.AddAuthnRequest" scope="prototype"
p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"
p:overwriteExisting="true"
- p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple
-">
+ p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService"
p:defaultIdentifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy" />
</property>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
index 0a6906860..5b1f6d4ca 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
@@ -64,7 +64,6 @@
p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
- p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyResolverService"
p:defaultIdentifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy" />
</property>
</bean>
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
index e68aa9ca5..6ccf12617 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
@@ -24,7 +24,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.security.config.SecurityConfiguration;
import org.opensaml.security.credential.Credential;
import org.springframework.webflow.execution.Event;
import org.springframework.webflow.execution.RequestContext;
@@ -213,11 +212,6 @@ public class SelectRelyingPartyConfigurationTest {
return configuration;
}
- /** {@inheritDoc} */
- @Override public SecurityConfiguration getDefaultSecurityConfiguration(@Nonnull String profileId) {
- return null;
- }
-
/** {@inheritDoc} */
@Override
public @Nonnull Collection<Credential> getSigningCredentials() {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list