[java-oidc-common] branch main updated: JCOMOIDC-29 - Consider adjustments to OIDC/OAuth profile configs
Scott Cantor
cantor.2 at osu.edu
Thu Dec 9 00:54:37 UTC 2021
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=fa793e8a62d0a5e69f966da2ef1b10613613c000
The following commit(s) were added to refs/heads/main by this push:
new fa793e8 JCOMOIDC-29 - Consider adjustments to OIDC/OAuth profile configs
fa793e8 is described below
commit fa793e8a62d0a5e69f966da2ef1b10613613c000
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Dec 8 19:54:31 2021 -0500
JCOMOIDC-29 - Consider adjustments to OIDC/OAuth profile configs
https://shibboleth.atlassian.net/browse/JCOMOIDC-29
Refactor and rename, add Token profile config.
---
...ion.java => OIDCAuthorizationConfiguration.java} | 14 +++++++++-----
.../OIDCDynamicRegistrationConfiguration.java | 3 ++-
.../profile/config/OIDCProfileConfiguration.java | 9 ++++++---
.../OIDCTokenConfiguration.java} | 21 ++++++++++-----------
.../config/logic/AllowPKCEPlainPredicate.java | 8 ++++----
.../AuthorizationCodeFlowEnabledPredicate.java | 8 ++++----
.../config/logic/EncodeConsentPredicate.java | 8 ++++----
.../profile/config/logic/ForcePKCEPredicate.java | 8 ++++----
.../config/logic/HybridFlowEnabledPredicate.java | 8 ++++----
.../config/logic/ImplicitFlowEnabledPredicate.java | 8 ++++----
.../config/logic/RefreshTokensEnabledPredicate.java | 8 ++++----
.../navigate/AccessTokenLifetimeLookupFunction.java | 8 ++++----
.../AcrClaimAlwaysEssentialLookupFunction.java | 8 ++++----
.../AlwaysIncludedAttributesLookupFunction.java | 8 ++++----
.../AudienceRestrictionsLookupFunction.java | 10 +++++-----
.../navigate/AuthzCodeLifetimeLookupFunction.java | 8 ++++----
.../DeniedUserInfoAttributesLookupFunction.java | 8 ++++----
.../navigate/EncodedAttributesLookupFunction.java | 8 ++++----
.../navigate/IDTokenLifetimeLookupFunction.java | 8 ++++----
.../RefreshTokenLifetimeLookupFunction.java | 8 ++++----
.../TokenEndpointAuthMethodLookupFunction.java | 8 ++++----
...th2ClientAuthenticableProfileConfiguration.java} | 10 +++++-----
...bstractOAuth2FlowAwareProfileConfiguration.java} | 8 ++++----
.../config/OAuth2ProfileConfiguration.java} | 6 +++---
.../OAuth2TokenIntrospectionConfiguration.java | 3 +--
.../config/OAuth2TokenRevocationConfiguration.java | 3 +--
.../config/OIDCCoreProtocolConfigurationTest.java | 8 ++++----
27 files changed, 114 insertions(+), 109 deletions(-)
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCCoreProtocolConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
similarity index 98%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCCoreProtocolConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
index 253df3b..39af63f 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCCoreProtocolConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
@@ -36,6 +36,7 @@ import com.google.common.base.Predicates;
import net.shibboleth.idp.authn.config.AuthenticationProfileConfiguration;
import net.shibboleth.idp.profile.config.OverriddenIssuerProfileConfiguration;
import net.shibboleth.oidc.authn.principal.AuthenticationContextClassReferencePrincipal;
+import net.shibboleth.oidc.profile.oauth2.config.AbstractOAuth2FlowAwareProfileConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -47,10 +48,13 @@ import net.shibboleth.utilities.java.support.logic.FunctionSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
- * Profile configuration for the OpenID Connect authorization and token endpoints.
+ * Profile configuration for the OpenID Connect authorization endpoint.
+ *
+ * <p>For backward-compatibility it is also usable as a Token endpoint configuration but
+ * this has been replaced by a dedicated class.</p>
*/
-public class OIDCCoreProtocolConfiguration extends AbstractOIDCFlowAwareProfileConfiguration
- implements AuthenticationProfileConfiguration, OverriddenIssuerProfileConfiguration {
+public class OIDCAuthorizationConfiguration extends AbstractOAuth2FlowAwareProfileConfiguration
+ implements OIDCProfileConfiguration, AuthenticationProfileConfiguration, OverriddenIssuerProfileConfiguration {
/** OIDC base protocol URI. */
@Nonnull @NotEmpty public static final String PROTOCOL_URI = "http://openid.net/specs/openid-connect-core-1_0.html";
@@ -119,7 +123,7 @@ public class OIDCCoreProtocolConfiguration extends AbstractOIDCFlowAwareProfileC
/**
* Constructor.
*/
- public OIDCCoreProtocolConfiguration() {
+ public OIDCAuthorizationConfiguration() {
this(PROFILE_ID);
}
@@ -128,7 +132,7 @@ public class OIDCCoreProtocolConfiguration extends AbstractOIDCFlowAwareProfileC
*
* @param profileId Unique profile identifier.
*/
- public OIDCCoreProtocolConfiguration(@Nonnull @NotEmpty final String profileId) {
+ public OIDCAuthorizationConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
forceAuthnPredicate = Predicates.alwaysFalse();
resolveAttributesPredicate = Predicates.alwaysTrue();
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationConfiguration.java
index c14e73b..dc43a88 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationConfiguration.java
@@ -26,6 +26,7 @@ import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.OverriddenIssuerProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.AbstractOAuth2FlowAwareProfileConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -34,7 +35,7 @@ import net.shibboleth.utilities.java.support.logic.FunctionSupport;
/**
* Profile configuration for the OpenID Connect dynamic client registration.
*/
-public class OIDCDynamicRegistrationConfiguration extends AbstractOIDCFlowAwareProfileConfiguration
+public class OIDCDynamicRegistrationConfiguration extends AbstractOAuth2FlowAwareProfileConfiguration
implements OverriddenIssuerProfileConfiguration {
/** OIDC base protocol URI. */
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProfileConfiguration.java
index b396dc9..1a68e6d 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProfileConfiguration.java
@@ -17,11 +17,14 @@
package net.shibboleth.oidc.profile.config;
-import net.shibboleth.idp.profile.config.ProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2ProfileConfiguration;
/**
- * Marker interface for OIDC profile configurations.
+ * Marker interface for OIDC-specific profile configurations.
+ *
+ * <p>Such profiles may be OAuth-defined but if they include features specific to OIDC should
+ * implement this interface as well.</p>
*/
-public interface OIDCProfileConfiguration extends ProfileConfiguration {
+public interface OIDCProfileConfiguration extends OAuth2ProfileConfiguration {
}
\ No newline at end of file
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCTokenConfiguration.java
similarity index 61%
copy from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
copy to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCTokenConfiguration.java
index 2ba5d8f..aff2e44 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCTokenConfiguration.java
@@ -15,37 +15,36 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.profile.oauth2.config;
+package net.shibboleth.oidc.profile.config;
import javax.annotation.Nonnull;
-import net.shibboleth.oidc.profile.config.AbstractOIDCClientAuthenticableProfileConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
- * Profile configuration for the OAuth2 Token Introspection.
+ * Marker interface for OIDC-specific profile configurations.
+ *
+ * <p>Such profiles may be OAuth-defined but if they include features specific to OIDC should
+ * implement this interface as well.</p>
*/
-public class OAuth2TokenIntrospectionConfiguration extends AbstractOIDCClientAuthenticableProfileConfiguration {
-
- /** OAuth2 Token Revocation URI. */
- public static final String PROTOCOL_URI = "https://tools.ietf.org/html/rfc7662";
+public class OIDCTokenConfiguration extends OIDCAuthorizationConfiguration {
/** ID for this profile configuration. */
- public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oauth2/introspection";
+ @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/token";
/**
* Constructor.
*/
- public OAuth2TokenIntrospectionConfiguration() {
+ public OIDCTokenConfiguration() {
this(PROFILE_ID);
}
/**
* Creates a new configuration instance.
*
- * @param profileId Unique profile identifier.
+ * @param profileId unique profile identifier
*/
- public OAuth2TokenIntrospectionConfiguration(@Nonnull @NotEmpty final String profileId) {
+ public OIDCTokenConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/AllowPKCEPlainPredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/AllowPKCEPlainPredicate.java
index 440886c..9862e83 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/AllowPKCEPlainPredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/AllowPKCEPlainPredicate.java
@@ -24,11 +24,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
* A predicate implementation that forwards to
- * {@link OIDCCoreProtocolConfiguration#isAllowPKCEPlain(ProfileRequestContext)}.
+ * {@link OIDCAuthorizationConfiguration#isAllowPKCEPlain(ProfileRequestContext)}.
*/
public class AllowPKCEPlainPredicate extends AbstractRelyingPartyPredicate {
@@ -37,8 +37,8 @@ public class AllowPKCEPlainPredicate extends AbstractRelyingPartyPredicate {
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof OIDCCoreProtocolConfiguration) {
- return ((OIDCCoreProtocolConfiguration) pc).isAllowPKCEPlain(input);
+ if (pc != null && pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration) pc).isAllowPKCEPlain(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/AuthorizationCodeFlowEnabledPredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/AuthorizationCodeFlowEnabledPredicate.java
index bea2fa8..7517f6b 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/AuthorizationCodeFlowEnabledPredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/AuthorizationCodeFlowEnabledPredicate.java
@@ -24,11 +24,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.AbstractOIDCFlowAwareProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.AbstractOAuth2FlowAwareProfileConfiguration;
/**
* A predicate implementation that forwards to {@link
- * AbstractOIDCFlowAwareProfileConfiguration#isAuthorizationCodeFlowEnabled(ProfileRequestContext)}.
+ * AbstractOAuth2FlowAwareProfileConfiguration#isAuthorizationCodeFlowEnabled(ProfileRequestContext)}.
*/
public class AuthorizationCodeFlowEnabledPredicate extends AbstractRelyingPartyPredicate {
@@ -37,8 +37,8 @@ public class AuthorizationCodeFlowEnabledPredicate extends AbstractRelyingPartyP
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof AbstractOIDCFlowAwareProfileConfiguration) {
- return ((AbstractOIDCFlowAwareProfileConfiguration) pc).isAuthorizationCodeFlowEnabled(input);
+ if (pc != null && pc instanceof AbstractOAuth2FlowAwareProfileConfiguration) {
+ return ((AbstractOAuth2FlowAwareProfileConfiguration) pc).isAuthorizationCodeFlowEnabled(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncodeConsentPredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncodeConsentPredicate.java
index 838ef47..c999b78 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncodeConsentPredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncodeConsentPredicate.java
@@ -24,11 +24,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
* A predicate implementation that forwards to
- * {@link OIDCCoreProtocolConfiguration#isEncodeConsentInTokens(ProfileRequestContext)}.
+ * {@link OIDCAuthorizationConfiguration#isEncodeConsentInTokens(ProfileRequestContext)}.
*/
public class EncodeConsentPredicate extends AbstractRelyingPartyPredicate {
@@ -37,8 +37,8 @@ public class EncodeConsentPredicate extends AbstractRelyingPartyPredicate {
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof OIDCCoreProtocolConfiguration) {
- return ((OIDCCoreProtocolConfiguration) pc).isEncodeConsentInTokens(input);
+ if (pc != null && pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration) pc).isEncodeConsentInTokens(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/ForcePKCEPredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/ForcePKCEPredicate.java
index 8cdf6e3..8798ffe 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/ForcePKCEPredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/ForcePKCEPredicate.java
@@ -24,10 +24,10 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
- * A predicate implementation that forwards to {@link OIDCCoreProtocolConfiguration#isForcePKCE(ProfileRequestContext)}.
+ * A predicate implementation that forwards to {@link OIDCAuthorizationConfiguration#isForcePKCE(ProfileRequestContext)}.
*/
public class ForcePKCEPredicate extends AbstractRelyingPartyPredicate {
@@ -36,8 +36,8 @@ public class ForcePKCEPredicate extends AbstractRelyingPartyPredicate {
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof OIDCCoreProtocolConfiguration) {
- return ((OIDCCoreProtocolConfiguration) pc).isForcePKCE(input);
+ if (pc != null && pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration) pc).isForcePKCE(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/HybridFlowEnabledPredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/HybridFlowEnabledPredicate.java
index 61d3fa8..60886fe 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/HybridFlowEnabledPredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/HybridFlowEnabledPredicate.java
@@ -24,11 +24,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.AbstractOIDCFlowAwareProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.AbstractOAuth2FlowAwareProfileConfiguration;
/**
* A predicate implementation that forwards to
- * {@link AbstractOIDCFlowAwareProfileConfiguration#isHybridFlowEnabled(ProfileRequestContext)}.
+ * {@link AbstractOAuth2FlowAwareProfileConfiguration#isHybridFlowEnabled(ProfileRequestContext)}.
*/
public class HybridFlowEnabledPredicate extends AbstractRelyingPartyPredicate {
@@ -37,8 +37,8 @@ public class HybridFlowEnabledPredicate extends AbstractRelyingPartyPredicate {
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof AbstractOIDCFlowAwareProfileConfiguration) {
- return ((AbstractOIDCFlowAwareProfileConfiguration) pc).isHybridFlowEnabled(input);
+ if (pc != null && pc instanceof AbstractOAuth2FlowAwareProfileConfiguration) {
+ return ((AbstractOAuth2FlowAwareProfileConfiguration) pc).isHybridFlowEnabled(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/ImplicitFlowEnabledPredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/ImplicitFlowEnabledPredicate.java
index c4619a0..fd99011 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/ImplicitFlowEnabledPredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/ImplicitFlowEnabledPredicate.java
@@ -24,11 +24,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.AbstractOIDCFlowAwareProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.AbstractOAuth2FlowAwareProfileConfiguration;
/**
* A predicate implementation that forwards to
- * {@link AbstractOIDCFlowAwareProfileConfiguration#isImplicitFlowEnabled(ProfileRequestContext)}.
+ * {@link AbstractOAuth2FlowAwareProfileConfiguration#isImplicitFlowEnabled(ProfileRequestContext)}.
*/
public class ImplicitFlowEnabledPredicate extends AbstractRelyingPartyPredicate {
@@ -37,8 +37,8 @@ public class ImplicitFlowEnabledPredicate extends AbstractRelyingPartyPredicate
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof AbstractOIDCFlowAwareProfileConfiguration) {
- return ((AbstractOIDCFlowAwareProfileConfiguration) pc).isImplicitFlowEnabled(input);
+ if (pc != null && pc instanceof AbstractOAuth2FlowAwareProfileConfiguration) {
+ return ((AbstractOAuth2FlowAwareProfileConfiguration) pc).isImplicitFlowEnabled(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/RefreshTokensEnabledPredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/RefreshTokensEnabledPredicate.java
index 5a781b2..29413b9 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/RefreshTokensEnabledPredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/RefreshTokensEnabledPredicate.java
@@ -24,11 +24,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.AbstractOIDCFlowAwareProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.AbstractOAuth2FlowAwareProfileConfiguration;
/**
* A predicate implementation that forwards to
- * {@link AbstractOIDCFlowAwareProfileConfiguration#isRefreshTokensEnabled(ProfileRequestContext)}.
+ * {@link AbstractOAuth2FlowAwareProfileConfiguration#isRefreshTokensEnabled(ProfileRequestContext)}.
*/
public class RefreshTokensEnabledPredicate extends AbstractRelyingPartyPredicate {
@@ -37,8 +37,8 @@ public class RefreshTokensEnabledPredicate extends AbstractRelyingPartyPredicate
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof AbstractOIDCFlowAwareProfileConfiguration) {
- return ((AbstractOIDCFlowAwareProfileConfiguration) pc).isRefreshTokensEnabled(input);
+ if (pc != null && pc instanceof AbstractOAuth2FlowAwareProfileConfiguration) {
+ return ((AbstractOAuth2FlowAwareProfileConfiguration) pc).isRefreshTokensEnabled(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenLifetimeLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenLifetimeLookupFunction.java
index 74f2350..7a168e6 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenLifetimeLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenLifetimeLookupFunction.java
@@ -26,11 +26,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
* A function that returns
- * {@link OIDCCoreProtocolConfiguration#getAccessTokenLifetime(ProfileRequestContext)}
+ * {@link OIDCAuthorizationConfiguration#getAccessTokenLifetime(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -43,8 +43,8 @@ public class AccessTokenLifetimeLookupFunction extends AbstractRelyingPartyLooku
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof OIDCCoreProtocolConfiguration) {
- return ((OIDCCoreProtocolConfiguration) pc).getAccessTokenLifetime(input);
+ if (pc != null && pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration) pc).getAccessTokenLifetime(input);
}
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java
index 5afddcf..503a792 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java
@@ -24,10 +24,10 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
- * A predicate that returns {@link OIDCCoreProtocolConfiguration#isAcrRequestAlwaysEssential(ProfileRequestContext)}
+ * A predicate that returns {@link OIDCAuthorizationConfiguration#isAcrRequestAlwaysEssential(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function, by default a child
* of the {@link ProfileRequestContext}.
*
@@ -43,8 +43,8 @@ public class AcrClaimAlwaysEssentialLookupFunction extends AbstractRelyingPartyP
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof OIDCCoreProtocolConfiguration) {
- return ((OIDCCoreProtocolConfiguration) pc).isAcrRequestAlwaysEssential(input);
+ if (pc != null && pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration) pc).isAcrRequestAlwaysEssential(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AlwaysIncludedAttributesLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AlwaysIncludedAttributesLookupFunction.java
index bd81da7..b5a9be2 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AlwaysIncludedAttributesLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AlwaysIncludedAttributesLookupFunction.java
@@ -26,11 +26,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
* A function that obtains
- * {@link OIDCCoreProtocolConfiguration#getAlwaysIncludedAttributes(ProfileRequestContext)}
+ * {@link OIDCAuthorizationConfiguration#getAlwaysIncludedAttributes(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -44,8 +44,8 @@ public class AlwaysIncludedAttributesLookupFunction
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof OIDCCoreProtocolConfiguration) {
- return ((OIDCCoreProtocolConfiguration)pc).getAlwaysIncludedAttributes(input);
+ if (pc != null && pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration)pc).getAlwaysIncludedAttributes(input);
}
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AudienceRestrictionsLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AudienceRestrictionsLookupFunction.java
index a119e64..0291139 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AudienceRestrictionsLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AudienceRestrictionsLookupFunction.java
@@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableCollection.Builder;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
@@ -38,7 +38,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
/**
* A function that returns the effective audience restrictions to include in ID tokens, based on combining a relying
* party's entityID with the result of
- * {@link OIDCCoreProtocolConfiguration#getAdditionalAudiencesForIdToken(ProfileRequestContext)}, if such
+ * {@link OIDCAuthorizationConfiguration#getAdditionalAudiencesForIdToken(ProfileRequestContext)}, if such
* a profile is available from a {@link RelyingPartyContext} obtained via a lookup function, by default a child of the
* {@link ProfileRequestContext}.
*
@@ -55,13 +55,13 @@ public class AudienceRestrictionsLookupFunction extends AbstractRelyingPartyLook
if (rpc != null) {
final String id = rpc.getRelyingPartyId();
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof OIDCCoreProtocolConfiguration
- && !((OIDCCoreProtocolConfiguration) pc).getAdditionalAudiencesForIdToken(input).isEmpty()) {
+ if (pc != null && pc instanceof OIDCAuthorizationConfiguration
+ && !((OIDCAuthorizationConfiguration) pc).getAdditionalAudiencesForIdToken(input).isEmpty()) {
final Builder<String> builder = ImmutableList.builder();
if (id != null) {
builder.add(rpc.getRelyingPartyId());
}
- builder.addAll(((OIDCCoreProtocolConfiguration) pc).getAdditionalAudiencesForIdToken(input));
+ builder.addAll(((OIDCAuthorizationConfiguration) pc).getAdditionalAudiencesForIdToken(input));
return builder.build();
} else if (id != null) {
return Collections.singletonList(rpc.getRelyingPartyId());
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AuthzCodeLifetimeLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AuthzCodeLifetimeLookupFunction.java
index 019f9b6..0c789be 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AuthzCodeLifetimeLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AuthzCodeLifetimeLookupFunction.java
@@ -26,11 +26,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
* A function that returns
- * {@link OIDCCoreProtocolConfiguration#getAuthorizeCodeLifetime(ProfileRequestContext)}
+ * {@link OIDCAuthorizationConfiguration#getAuthorizeCodeLifetime(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -43,8 +43,8 @@ public class AuthzCodeLifetimeLookupFunction extends AbstractRelyingPartyLookupF
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof OIDCCoreProtocolConfiguration) {
- return ((OIDCCoreProtocolConfiguration) pc).getAuthorizeCodeLifetime(input);
+ if (pc != null && pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration) pc).getAuthorizeCodeLifetime(input);
}
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/DeniedUserInfoAttributesLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/DeniedUserInfoAttributesLookupFunction.java
index 642d1e2..0f1bf25 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/DeniedUserInfoAttributesLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/DeniedUserInfoAttributesLookupFunction.java
@@ -26,12 +26,12 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
import net.shibboleth.oidc.profile.config.OIDCUserInfoConfiguration;
/**
* A function that obtains
- * {@link OIDCCoreProtocolConfiguration#getDeniedUserInfoAttributes(ProfileRequestContext)} or
+ * {@link OIDCAuthorizationConfiguration#getDeniedUserInfoAttributes(ProfileRequestContext)} or
* {@link OIDCUserInfoConfiguration#getDeniedUserInfoAttributes(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
@@ -46,8 +46,8 @@ public class DeniedUserInfoAttributesLookupFunction
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OIDCCoreProtocolConfiguration) {
- return ((OIDCCoreProtocolConfiguration)pc).getDeniedUserInfoAttributes(input);
+ if (pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration)pc).getDeniedUserInfoAttributes(input);
} else if (pc instanceof OIDCUserInfoConfiguration) {
return ((OIDCUserInfoConfiguration) pc).getDeniedUserInfoAttributes(input);
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/EncodedAttributesLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/EncodedAttributesLookupFunction.java
index bdd0645..b9a6c81 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/EncodedAttributesLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/EncodedAttributesLookupFunction.java
@@ -26,11 +26,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
* A function that obtains
- * {@link OIDCCoreProtocolConfiguration#getEncodedAttributes(ProfileRequestContext)}
+ * {@link OIDCAuthorizationConfiguration#getEncodedAttributes(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -44,8 +44,8 @@ public class EncodedAttributesLookupFunction
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof OIDCCoreProtocolConfiguration) {
- return ((OIDCCoreProtocolConfiguration)pc).getEncodedAttributes(input);
+ if (pc != null && pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration)pc).getEncodedAttributes(input);
}
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/IDTokenLifetimeLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/IDTokenLifetimeLookupFunction.java
index f386921..6d2d45b 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/IDTokenLifetimeLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/IDTokenLifetimeLookupFunction.java
@@ -26,11 +26,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
* A function that returns
- * {@link OIDCCoreProtocolConfiguration#getIDTokenLifetime(ProfileRequestContext)}
+ * {@link OIDCAuthorizationConfiguration#getIDTokenLifetime(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -43,8 +43,8 @@ public class IDTokenLifetimeLookupFunction extends AbstractRelyingPartyLookupFun
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof OIDCCoreProtocolConfiguration) {
- return ((OIDCCoreProtocolConfiguration) pc).getIDTokenLifetime(input);
+ if (pc != null && pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration) pc).getIDTokenLifetime(input);
}
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RefreshTokenLifetimeLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RefreshTokenLifetimeLookupFunction.java
index bd1df72..ccc9459 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RefreshTokenLifetimeLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RefreshTokenLifetimeLookupFunction.java
@@ -26,11 +26,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCCoreProtocolConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
* A function that returns
- * {@link OIDCCoreProtocolConfiguration#getRefreshTokenLifetime(ProfileRequestContext)}
+ * {@link OIDCAuthorizationConfiguration#getRefreshTokenLifetime(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -43,8 +43,8 @@ public class RefreshTokenLifetimeLookupFunction extends AbstractRelyingPartyLook
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof OIDCCoreProtocolConfiguration) {
- return ((OIDCCoreProtocolConfiguration) pc).getRefreshTokenLifetime(input);
+ if (pc != null && pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration) pc).getRefreshTokenLifetime(input);
}
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/TokenEndpointAuthMethodLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/TokenEndpointAuthMethodLookupFunction.java
index edda587..128c82b 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/TokenEndpointAuthMethodLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/TokenEndpointAuthMethodLookupFunction.java
@@ -30,11 +30,11 @@ import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.AbstractOIDCClientAuthenticableProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.AbstractOAuth2ClientAuthenticableProfileConfiguration;
/**
* A function that obtains
- * {@link AbstractOIDCClientAuthenticableProfileConfiguration#getTokenEndpointAuthMethods(ProfileRequestContext)}
+ * {@link AbstractOAuth2ClientAuthenticableProfileConfiguration#getTokenEndpointAuthMethods(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}. That result is then transformed into a list
* of {@link ClientAuthenticationMethod}s.
@@ -49,10 +49,10 @@ public class TokenEndpointAuthMethodLookupFunction
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc != null && pc instanceof AbstractOIDCClientAuthenticableProfileConfiguration) {
+ if (pc != null && pc instanceof AbstractOAuth2ClientAuthenticableProfileConfiguration) {
final Collection<String> methods =
- ((AbstractOIDCClientAuthenticableProfileConfiguration)pc).getTokenEndpointAuthMethods(input);
+ ((AbstractOAuth2ClientAuthenticableProfileConfiguration)pc).getTokenEndpointAuthMethods(input);
if (methods != null) {
return methods
.stream()
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/AbstractOIDCClientAuthenticableProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
similarity index 91%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/AbstractOIDCClientAuthenticableProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
index 88abf13..d26fcc8 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/AbstractOIDCClientAuthenticableProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.profile.config;
+package net.shibboleth.oidc.profile.oauth2.config;
import java.util.Collection;
import java.util.Collections;
@@ -39,10 +39,10 @@ import net.shibboleth.utilities.java.support.logic.FunctionSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
- * Base class for OIDC protocol configuration, containing configuration bit for setting client authentication methods.
+ * Base class for OAuth profile configurations that support OAuth-defined client authentication methods.
*/
-public abstract class AbstractOIDCClientAuthenticableProfileConfiguration
- extends AbstractConditionalProfileConfiguration implements OIDCProfileConfiguration {
+public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
+ extends AbstractConditionalProfileConfiguration implements OAuth2ProfileConfiguration {
/** Enabled token endpoint authentication methods. */
@Nonnull private Function<ProfileRequestContext,Collection<String>> tokenEndpointAuthMethodsLookupStrategy;
@@ -52,7 +52,7 @@ public abstract class AbstractOIDCClientAuthenticableProfileConfiguration
*
* @param profileId Unique profile identifier
*/
- protected AbstractOIDCClientAuthenticableProfileConfiguration(@Nonnull @NotEmpty final String profileId) {
+ protected AbstractOAuth2ClientAuthenticableProfileConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
setTokenEndpointAuthMethods(
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/AbstractOIDCFlowAwareProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2FlowAwareProfileConfiguration.java
similarity index 96%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/AbstractOIDCFlowAwareProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2FlowAwareProfileConfiguration.java
index 858f551..2fadc96 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/AbstractOIDCFlowAwareProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/AbstractOAuth2FlowAwareProfileConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.profile.config;
+package net.shibboleth.oidc.profile.oauth2.config;
import java.util.function.Predicate;
@@ -32,8 +32,8 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
* Base class for OIDC protocol configuration, containing configuration bits shared by all flow aware OIDC protocol
* configurations.
*/
-public abstract class AbstractOIDCFlowAwareProfileConfiguration
- extends AbstractOIDCClientAuthenticableProfileConfiguration {
+public abstract class AbstractOAuth2FlowAwareProfileConfiguration
+ extends AbstractOAuth2ClientAuthenticableProfileConfiguration {
/** Predicate used to indicate whether authorization code flow is supported by this profile. Default true. */
@Nonnull private Predicate<ProfileRequestContext> authorizationCodeFlowPredicate;
@@ -52,7 +52,7 @@ public abstract class AbstractOIDCFlowAwareProfileConfiguration
*
* @param profileId Unique profile identifier.
*/
- protected AbstractOIDCFlowAwareProfileConfiguration(final String profileId) {
+ protected AbstractOAuth2FlowAwareProfileConfiguration(final String profileId) {
super(profileId);
authorizationCodeFlowPredicate = Predicates.alwaysTrue();
implicitFlowPredicate = Predicates.alwaysTrue();
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2ProfileConfiguration.java
similarity index 83%
copy from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProfileConfiguration.java
copy to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2ProfileConfiguration.java
index b396dc9..8ed01c0 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2ProfileConfiguration.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.profile.config;
+package net.shibboleth.oidc.profile.oauth2.config;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
/**
- * Marker interface for OIDC profile configurations.
+ * Marker interface for OAuth 2 profile configurations.
*/
-public interface OIDCProfileConfiguration extends ProfileConfiguration {
+public interface OAuth2ProfileConfiguration extends ProfileConfiguration {
}
\ No newline at end of file
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
index 2ba5d8f..e8211cb 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
@@ -19,13 +19,12 @@ package net.shibboleth.oidc.profile.oauth2.config;
import javax.annotation.Nonnull;
-import net.shibboleth.oidc.profile.config.AbstractOIDCClientAuthenticableProfileConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
* Profile configuration for the OAuth2 Token Introspection.
*/
-public class OAuth2TokenIntrospectionConfiguration extends AbstractOIDCClientAuthenticableProfileConfiguration {
+public class OAuth2TokenIntrospectionConfiguration extends AbstractOAuth2ClientAuthenticableProfileConfiguration {
/** OAuth2 Token Revocation URI. */
public static final String PROTOCOL_URI = "https://tools.ietf.org/html/rfc7662";
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationConfiguration.java
index 0786ceb..bbba892 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationConfiguration.java
@@ -19,14 +19,13 @@ package net.shibboleth.oidc.profile.oauth2.config;
import javax.annotation.Nonnull;
-import net.shibboleth.oidc.profile.config.AbstractOIDCClientAuthenticableProfileConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
* Profile configuration for the OAuth2 Token Revocation. The profile is required to define client authentication
* methods.
*/
-public class OAuth2TokenRevocationConfiguration extends AbstractOIDCClientAuthenticableProfileConfiguration {
+public class OAuth2TokenRevocationConfiguration extends AbstractOAuth2ClientAuthenticableProfileConfiguration {
/** OAuth2 Token Revocation URI. */
public static final String PROTOCOL_URI = "https://tools.ietf.org/html/rfc7009";
diff --git a/oidc-common-profile-api/src/test/java/net/shibboleth/oidc/profile/config/OIDCCoreProtocolConfigurationTest.java b/oidc-common-profile-api/src/test/java/net/shibboleth/oidc/profile/config/OIDCCoreProtocolConfigurationTest.java
index a7683e4..4ff72fd 100644
--- a/oidc-common-profile-api/src/test/java/net/shibboleth/oidc/profile/config/OIDCCoreProtocolConfigurationTest.java
+++ b/oidc-common-profile-api/src/test/java/net/shibboleth/oidc/profile/config/OIDCCoreProtocolConfigurationTest.java
@@ -29,22 +29,22 @@ import net.shibboleth.oidc.authn.principal.AuthenticationContextClassReferencePr
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * Unit tests for {@link OIDCCoreProtocolConfiguration}.
+ * Unit tests for {@link OIDCAuthorizationConfiguration}.
*/
public class OIDCCoreProtocolConfigurationTest {
- private OIDCCoreProtocolConfiguration config;
+ private OIDCAuthorizationConfiguration config;
@BeforeMethod
protected void setUp() throws Exception {
- config = new OIDCCoreProtocolConfiguration();
+ config = new OIDCAuthorizationConfiguration();
config.setSecurityConfiguration(new SecurityConfiguration());
config.initialize();
}
@Test
public void testInitialState() throws ComponentInitializationException {
- Assert.assertEquals(config.getId(), OIDCCoreProtocolConfiguration.PROFILE_ID);
+ Assert.assertEquals(config.getId(), OIDCAuthorizationConfiguration.PROFILE_ID);
Assert.assertTrue(config.getAuthenticationFlows(null).isEmpty());
Assert.assertTrue(config.getPostAuthenticationFlows(null).isEmpty());
Assert.assertTrue(config.getDefaultAuthenticationMethods(null).isEmpty());
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list