[java-oidc-common] 06/06: JCOMOIDC-66 - Review ProfileConfiguration interfaces and concrete classes
Phil Smart
philip.smart at jisc.ac.uk
Mon Apr 17 16:38:35 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch dev/JCOMOIDC-66
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=c8c23044ad374ee5d86f054e976a4196e81725c4
commit c8c23044ad374ee5d86f054e976a4196e81725c4
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Apr 17 17:37:59 2023 +0100
JCOMOIDC-66 - Review ProfileConfiguration interfaces and concrete
classes
- Rename and move Token Encryption profile configuration
https://shibboleth.atlassian.net/browse/JCOMOIDC-66
---
.../context/OAuth2ClientAuthenticationContext.java | 24 ++++++++++++++++++++--
.../config/OIDCSSOProviderConfiguration.java | 3 ++-
.../config/OIDCSSORelyingPartyConfiguration.java | 3 ++-
.../profile/config/OIDCUserInfoConfiguration.java | 3 ++-
.../config/logic/EncryptionOptionalPredicate.java | 6 +++---
.../config/OAuth2TokenAudienceConfiguration.java | 3 +--
...OAuth2TokenEncryptionProfileConfiguration.java} | 6 ++++--
7 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/authn/context/OAuth2ClientAuthenticationContext.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/authn/context/OAuth2ClientAuthenticationContext.java
index 7699f78..f70cc18 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/authn/context/OAuth2ClientAuthenticationContext.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/authn/context/OAuth2ClientAuthenticationContext.java
@@ -22,18 +22,20 @@ import javax.annotation.Nullable;
import org.opensaml.messaging.context.BaseContext;
+import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
/**
* A context containing data about OAuth 2.0 client authentication.
- *
- * <p>Currently implemented using Nimbus APIs.</p>
*/
public final class OAuth2ClientAuthenticationContext extends BaseContext {
/** Client authentication abstraction. */
@Nullable private ClientAuthentication clientAuthentication;
+ /** The claims set of a client_secret_jwt claims type. Ready to be signed.*/
+ @Nullable private JWTClaimsSet clientSecretJwtClaims;
+
/**
* Get the OAuth 2 client authentication credentials.
*
@@ -55,5 +57,23 @@ public final class OAuth2ClientAuthenticationContext extends BaseContext {
clientAuthentication = creds;
return this;
}
+
+ /**
+ * Get the claims that will be used to build the client_secret_jwt.
+ *
+ * @return the client_secret_jwt claims
+ */
+ @Nullable public JWTClaimsSet getClientSecretJwtClaims() {
+ return clientSecretJwtClaims;
+ }
+
+ /**
+ * Set the claims that will be used to build the client_secret_jwt.
+ *
+ * @param jwt the claims
+ */
+ public void setClientSecretJwtClaims(@Nullable final JWTClaimsSet jwt) {
+ clientSecretJwtClaims = jwt;
+ }
}
\ No newline at end of file
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProviderConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProviderConfiguration.java
index b0aaa28..9b58ff6 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProviderConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProviderConfiguration.java
@@ -21,11 +21,12 @@ import net.shibboleth.idp.profile.config.AttributeResolvingProfileConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2AccessTokenProducingProfileConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2ClientAuthenticableProfileConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2RefreshTokenProducingProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenEncryptionProfileConfiguration;
/**
* Profile configuration for an OIDC SSO Provider.
*/
-public interface OIDCSSOProviderConfiguration extends OIDCTokenEncryptionProfileConfiguration,
+public interface OIDCSSOProviderConfiguration extends OAuth2TokenEncryptionProfileConfiguration,
OIDCIDTokenProducingProfileConfiguration, OAuth2AccessTokenProducingProfileConfiguration,
OAuth2RefreshTokenProducingProfileConfiguration, OIDCSSOProfileConfiguration,
AttributeResolvingProfileConfiguration, OIDCFlowAwareProfileConfiguration,
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSORelyingPartyConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSORelyingPartyConfiguration.java
index e17d9f4..588760e 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSORelyingPartyConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSORelyingPartyConfiguration.java
@@ -19,11 +19,12 @@ package net.shibboleth.oidc.profile.config;
import net.shibboleth.idp.profile.config.OverriddenIssuerProfileConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2ClientAuthenticableProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenEncryptionProfileConfiguration;
/**
* Profile configuration for an OIDC SSO Client or Relying Party.
*/
-public interface OIDCSSORelyingPartyConfiguration extends OIDCTokenEncryptionProfileConfiguration,
+public interface OIDCSSORelyingPartyConfiguration extends OAuth2TokenEncryptionProfileConfiguration,
OverriddenIssuerProfileConfiguration, OIDCFlowAwareProfileConfiguration,
OAuth2ClientAuthenticableProfileConfiguration {
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoConfiguration.java
index 457228d..9372ca2 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoConfiguration.java
@@ -25,6 +25,7 @@ import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.AttributeResolvingProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenEncryptionProfileConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenValidatingProfileConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -34,7 +35,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
* Configuration for an OpenID Connect core protocol UserInfo endpoint.
*/
public interface OIDCUserInfoConfiguration extends AttributeResolvingProfileConfiguration,
- OIDCTokenEncryptionProfileConfiguration, OAuth2TokenValidatingProfileConfiguration {
+ OAuth2TokenEncryptionProfileConfiguration, OAuth2TokenValidatingProfileConfiguration {
/** OIDC base protocol URI. */
@Nonnull @NotEmpty public static final String PROTOCOL_URI = "http://openid.net/specs/openid-connect-core-1_0.html";
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncryptionOptionalPredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncryptionOptionalPredicate.java
index 820986d..586bc10 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncryptionOptionalPredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncryptionOptionalPredicate.java
@@ -24,7 +24,7 @@ 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.OIDCTokenEncryptionProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenEncryptionProfileConfiguration;
/**
* A predicate implementation that forwards to
@@ -38,8 +38,8 @@ public class EncryptionOptionalPredicate extends AbstractRelyingPartyPredicate {
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OIDCTokenEncryptionProfileConfiguration) {
- return ((OIDCTokenEncryptionProfileConfiguration) pc).isEncryptionOptional(input);
+ if (pc instanceof OAuth2TokenEncryptionProfileConfiguration) {
+ return ((OAuth2TokenEncryptionProfileConfiguration) pc).isEncryptionOptional(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceConfiguration.java
index fbb124d..0cc0f36 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceConfiguration.java
@@ -21,7 +21,6 @@ import javax.annotation.Nonnull;
import net.shibboleth.idp.profile.config.AttributeResolvingProfileConfiguration;
import net.shibboleth.idp.profile.config.OverriddenIssuerProfileConfiguration;
-import net.shibboleth.oidc.profile.config.OIDCTokenEncryptionProfileConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
@@ -30,7 +29,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
* <p>This applies to behaviour controlling the characteristics of tokens issued
* to the parties intended to process them, as distinct from the clients that use them.</p>
*/
-public interface OAuth2TokenAudienceConfiguration extends OIDCTokenEncryptionProfileConfiguration,
+public interface OAuth2TokenAudienceConfiguration extends OAuth2TokenEncryptionProfileConfiguration,
OverriddenIssuerProfileConfiguration, OAuth2AccessTokenProducingProfileConfiguration,
AttributeResolvingProfileConfiguration {
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCTokenEncryptionProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenEncryptionProfileConfiguration.java
similarity index 86%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCTokenEncryptionProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenEncryptionProfileConfiguration.java
index b46cbf8..e2330a5 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCTokenEncryptionProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenEncryptionProfileConfiguration.java
@@ -15,16 +15,18 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.profile.config;
+package net.shibboleth.oidc.profile.oauth2.config;
import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
+import net.shibboleth.oidc.profile.config.OIDCProfileConfiguration;
+
/**
* Profile configuration for token endpoints that deal with encryption.
*/
-public interface OIDCTokenEncryptionProfileConfiguration extends OIDCProfileConfiguration {
+public interface OAuth2TokenEncryptionProfileConfiguration extends OIDCProfileConfiguration {
/**
* Get whether encryption is optional in the face of a missing key, etc.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list