[java-identity-provider] branch main updated: Subordinate profile configs to new interfaces and remove unused marker.
Scott Cantor
cantor.2 at osu.edu
Thu Feb 16 21:48:01 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=9826ef960cfbb004b0983d0a92dc6c3dad0bf1eb
The following commit(s) were added to refs/heads/main by this push:
new 9826ef960 Subordinate profile configs to new interfaces and remove unused marker.
9826ef960 is described below
commit 9826ef960cfbb004b0983d0a92dc6c3dad0bf1eb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Feb 16 16:47:58 2023 -0500
Subordinate profile configs to new interfaces and remove unused marker.
---
...ractSAML1ArtifactAwareProfileConfiguration.java | 2 +-
.../ArtifactResolutionProfileConfiguration.java | 5 ++--
.../profile/config/SAML1ProfileConfiguration.java | 27 ----------------------
.../ArtifactResolutionProfileConfiguration.java | 10 +++-----
.../config/AttributeQueryProfileConfiguration.java | 9 +++-----
.../profile/config/ECPProfileConfiguration.java | 10 ++++----
6 files changed, 14 insertions(+), 49 deletions(-)
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AbstractSAML1ArtifactAwareProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AbstractSAML1ArtifactAwareProfileConfiguration.java
index 29f225384..06c6ad5b5 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AbstractSAML1ArtifactAwareProfileConfiguration.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AbstractSAML1ArtifactAwareProfileConfiguration.java
@@ -37,7 +37,7 @@ import net.shibboleth.shared.logic.FunctionSupport;
* @since 3.4.0
*/
public abstract class AbstractSAML1ArtifactAwareProfileConfiguration extends AbstractSAMLProfileConfiguration
- implements SAML1ProfileConfiguration, SAMLArtifactAwareProfileConfiguration {
+ implements SAMLArtifactAwareProfileConfiguration {
/** Lookup function to supply artifactConfiguration property. */
@Nonnull private Function<ProfileRequestContext,SAMLArtifactConfiguration> artifactConfigurationLookupStrategy;
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/ArtifactResolutionProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/ArtifactResolutionProfileConfiguration.java
index 8a89bb024..8e3a2e370 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/ArtifactResolutionProfileConfiguration.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/ArtifactResolutionProfileConfiguration.java
@@ -22,11 +22,12 @@ import javax.annotation.Nonnull;
import org.opensaml.profile.logic.NoIntegrityMessageChannelPredicate;
import net.shibboleth.idp.saml.profile.config.AbstractSAMLProfileConfiguration;
+import net.shibboleth.idp.saml.profile.config.SAMLProfileConfiguration;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
/** Configuration support for SAML 1 artifact resolution requests. */
-public class ArtifactResolutionProfileConfiguration
- extends AbstractSAMLProfileConfiguration implements SAML1ProfileConfiguration {
+public class ArtifactResolutionProfileConfiguration extends AbstractSAMLProfileConfiguration
+ implements SAMLProfileConfiguration {
/** ID for this profile configuration. */
@Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/saml1/query/artifact";
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/SAML1ProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/SAML1ProfileConfiguration.java
deleted file mode 100644
index 43a97fcb1..000000000
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/SAML1ProfileConfiguration.java
+++ /dev/null
@@ -1,27 +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.saml.saml1.profile.config;
-
-import net.shibboleth.idp.saml.profile.config.SAMLProfileConfiguration;
-
-/**
- * Marker interface for SAML 1.x profile configuration interfaces, currently empty.
- */
-public interface SAML1ProfileConfiguration extends SAMLProfileConfiguration {
-
-}
\ No newline at end of file
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/ArtifactResolutionProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/ArtifactResolutionProfileConfiguration.java
index 140301a70..8b6f3f3cd 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/ArtifactResolutionProfileConfiguration.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/ArtifactResolutionProfileConfiguration.java
@@ -26,14 +26,13 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.logic.NoConfidentialityMessageChannelPredicate;
import org.opensaml.profile.logic.NoIntegrityMessageChannelPredicate;
-import net.shibboleth.saml.saml2.profile.config.SAML2AssertionProducingProfileConfiguration;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.logic.PredicateSupport;
-/** Configuration support for SAML 2 artifact resolution requests. */
+/** Configuration support for IdP SAML 2.0 artifact resolution profile. */
public class ArtifactResolutionProfileConfiguration extends AbstractSAML2ProfileConfiguration
- implements SAML2AssertionProducingProfileConfiguration {
+ implements net.shibboleth.saml.saml2.profile.config.ArtifactResolutionProfileConfiguration {
/** ID for this profile configuration. */
@Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/saml2/query/artifact";
@@ -47,8 +46,6 @@ public class ArtifactResolutionProfileConfiguration extends AbstractSAML2Profile
/** Constructor. */
public ArtifactResolutionProfileConfiguration() {
this(PROFILE_ID);
- encryptAssertionsPredicate = PredicateSupport.alwaysFalse();
- encryptAttributesPredicate = PredicateSupport.alwaysFalse();
}
/**
@@ -59,8 +56,7 @@ public class ArtifactResolutionProfileConfiguration extends AbstractSAML2Profile
protected ArtifactResolutionProfileConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
setSignResponsesPredicate(new NoIntegrityMessageChannelPredicate());
- setEncryptAssertionsPredicate(new NoConfidentialityMessageChannelPredicate());
- encryptAssertionsPredicate = PredicateSupport.alwaysFalse();
+ encryptAssertionsPredicate = new NoConfidentialityMessageChannelPredicate();
encryptAttributesPredicate = PredicateSupport.alwaysFalse();
}
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfiguration.java
index fe08fb06b..9f06bc343 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfiguration.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfiguration.java
@@ -24,12 +24,9 @@ import org.opensaml.profile.logic.NoIntegrityMessageChannelPredicate;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-/** Configuration support for SAML 2 attribute query requests. */
-public class AttributeQueryProfileConfiguration extends AbstractSAML2AssertionProducingProfileConfiguration {
-
- /** ID for this profile configuration. */
- @Nonnull @NotEmpty public static final String PROFILE_ID =
- "http://shibboleth.net/ns/profiles/saml2/query/attribute";
+/** Configuration support for IdP SAML 2.0 attribute query profile. */
+public class AttributeQueryProfileConfiguration extends AbstractSAML2AssertionProducingProfileConfiguration
+ implements net.shibboleth.saml.saml2.profile.config.AttributeQueryProfileConfiguration {
/** Constructor. */
public AttributeQueryProfileConfiguration() {
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/ECPProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/ECPProfileConfiguration.java
index b09bec8a0..cd43a67f3 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/ECPProfileConfiguration.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/ECPProfileConfiguration.java
@@ -35,18 +35,16 @@ import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.logic.FunctionSupport;
import net.shibboleth.shared.primitive.StringSupport;
-/** Configuration support for SAML 2 ECP. */
-public class ECPProfileConfiguration extends BrowserSSOProfileConfiguration {
-
- /** ID for this profile configuration. */
- @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/saml2/sso/ecp";
+/** Configuration support for IdP SAML 2.0 ECP profile. */
+public class ECPProfileConfiguration extends BrowserSSOProfileConfiguration
+ implements net.shibboleth.saml.saml2.profile.config.ECPProfileConfiguration {
/** Lookup function to supply Local error events to handle without a SOAP fault. */
@Nonnull private Function<ProfileRequestContext,Set<String>> localEventsLookupStrategy;
/** Constructor. */
public ECPProfileConfiguration() {
- this(PROFILE_ID);
+ this(net.shibboleth.saml.saml2.profile.config.ECPProfileConfiguration.PROFILE_ID);
localEventsLookupStrategy = FunctionSupport.constant(null);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list