[java-identity-provider] branch main updated: Move (XML)SecurityConfiguration classes into OpenSAML.
Scott Cantor
cantor.2 at osu.edu
Mon Jan 30 19:18:46 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=7bde5cc95850e0628c61132ca720bd052fea526d
The following commit(s) were added to refs/heads/main by this push:
new 7bde5cc95 Move (XML)SecurityConfiguration classes into OpenSAML.
7bde5cc95 is described below
commit 7bde5cc95850e0628c61132ca720bd052fea526d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jan 30 14:18:43 2023 -0500
Move (XML)SecurityConfiguration classes into OpenSAML.
---
.../admin/BasicAdministrativeFlowDescriptor.java | 2 +-
.../cas/config/AbstractProtocolConfiguration.java | 4 +-
.../idp/cas/flow/impl/GrantProxyTicketAction.java | 2 +-
.../cas/flow/impl/GrantServiceTicketAction.java | 2 +-
.../cas/flow/impl/ValidateProxyCallbackAction.java | 2 +-
.../shibboleth/idp/conf/relying-party-mddriven.xml | 2 +-
.../shibboleth/idp/conf/relying-party-system.xml | 2 +-
.../config/AbstractProfileConfiguration.java | 1 +
.../profile/config/BasicSecurityConfiguration.java | 114 -------------------
.../config/BasicXMLSecurityConfiguration.java | 125 ---------------------
.../idp/profile/config/ProfileConfiguration.java | 1 +
.../idp/profile/config/SecurityConfiguration.java | 63 -----------
.../profile/config/XMLSecurityConfiguration.java | 62 ----------
...ntTLSValidationConfigurationLookupFunction.java | 2 +-
.../DecryptionConfigurationLookupFunction.java | 4 +-
.../EncryptionConfigurationLookupFunction.java | 4 +-
...IdentifierGenerationStrategyLookupFunction.java | 2 +-
...ignatureSigningConfigurationLookupFunction.java | 4 +-
...atureValidationConfigurationLookupFunction.java | 4 +-
...pClientSecurityConfigurationLookupFunction.java | 2 +-
...ignatureSigningConfigurationLookupFunction.java | 4 +-
...atureValidationConfigurationLookupFunction.java | 4 +-
.../CriteriaRelyingPartyConfigurationResolver.java | 3 +-
.../RelyingPartyConfigurationResolver.java | 2 +-
.../DefaultRelyingPartyConfigurationResolver.java | 2 +-
...gCriteriaRelyingPartyConfigurationResolver.java | 2 +-
...ReloadingRelyingPartyConfigurationResolver.java | 2 +-
.../tests/AbstractProfileConfigurationTest.java | 4 +-
.../impl/SelectRelyingPartyConfigurationTest.java | 2 +-
.../saml2/profile/impl/AddAuthnRequestTest.java | 2 +-
.../impl/AddAuthnStatementToAssertionTest.java | 2 +-
.../MockAuthenticationProfileConfiguration.java | 2 +-
.../profile/testing/MockProfileConfiguration.java | 3 +-
.../profile/testing/SAML1ActionTestingSupport.java | 4 +-
.../profile/testing/SAML2ActionTestingSupport.java | 4 +-
35 files changed, 43 insertions(+), 403 deletions(-)
diff --git a/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java b/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
index 663bb45ed..dd9a7da4d 100644
--- a/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
+++ b/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
@@ -38,13 +38,13 @@ import org.opensaml.saml.ext.saml2mdui.DisplayName;
import org.opensaml.saml.ext.saml2mdui.InformationURL;
import org.opensaml.saml.ext.saml2mdui.PrivacyStatementURL;
import org.opensaml.saml.ext.saml2mdui.UIInfo;
+import org.opensaml.security.config.SecurityConfiguration;
import com.google.common.base.MoreObjects;
import com.google.common.base.Predicates;
import net.shibboleth.idp.authn.principal.PrincipalServiceManager;
import net.shibboleth.idp.profile.config.AbstractProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NonNegative;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/config/AbstractProtocolConfiguration.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/config/AbstractProtocolConfiguration.java
index d22351316..e64459a79 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/config/AbstractProtocolConfiguration.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/config/AbstractProtocolConfiguration.java
@@ -27,14 +27,14 @@ import javax.annotation.Nullable;
import net.shibboleth.idp.cas.ticket.TicketIdentifierGenerationStrategy;
import net.shibboleth.idp.profile.config.AbstractConditionalProfileConfiguration;
import net.shibboleth.idp.profile.config.AttributeResolvingProfileConfiguration;
-import net.shibboleth.idp.profile.config.BasicSecurityConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.InitializableComponent;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.logic.FunctionSupport;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.BasicSecurityConfiguration;
+import org.opensaml.security.config.SecurityConfiguration;
import com.google.common.base.Predicates;
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java
index 80d170796..3f6556cbc 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java
@@ -27,6 +27,7 @@ import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventException;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +42,6 @@ import net.shibboleth.idp.cas.ticket.ProxyGrantingTicket;
import net.shibboleth.idp.cas.ticket.ProxyTicket;
import net.shibboleth.idp.cas.ticket.TicketService;
import net.shibboleth.idp.profile.IdPEventIds;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.session.IdPSession;
import net.shibboleth.idp.session.SessionException;
import net.shibboleth.idp.session.SessionResolver;
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantServiceTicketAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantServiceTicketAction.java
index f606b53f2..7d4a1eaa7 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantServiceTicketAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantServiceTicketAction.java
@@ -38,7 +38,6 @@ import net.shibboleth.idp.cas.ticket.ServiceTicket;
import net.shibboleth.idp.cas.ticket.TicketService;
import net.shibboleth.idp.cas.ticket.TicketState;
import net.shibboleth.idp.profile.IdPEventIds;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.session.IdPSession;
import net.shibboleth.idp.session.context.SessionContext;
@@ -49,6 +48,7 @@ import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventException;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/ValidateProxyCallbackAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/ValidateProxyCallbackAction.java
index 5ea83ced0..89dbc7dcb 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/ValidateProxyCallbackAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/ValidateProxyCallbackAction.java
@@ -30,6 +30,7 @@ import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventException;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +47,6 @@ import net.shibboleth.idp.cas.ticket.ServiceTicket;
import net.shibboleth.idp.cas.ticket.Ticket;
import net.shibboleth.idp.cas.ticket.TicketService;
import net.shibboleth.idp.profile.IdPEventIds;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.security.IdentifierGenerationStrategy;
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml
index 0f82f163a..32903397a 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml
@@ -102,7 +102,7 @@
<bean id="AbstractMDDrivenProfile" abstract="true">
<property name="securityConfigurationLookupStrategy">
<bean parent="shibboleth.MDDrivenBeanProperty" p:propertyName="securityConfiguration"
- p:propertyType="#{T(net.shibboleth.idp.profile.config.SecurityConfiguration)}" />
+ p:propertyType="#{T(org.opensaml.security.config.SecurityConfiguration)}" />
</property>
<property name="disallowedFeaturesLookupStrategy">
<bean parent="shibboleth.MDDrivenIntProperty" p:propertyName="disallowedFeatures">
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 6d71c5520..dfcd16e8e 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
@@ -155,7 +155,7 @@
and loads the default credentials used.
-->
- <bean id="shibboleth.DefaultSecurityConfiguration" class="net.shibboleth.idp.profile.config.BasicXMLSecurityConfiguration">
+ <bean id="shibboleth.DefaultSecurityConfiguration" class="org.opensaml.xmlsec.config.BasicXMLSecurityConfiguration">
<property name="signatureSigningConfiguration">
<ref bean="#{'%{idp.signing.config:shibboleth.SigningConfiguration.SHA256}'.trim()}" />
</property>
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
index b99bf6cce..7c2203e88 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
@@ -37,6 +37,7 @@ import net.shibboleth.shared.logic.FunctionSupport;
import net.shibboleth.shared.primitive.StringSupport;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
/** Base class for {@link ProfileConfiguration} implementations. */
public abstract class AbstractProfileConfiguration extends AbstractIdentifiableInitializableComponent
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/BasicSecurityConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/BasicSecurityConfiguration.java
deleted file mode 100644
index 74fd7e47c..000000000
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/BasicSecurityConfiguration.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.profile.config;
-
-import java.time.Duration;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.security.IdentifierGenerationStrategy;
-import net.shibboleth.shared.security.IdentifierGenerationStrategy.ProviderType;
-
-import org.opensaml.security.httpclient.HttpClientSecurityConfiguration;
-import org.opensaml.security.x509.tls.ClientTLSValidationConfiguration;
-
-/**
- * Basic implementation of {@link SecurityConfiguration} interface.
- *
- * @since 5.0.0
- */
-public class BasicSecurityConfiguration implements SecurityConfiguration {
-
- /** Acceptable clock skew. */
- @Nonnull private final Duration clockSkew;
-
- /** Generator used to generate various secure IDs (e.g., message identifiers). */
- @Nonnull private final IdentifierGenerationStrategy idGenerator;
-
- /** Configuration used when validating client TLS X509Credentials. */
- @Nullable private ClientTLSValidationConfiguration clientTLSConfig;
-
- /** Configuration used when executing HttpClient requests. */
- @Nullable private HttpClientSecurityConfiguration httpClientConfig;
-
- /**
- * Constructor.
- *
- * Initializes the clock skew to 5 minutes and the identifier generator to {@link ProviderType#SECURE}.
- */
- public BasicSecurityConfiguration() {
- clockSkew = Duration.ofMinutes(5);
- idGenerator = IdentifierGenerationStrategy.getInstance(ProviderType.SECURE);
- }
-
- /**
- * Constructor.
- *
- * @param skew the clock skew, must be greater than 0
- * @param generator the identifier generator, must not be null
- */
- public BasicSecurityConfiguration(@Nonnull final Duration skew,
- @Nonnull final IdentifierGenerationStrategy generator) {
- Constraint.isNotNull(skew, "Clock skew cannot be null");
- Constraint.isFalse(skew.isNegative() || skew.isZero(), "Clock skew must be greater than 0");
-
- clockSkew = skew;
- idGenerator = Constraint.isNotNull(generator, "Identifier generator cannot be null");
- }
-
- /** {@inheritDoc} */
- @Nonnull public Duration getClockSkew() {
- return clockSkew;
- }
-
- /** {@inheritDoc} */
- @Nonnull public IdentifierGenerationStrategy getIdGenerator() {
- return idGenerator;
- }
-
- /** {@inheritDoc} */
- @Nullable public ClientTLSValidationConfiguration getClientTLSValidationConfiguration() {
- return clientTLSConfig;
- }
-
- /**
- * Set the configuration used when validating client TLS X509Credentials.
- *
- * @param config configuration used when validating client TLS X509Credentials, or null
- */
- public void setClientTLSValidationConfiguration(@Nullable final ClientTLSValidationConfiguration config) {
- clientTLSConfig = config;
- }
-
- /** {@inheritDoc} */
- @Nullable public HttpClientSecurityConfiguration getHttpClientSecurityConfiguration() {
- return httpClientConfig;
- }
-
- /**
- * Set the configuration used when executing HttpClient requests.
- *
- * @param config configuration used when executing HttpClient requests, or null
- */
- public void setHttpClientSecurityConfiguration(@Nullable final HttpClientSecurityConfiguration config) {
- httpClientConfig = config;
- }
-
-}
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/BasicXMLSecurityConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/BasicXMLSecurityConfiguration.java
deleted file mode 100644
index 5de8ff089..000000000
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/BasicXMLSecurityConfiguration.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.profile.config;
-
-import java.time.Duration;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import net.shibboleth.shared.security.IdentifierGenerationStrategy;
-
-import org.opensaml.xmlsec.DecryptionConfiguration;
-import org.opensaml.xmlsec.EncryptionConfiguration;
-import org.opensaml.xmlsec.SignatureSigningConfiguration;
-import org.opensaml.xmlsec.SignatureValidationConfiguration;
-
-/**
- * Basic implementation of {@link XMLSecurityConfiguration} interface.
- *
- * @since 5.0.0
- */
-public class BasicXMLSecurityConfiguration extends BasicSecurityConfiguration implements XMLSecurityConfiguration {
-
- /** Configuration used when validating protocol message signatures. */
- @Nullable private SignatureValidationConfiguration sigValidateConfig;
-
- /** Configuration used when generating protocol message signatures. */
- @Nullable private SignatureSigningConfiguration sigSigningConfig;
-
- /** Configuration used when decrypting protocol message information. */
- @Nullable private DecryptionConfiguration decryptConfig;
-
- /** Configuration used when encrypting protocol message information. */
- @Nullable private EncryptionConfiguration encryptConfig;
-
- /**
- * Default constructor.
- */
- public BasicXMLSecurityConfiguration() {
-
- }
-
- /**
- * Constructor.
- *
- * @param skew the clock skew, must be greater than 0
- * @param generator the identifier generator, must not be null
- */
- public BasicXMLSecurityConfiguration(@Nonnull final Duration skew,
- @Nonnull final IdentifierGenerationStrategy generator) {
- super(skew, generator);
- }
-
- /** {@inheritDoc} */
- @Nullable public SignatureValidationConfiguration getSignatureValidationConfiguration() {
- return sigValidateConfig;
- }
-
- /**
- * Set the configuration used when validating protocol message signatures.
- *
- * @param config configuration used when validating protocol message signatures, or null
- */
- public void setSignatureValidationConfiguration(@Nullable final SignatureValidationConfiguration config) {
- sigValidateConfig = config;
- }
-
- /** {@inheritDoc} */
- @Nullable public SignatureSigningConfiguration getSignatureSigningConfiguration() {
- return sigSigningConfig;
- }
-
- /**
- * Set the configuration used when generating protocol message signatures.
- *
- * @param config configuration used when generating protocol message signatures, or null
- */
- public void setSignatureSigningConfiguration(@Nullable final SignatureSigningConfiguration config) {
- sigSigningConfig = config;
- }
-
- /** {@inheritDoc} */
- @Nullable public DecryptionConfiguration getDecryptionConfiguration() {
- return decryptConfig;
- }
-
- /**
- * Set the configuration used when decrypting protocol message information.
- *
- * @param config configuration used when decrypting protocol message information, or null
- */
- public void setDecryptionConfiguration(@Nullable final DecryptionConfiguration config) {
- decryptConfig = config;
- }
-
- /** {@inheritDoc} */
- @Nullable public EncryptionConfiguration getEncryptionConfiguration() {
- return encryptConfig;
- }
-
- /**
- * Set the configuration used when encrypting protocol message information.
- *
- * @param config configuration used when encrypting protocol message information, or null
- */
- public void setEncryptionConfiguration(@Nullable final EncryptionConfiguration config) {
- encryptConfig = config;
- }
-
-}
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/ProfileConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/ProfileConfiguration.java
index a58c00667..0f2339656 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/ProfileConfiguration.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/ProfileConfiguration.java
@@ -23,6 +23,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotLive;
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java
deleted file mode 100644
index f373c93ef..000000000
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/SecurityConfiguration.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.profile.config;
-
-import java.time.Duration;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.opensaml.security.httpclient.HttpClientSecurityConfiguration;
-import org.opensaml.security.x509.tls.ClientTLSValidationConfiguration;
-
-import net.shibboleth.shared.security.IdentifierGenerationStrategy;
-
-/**
- * General security settings for profiles.
- */
-public interface SecurityConfiguration {
-
- /**
- * Get the acceptable clock skew.
- *
- * @return acceptable clock skew
- */
- @Nonnull Duration getClockSkew();
-
- /**
- * Get the generator used to generate secure identifiers.
- *
- * @return generator used to generate secure identifiers
- */
- @Nonnull IdentifierGenerationStrategy getIdGenerator();
-
- /**
- * Get the configuration used when validating client TLS X509Credentials.
- *
- * @return configuration used when validating client TLS X509Credentials, or null
- */
- @Nullable ClientTLSValidationConfiguration getClientTLSValidationConfiguration();
-
- /**
- * Get the configuration used when executing HttpClient requests.
- *
- * @return configuration used when executing HttpClient requests, or null
- */
- @Nullable HttpClientSecurityConfiguration getHttpClientSecurityConfiguration();
-
-}
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/XMLSecurityConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/XMLSecurityConfiguration.java
deleted file mode 100644
index 11bb8623a..000000000
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/XMLSecurityConfiguration.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.profile.config;
-
-import javax.annotation.Nullable;
-
-import org.opensaml.xmlsec.DecryptionConfiguration;
-import org.opensaml.xmlsec.EncryptionConfiguration;
-import org.opensaml.xmlsec.SignatureSigningConfiguration;
-import org.opensaml.xmlsec.SignatureValidationConfiguration;
-
-/**
- * Extends base interface with XML Security configuration objects.
- *
- * @since 5.0.0
- */
-public interface XMLSecurityConfiguration extends SecurityConfiguration {
-
- /**
- * Get the configuration used when validating protocol message signatures.
- *
- * @return configuration used when validating protocol message signatures, or null
- */
- @Nullable SignatureValidationConfiguration getSignatureValidationConfiguration();
-
- /**
- * Get the configuration used when generating protocol message signatures.
- *
- * @return configuration used when generating protocol message signatures, or null
- */
- @Nullable SignatureSigningConfiguration getSignatureSigningConfiguration();
-
- /**
- * Get the configuration used when decrypting protocol message information.
- *
- * @return configuration used when decrypting protocol message information, or null
- */
- @Nullable DecryptionConfiguration getDecryptionConfiguration();
-
- /**
- * Get the configuration used when encrypting protocol message information.
- *
- * @return configuration used when encrypting protocol message information, or null
- */
- @Nullable EncryptionConfiguration getEncryptionConfiguration();
-
-}
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java
index 53c22f8e5..36f27a241 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java
@@ -23,13 +23,13 @@ import java.util.List;
import javax.annotation.Nullable;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import org.opensaml.core.config.ConfigurationService;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.opensaml.security.x509.tls.ClientTLSValidationConfiguration;
/**
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java
index 7f35150cd..b34dde3fd 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java
@@ -23,15 +23,15 @@ import java.util.List;
import javax.annotation.Nullable;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.config.XMLSecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.opensaml.xmlsec.DecryptionConfiguration;
import org.opensaml.xmlsec.SecurityConfigurationSupport;
+import org.opensaml.xmlsec.config.XMLSecurityConfiguration;
/**
* A function that returns a {@link DecryptionConfiguration} list by way of various lookup strategies.
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/EncryptionConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/EncryptionConfigurationLookupFunction.java
index 20c48174e..8939e2d2f 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/EncryptionConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/EncryptionConfigurationLookupFunction.java
@@ -23,15 +23,15 @@ import java.util.List;
import javax.annotation.Nullable;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.config.XMLSecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.opensaml.xmlsec.EncryptionConfiguration;
import org.opensaml.xmlsec.SecurityConfigurationSupport;
+import org.opensaml.xmlsec.config.XMLSecurityConfiguration;
/**
* A function that returns a {@link EncryptionConfiguration} list using injected lookup strategies.
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java
index 74eea7820..9374a2d56 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java
@@ -20,13 +20,13 @@ package net.shibboleth.idp.profile.config.navigate;
import javax.annotation.Nullable;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import net.shibboleth.shared.security.IdentifierGenerationStrategy;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
/**
* A function that returns an {@link IdentifierGenerationStrategy} by way of a {@link RelyingPartyContext}
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java
index f4efbe9b3..663075f1b 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java
@@ -23,14 +23,14 @@ import java.util.List;
import javax.annotation.Nullable;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.config.XMLSecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.opensaml.xmlsec.SignatureSigningConfiguration;
+import org.opensaml.xmlsec.config.XMLSecurityConfiguration;
import org.opensaml.xmlsec.SecurityConfigurationSupport;
/**
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java
index 7807daae6..2e6a58add 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java
@@ -23,14 +23,14 @@ import java.util.List;
import javax.annotation.Nullable;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.config.XMLSecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.opensaml.xmlsec.SignatureValidationConfiguration;
+import org.opensaml.xmlsec.config.XMLSecurityConfiguration;
import org.opensaml.xmlsec.SecurityConfigurationSupport;
/**
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java
index fa3e4dce7..af7d47632 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/HttpClientSecurityConfigurationLookupFunction.java
@@ -23,11 +23,11 @@ import java.util.List;
import javax.annotation.Nullable;
import org.opensaml.messaging.context.MessageContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.opensaml.security.httpclient.HttpClientSecurityConfiguration;
import org.opensaml.security.httpclient.HttpClientSecuritySupport;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.messaging.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java
index b61bb3e70..2f3c2b296 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureSigningConfigurationLookupFunction.java
@@ -23,12 +23,12 @@ import java.util.List;
import javax.annotation.Nullable;
import org.opensaml.messaging.context.MessageContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.opensaml.xmlsec.SecurityConfigurationSupport;
import org.opensaml.xmlsec.SignatureSigningConfiguration;
+import org.opensaml.xmlsec.config.XMLSecurityConfiguration;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.config.XMLSecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.messaging.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java
index e6953964c..957c3bd45 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/SignatureValidationConfigurationLookupFunction.java
@@ -23,12 +23,12 @@ import java.util.List;
import javax.annotation.Nullable;
import org.opensaml.messaging.context.MessageContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.opensaml.xmlsec.SecurityConfigurationSupport;
import org.opensaml.xmlsec.SignatureValidationConfiguration;
+import org.opensaml.xmlsec.config.XMLSecurityConfiguration;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.config.XMLSecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.messaging.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/CriteriaRelyingPartyConfigurationResolver.java b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/CriteriaRelyingPartyConfigurationResolver.java
index d9e3ba895..8528ea9e5 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/CriteriaRelyingPartyConfigurationResolver.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/CriteriaRelyingPartyConfigurationResolver.java
@@ -20,7 +20,8 @@ package net.shibboleth.idp.relyingparty;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
+import org.opensaml.security.config.SecurityConfiguration;
+
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.IdentifiedComponent;
import net.shibboleth.shared.resolver.CriteriaSet;
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
index c5a1624ec..5db68ee61 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
@@ -20,12 +20,12 @@ package net.shibboleth.idp.relyingparty;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.IdentifiedComponent;
import net.shibboleth.shared.resolver.Resolver;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
/** Resolves a {@link RelyingPartyConfiguration} for a given profile request context. */
public interface RelyingPartyConfigurationResolver extends Resolver<RelyingPartyConfiguration,ProfileRequestContext>,
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
index a579d7221..5e86bac96 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
@@ -28,13 +28,13 @@ 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.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.logic.VerifiedProfilePredicate;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolver.java
index 2b29160fe..f2804b5ff 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DelegatingCriteriaRelyingPartyConfigurationResolver.java
@@ -31,10 +31,10 @@ import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
import org.opensaml.saml.criterion.RoleDescriptorCriterion;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.opensaml.saml.saml2.metadata.RoleDescriptor;
+import org.opensaml.security.config.SecurityConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.relyingparty.CriteriaRelyingPartyConfigurationResolver;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
index f511466c2..8cc220b0d 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
@@ -25,10 +25,10 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import net.shibboleth.shared.annotation.ParameterName;
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/config/tests/AbstractProfileConfigurationTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/config/tests/AbstractProfileConfigurationTest.java
index 4e4cb8c51..9ea832ec2 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/config/tests/AbstractProfileConfigurationTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/config/tests/AbstractProfileConfigurationTest.java
@@ -18,12 +18,12 @@
package net.shibboleth.idp.profile.config.tests;
import net.shibboleth.idp.profile.config.AbstractProfileConfiguration;
-import net.shibboleth.idp.profile.config.BasicSecurityConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.testing.MockProfileConfiguration;
import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.logic.FunctionSupport;
+import org.opensaml.security.config.BasicSecurityConfiguration;
+import org.opensaml.security.config.SecurityConfiguration;
import org.testng.Assert;
import org.testng.annotations.Test;
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 333ef2051..d7ee1a21f 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
@@ -22,7 +22,6 @@ import java.util.Collections;
import javax.annotation.Nullable;
import net.shibboleth.idp.profile.IdPEventIds;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
@@ -34,6 +33,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.resolver.ResolverException;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.security.config.SecurityConfiguration;
import org.springframework.webflow.execution.Event;
import org.springframework.webflow.execution.RequestContext;
import org.testng.Assert;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
index f6bf31428..99fe83306 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnRequestTest.java
@@ -26,7 +26,6 @@ import java.util.stream.Collectors;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
import net.shibboleth.idp.profile.IdPEventIds;
-import net.shibboleth.idp.profile.config.BasicXMLSecurityConfiguration;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -56,6 +55,7 @@ import org.opensaml.saml.saml2.core.NameIDPolicy;
import org.opensaml.saml.saml2.core.NameIDType;
import org.opensaml.saml.saml2.core.RequestedAuthnContext;
import org.opensaml.saml.saml2.core.Scoping;
+import org.opensaml.xmlsec.config.BasicXMLSecurityConfiguration;
import org.springframework.webflow.execution.Event;
import org.springframework.webflow.execution.RequestContext;
import org.testng.annotations.BeforeMethod;
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
index 11e1f2cee..7ebb02b9e 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml2.core.AuthnContext;
import org.opensaml.saml.saml2.core.AuthnStatement;
import org.opensaml.saml.saml2.core.Response;
import org.opensaml.storage.StorageSerializer;
+import org.opensaml.xmlsec.config.BasicXMLSecurityConfiguration;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
import org.springframework.webflow.execution.RequestContext;
@@ -45,7 +46,6 @@ import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.context.RequestedPrincipalContext;
import net.shibboleth.idp.authn.impl.DefaultAuthenticationResultSerializer;
import net.shibboleth.idp.authn.principal.ProxyAuthenticationPrincipal;
-import net.shibboleth.idp.profile.config.BasicXMLSecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
diff --git a/idp-testing/src/main/java/net/shibboleth/idp/authn/testing/MockAuthenticationProfileConfiguration.java b/idp-testing/src/main/java/net/shibboleth/idp/authn/testing/MockAuthenticationProfileConfiguration.java
index cccf9ea02..45cad6595 100644
--- a/idp-testing/src/main/java/net/shibboleth/idp/authn/testing/MockAuthenticationProfileConfiguration.java
+++ b/idp-testing/src/main/java/net/shibboleth/idp/authn/testing/MockAuthenticationProfileConfiguration.java
@@ -28,12 +28,12 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.xmlsec.config.BasicXMLSecurityConfiguration;
import com.google.common.base.Predicates;
import net.shibboleth.idp.authn.config.AuthenticationProfileConfiguration;
import net.shibboleth.idp.profile.config.AbstractProfileConfiguration;
-import net.shibboleth.idp.profile.config.BasicXMLSecurityConfiguration;
import net.shibboleth.shared.annotation.constraint.NonNegative;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
diff --git a/idp-testing/src/main/java/net/shibboleth/idp/profile/testing/MockProfileConfiguration.java b/idp-testing/src/main/java/net/shibboleth/idp/profile/testing/MockProfileConfiguration.java
index 678d1c1d1..001ff6049 100644
--- a/idp-testing/src/main/java/net/shibboleth/idp/profile/testing/MockProfileConfiguration.java
+++ b/idp-testing/src/main/java/net/shibboleth/idp/profile/testing/MockProfileConfiguration.java
@@ -19,8 +19,9 @@ package net.shibboleth.idp.profile.testing;
import javax.annotation.Nonnull;
+import org.opensaml.security.config.BasicSecurityConfiguration;
+
import net.shibboleth.idp.profile.config.AbstractProfileConfiguration;
-import net.shibboleth.idp.profile.config.BasicSecurityConfiguration;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
diff --git a/idp-testing/src/main/java/net/shibboleth/idp/saml/saml1/profile/testing/SAML1ActionTestingSupport.java b/idp-testing/src/main/java/net/shibboleth/idp/saml/saml1/profile/testing/SAML1ActionTestingSupport.java
index 6a65c185a..9aad4259d 100644
--- a/idp-testing/src/main/java/net/shibboleth/idp/saml/saml1/profile/testing/SAML1ActionTestingSupport.java
+++ b/idp-testing/src/main/java/net/shibboleth/idp/saml/saml1/profile/testing/SAML1ActionTestingSupport.java
@@ -23,9 +23,7 @@ import java.util.Collection;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.profile.config.BasicXMLSecurityConfiguration;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
@@ -36,6 +34,8 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.primitive.StringSupport;
import org.opensaml.messaging.context.BaseContext;
+import org.opensaml.security.config.SecurityConfiguration;
+import org.opensaml.xmlsec.config.BasicXMLSecurityConfiguration;
/**
* Helper methods for creating/testing SAML 1 objects within profile action tests. When methods herein refer to mock
diff --git a/idp-testing/src/main/java/net/shibboleth/idp/saml/saml2/profile/testing/SAML2ActionTestingSupport.java b/idp-testing/src/main/java/net/shibboleth/idp/saml/saml2/profile/testing/SAML2ActionTestingSupport.java
index 8284d8612..ec75986aa 100644
--- a/idp-testing/src/main/java/net/shibboleth/idp/saml/saml2/profile/testing/SAML2ActionTestingSupport.java
+++ b/idp-testing/src/main/java/net/shibboleth/idp/saml/saml2/profile/testing/SAML2ActionTestingSupport.java
@@ -23,9 +23,7 @@ import java.util.Collection;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.profile.config.BasicXMLSecurityConfiguration;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
@@ -36,6 +34,8 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.primitive.StringSupport;
import org.opensaml.messaging.context.BaseContext;
+import org.opensaml.security.config.SecurityConfiguration;
+import org.opensaml.xmlsec.config.BasicXMLSecurityConfiguration;
/**
* Helper methods for creating/testing SAML 2 objects within profile action tests. When methods herein refer to mock
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list