[java-oidc-common] branch dev/JCOMOIDC-41 updated: Rename JWT signature validation config and remove generics
Phil Smart
philip.smart at jisc.ac.uk
Wed Sep 21 10:57:23 UTC 2022
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch dev/JCOMOIDC-41
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=836bbca105bcfb93d53858260a72fcfa54899cef
The following commit(s) were added to refs/heads/dev/JCOMOIDC-41 by this push:
new 836bbca Rename JWT signature validation config and remove generics
836bbca is described below
commit 836bbca105bcfb93d53858260a72fcfa54899cef
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Sep 21 11:57:17 2022 +0100
Rename JWT signature validation config and remove generics
---
...va => JWTSignatureValidationConfiguration.java} | 10 +++---
...TSignatureValidationConfigurationCriterion.java | 12 +++----
.../BasicSignatureValidationConfiguration.java | 25 +++++++-------
...ationSignatureValidationParametersResolver.java | 4 +--
.../PopulateJWTSignatureValidationParameters.java | 10 +++---
...ateJWTSignatureValidationParametersHandler.java | 12 +++----
.../config/OIDCAuthorizationConfiguration.java | 23 +++++++++++++
.../profile/config/OIDCSecurityConfiguration.java | 40 ++++++++++------------
.../impl/AbstractClaimsSetAuditExtractor.java | 2 +-
.../encoder/impl/HTTPPostAuthnRequestEncoder.java | 1 -
10 files changed, 79 insertions(+), 60 deletions(-)
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/SignatureValidationConfiguration.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationConfiguration.java
similarity index 82%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/SignatureValidationConfiguration.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationConfiguration.java
index d708034..6d349ea 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/SignatureValidationConfiguration.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationConfiguration.java
@@ -22,18 +22,18 @@ import javax.annotation.Nullable;
import org.opensaml.security.trust.TrustEngine;
import org.opensaml.xmlsec.AlgorithmPolicyConfiguration;
+import com.nimbusds.jwt.SignedJWT;
+
/**
- * The configuration information to use when validating a signature.
- *
- * @param <T> the token type to validate
+ * The configuration information to use when validating a JWT signature.
*/
-public interface SignatureValidationConfiguration<T> extends AlgorithmPolicyConfiguration {
+public interface JWTSignatureValidationConfiguration extends AlgorithmPolicyConfiguration {
/**
* Get the signature trust engine to use.
*
* @return the signature trust engine
*/
- @Nullable public TrustEngine<T> getSignatureTrustEngine();
+ @Nullable public TrustEngine<SignedJWT> getSignatureTrustEngine();
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureValidationConfigurationCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureValidationConfigurationCriterion.java
index 8e8c34a..2d5c9f6 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureValidationConfigurationCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureValidationConfigurationCriterion.java
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import com.nimbusds.jwt.SignedJWT;
-import net.shibboleth.oidc.security.SignatureValidationConfiguration;
+import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -32,13 +32,13 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.Criterion;
/**
- * Criterion which holds one or more instances of {@link SignatureValidationConfiguration}
+ * Criterion which holds one or more instances of {@link JWTSignatureValidationConfiguration}
* for {@link SignedJWT signed JWTs}.
*/
public class JWTSignatureValidationConfigurationCriterion implements Criterion {
/** The list of configuration instances. */
- @Nonnull @NonnullElements private final List<SignatureValidationConfiguration<SignedJWT>> configs;
+ @Nonnull @NonnullElements private final List<JWTSignatureValidationConfiguration> configs;
/**
* Constructor.
@@ -46,7 +46,7 @@ public class JWTSignatureValidationConfigurationCriterion implements Criterion {
* @param configurations list of configuration instances
*/
public JWTSignatureValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
- List<SignatureValidationConfiguration<SignedJWT>> configurations) {
+ List<JWTSignatureValidationConfiguration> configurations) {
configs = List.copyOf(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -58,7 +58,7 @@ public class JWTSignatureValidationConfigurationCriterion implements Criterion {
* @param configurations varargs array of configuration instances
*/
public JWTSignatureValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
- SignatureValidationConfiguration<SignedJWT>... configurations) {
+ JWTSignatureValidationConfiguration... configurations) {
configs = List.of(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
}
@@ -68,7 +68,7 @@ public class JWTSignatureValidationConfigurationCriterion implements Criterion {
* @return the list of configuration instances
*/
@Nonnull @NonnullElements @NotLive @Unmodifiable @NotEmpty
- public List<SignatureValidationConfiguration<SignedJWT>> getConfigurations() {
+ public List<JWTSignatureValidationConfiguration> getConfigurations() {
return configs;
}
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicSignatureValidationConfiguration.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicSignatureValidationConfiguration.java
index b3f3856..b064df7 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicSignatureValidationConfiguration.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicSignatureValidationConfiguration.java
@@ -20,28 +20,29 @@ package net.shibboleth.oidc.security.impl;
import javax.annotation.Nullable;
import org.opensaml.security.trust.TrustEngine;
-import org.opensaml.xmlsec.impl.BasicWhitelistBlacklistConfiguration;
+import org.opensaml.xmlsec.impl.BasicAlgorithmPolicyConfiguration;
-import net.shibboleth.oidc.security.SignatureValidationConfiguration;
+import com.nimbusds.jwt.SignedJWT;
+import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
-//TODO same as BasicSignatureValidationConfiguration. Needs to not be generic, but for JWT Trust Engine?
-public class BasicSignatureValidationConfiguration<T> extends BasicWhitelistBlacklistConfiguration
- implements SignatureValidationConfiguration<T> {
-
+
+/**
+ * Basic implementation of {@link JWTSignatureValidationConfiguration}.
+ */
+public class BasicSignatureValidationConfiguration extends BasicAlgorithmPolicyConfiguration
+ implements JWTSignatureValidationConfiguration {
/** The signature trust engine to use. */
- @Nullable private TrustEngine<T> signatureTrustEngine;
-
- //TODO chaining to parent config instance on getters? or use a wrapping proxy, etc?
-
+ @Nullable private TrustEngine<SignedJWT> signatureTrustEngine;
+
/**
* Get the signature trust engine to use.
*
* @return the signature trust engine
*/
@Override
- @Nullable public TrustEngine<T> getSignatureTrustEngine() {
+ @Nullable public TrustEngine<SignedJWT> getSignatureTrustEngine() {
return signatureTrustEngine;
}
@@ -50,7 +51,7 @@ public class BasicSignatureValidationConfiguration<T> extends BasicWhitelistBlac
*
* @param engine the signature trust engine
*/
- public void setSignatureTrustEngine(@Nullable final TrustEngine<T> engine) {
+ public void setSignatureTrustEngine(@Nullable final TrustEngine<SignedJWT> engine) {
signatureTrustEngine = engine;
}
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/OIDCProviderConfigurationSignatureValidationParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/OIDCProviderConfigurationSignatureValidationParametersResolver.java
index 294cf86..444cd34 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/OIDCProviderConfigurationSignatureValidationParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/OIDCProviderConfigurationSignatureValidationParametersResolver.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.jwt.SignedJWT;
-import net.shibboleth.oidc.security.SignatureValidationConfiguration;
+import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
import net.shibboleth.oidc.security.SignatureValidationParameters;
import net.shibboleth.oidc.security.SignatureValidationParametersResolver;
import net.shibboleth.oidc.security.criterion.JWTSignatureValidationConfigurationCriterion;
@@ -107,7 +107,7 @@ public class OIDCProviderConfigurationSignatureValidationParametersResolver
@Nullable
protected TrustEngine<SignedJWT> resolveSignatureTrustEngine(@Nonnull final CriteriaSet criteria) {
- for (final SignatureValidationConfiguration<SignedJWT> config : criteria
+ for (final JWTSignatureValidationConfiguration config : criteria
.get(JWTSignatureValidationConfigurationCriterion.class).getConfigurations()) {
if (config.getSignatureTrustEngine() != null) {
return config.getSignatureTrustEngine();
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/PopulateJWTSignatureValidationParameters.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/PopulateJWTSignatureValidationParameters.java
index 76266c6..aa959c6 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/PopulateJWTSignatureValidationParameters.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/PopulateJWTSignatureValidationParameters.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.jwt.SignedJWT;
-import net.shibboleth.oidc.security.SignatureValidationConfiguration;
+import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
import net.shibboleth.oidc.security.SignatureValidationParameters;
import net.shibboleth.oidc.security.SignatureValidationParametersResolver;
import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
@@ -61,9 +61,9 @@ public class PopulateJWTSignatureValidationParameters
/** Strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for. */
@Nonnull private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
- /** Strategy used to lookup a per-request {@link SignatureValidationConfiguration} list. */
+ /** Strategy used to lookup a per-request {@link JWTSignatureValidationConfiguration} list. */
@NonnullAfterInit
- private Function<ProfileRequestContext,List<SignatureValidationConfiguration<SignedJWT>>> configurationLookupStrategy;
+ private Function<ProfileRequestContext,List<JWTSignatureValidationConfiguration>> configurationLookupStrategy;
/** Resolver for parameters to store into context. */
@NonnullAfterInit private SignatureValidationParametersResolver<SignedJWT> resolver;
@@ -97,12 +97,12 @@ public class PopulateJWTSignatureValidationParameters
}
/**
- * Set the strategy used to look up a per-request {@link SignatureValidationConfiguration} list.
+ * Set the strategy used to look up a per-request {@link JWTSignatureValidationConfiguration} list.
*
* @param strategy lookup strategy
*/
public void setConfigurationLookupStrategy(
- @Nonnull final Function<ProfileRequestContext,List<SignatureValidationConfiguration<SignedJWT>>> strategy) {
+ @Nonnull final Function<ProfileRequestContext,List<JWTSignatureValidationConfiguration>> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
configurationLookupStrategy = Constraint.isNotNull(strategy,
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/PopulateJWTSignatureValidationParametersHandler.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/PopulateJWTSignatureValidationParametersHandler.java
index 17f6eee..2d99331 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/PopulateJWTSignatureValidationParametersHandler.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/PopulateJWTSignatureValidationParametersHandler.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.jwt.SignedJWT;
-import net.shibboleth.oidc.security.SignatureValidationConfiguration;
+import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
import net.shibboleth.oidc.security.SignatureValidationParameters;
import net.shibboleth.oidc.security.SignatureValidationParametersResolver;
import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
@@ -57,9 +57,9 @@ public class PopulateJWTSignatureValidationParametersHandler extends AbstractMes
/** Strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for. */
@Nonnull private Function<MessageContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
- /** Strategy used to lookup a per-request {@link SignatureValidationConfiguration} list. */
+ /** Strategy used to lookup a per-request {@link JWTSignatureValidationConfiguration} list. */
@NonnullAfterInit
- private Function<MessageContext,List<SignatureValidationConfiguration<SignedJWT>>> configurationLookupStrategy;
+ private Function<MessageContext,List<JWTSignatureValidationConfiguration>> configurationLookupStrategy;
/** Resolver for parameters to store into context. */
@NonnullAfterInit private SignatureValidationParametersResolver<SignedJWT> resolver;
@@ -86,12 +86,12 @@ public class PopulateJWTSignatureValidationParametersHandler extends AbstractMes
}
/**
- * Set the strategy used to look up a per-request {@link SignatureValidationConfiguration} list.
+ * Set the strategy used to look up a per-request {@link JWTSignatureValidationConfiguration} list.
*
* @param strategy lookup strategy
*/
public void setConfigurationLookupStrategy(
- @Nonnull final Function<MessageContext,List<SignatureValidationConfiguration<SignedJWT>>> strategy) {
+ @Nonnull final Function<MessageContext,List<JWTSignatureValidationConfiguration>> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
configurationLookupStrategy = Constraint.isNotNull(strategy,
@@ -129,7 +129,7 @@ public class PopulateJWTSignatureValidationParametersHandler extends AbstractMes
log.debug("{} Resolving SignatureValidationParameters for request", getLogPrefix());
- final List<SignatureValidationConfiguration<SignedJWT>> configs =
+ final List<JWTSignatureValidationConfiguration> configs =
configurationLookupStrategy.apply(messageContext);
if (configs == null || configs.isEmpty()) {
log.error("{} No SignatureValidationConfiguration returned by lookup strategy", getLogPrefix());
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
index 291b864..4087527 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
@@ -764,6 +764,15 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
return responseTypeLookupStrategy.apply(profileRequestContext);
}
+ /**
+ * Get the bi-function for manipulating authorization code claims set.
+ *
+ * @param profileRequestContext profile request context
+ *
+ * @return the bi-function for manipulating authorization code claims set
+ *
+ * @since 2.1.0
+ */
@Nonnull
public BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>>
getAuthorizationCodeClaimsSetManipulationStrategy(
@@ -782,6 +791,20 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
@Nullable final BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>> strategy) {
authorizationCodeClaimsSetManipulationStrategyLookupStrategy = FunctionSupport.constant(strategy);
}
+
+ /**
+ * Set a lookup strategy for the bi-function for manipulating authorization code claims set.
+ *
+ * @param strategy lookup strategy
+ *
+ * @since 2.1.0
+ */
+ public void setAuthorizationCodeClaimsSetManipulationStrategyLookupStrategy(@Nonnull final
+ Function<ProfileRequestContext,BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>>>
+ strategy) {
+ authorizationCodeClaimsSetManipulationStrategyLookupStrategy = Constraint.isNotNull(strategy,
+ "Lookup strategy cannot be null");
+ }
/**
* Set the lookup strategy to determine the scopes to use for authentication requests.
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfiguration.java
index 35e4e4b..35d0c66 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfiguration.java
@@ -22,21 +22,21 @@ import javax.annotation.Nullable;
import org.opensaml.xmlsec.EncryptionConfiguration;
import org.opensaml.xmlsec.SignatureSigningConfiguration;
-import com.nimbusds.jwt.SignedJWT;
-
import net.shibboleth.idp.profile.config.SecurityConfiguration;
+import net.shibboleth.oidc.security.JWTDecryptionConfiguration;
import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
+import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
/**
- * Class extends SecurityConfiguration to support separate configuration for request object decryption and signature
- * validation.
+ * Class extends SecurityConfiguration to support separate configuration for various encryption and signature
+ * validation operations.
*/
-//TODO split packages?
+//TODO split packages for SignatureValidationConfiguration?
public class OIDCSecurityConfiguration extends SecurityConfiguration {
/** Configuration used when decrypting request object information. */
- //TODO Used by OP only? but should be decrypt config
+ //TODO Used by OP only? but should be JWT decrypt config
@Nullable
private EncryptionConfiguration requestObjectDecryptConfig;
@@ -59,27 +59,26 @@ public class OIDCSecurityConfiguration extends SecurityConfiguration {
/** Configuration used when validating id_token JWT signatures. */
@Nullable
- private net.shibboleth.oidc.security.SignatureValidationConfiguration<SignedJWT> idTokenJwtSignatureValidationConfig;
+ private JWTSignatureValidationConfiguration idTokenJwtSignatureValidationConfig;
/** Configuration used when decrypting id_tokens. */
@Nullable
- private net.shibboleth.oidc.security.JWTDecryptionConfiguration idTokenJwtDecryptConfig;
+ private JWTDecryptionConfiguration idTokenJwtDecryptConfig;
/** Configuration used when decrypting UserInfo tokens. */
@Nullable
- private net.shibboleth.oidc.security.JWTDecryptionConfiguration userInfoJwtDecryptConfig;
+ private JWTDecryptionConfiguration userInfoJwtDecryptConfig;
/** Configuration used when validating UserInfo JWT signatures. */
@Nullable
- private net.shibboleth.oidc.security.SignatureValidationConfiguration<SignedJWT> userInfoTokenJwtSignatureValidationConfig;
+ private JWTSignatureValidationConfiguration userInfoTokenJwtSignatureValidationConfig;
/**
* Set the configuration used to decrypt id_tokens.
*
* @param config configuration used when decrypting id_tokens, or null
*/
- public void setIdTokenJwtDecryptionConfiguration(@Nullable final
- net.shibboleth.oidc.security.JWTDecryptionConfiguration config) {
+ public void setIdTokenJwtDecryptionConfiguration(@Nullable final JWTDecryptionConfiguration config) {
idTokenJwtDecryptConfig = config;
}
@@ -88,7 +87,7 @@ public class OIDCSecurityConfiguration extends SecurityConfiguration {
*
* @return configuration used when decrypting id_tokens, or null
*/
- @Nullable public net.shibboleth.oidc.security.JWTDecryptionConfiguration getIdtokenJwtDecryptionConfiguration() {
+ @Nullable public JWTDecryptionConfiguration getIdtokenJwtDecryptionConfiguration() {
return idTokenJwtDecryptConfig;
}
@@ -97,8 +96,7 @@ public class OIDCSecurityConfiguration extends SecurityConfiguration {
*
* @param config configuration used when decrypting UserInfo JWTs, or null
*/
- public void setUserInfoJwtDecryptionConfiguration(@Nullable final
- net.shibboleth.oidc.security.JWTDecryptionConfiguration config) {
+ public void setUserInfoJwtDecryptionConfiguration(@Nullable final JWTDecryptionConfiguration config) {
userInfoJwtDecryptConfig = config;
}
@@ -125,7 +123,7 @@ public class OIDCSecurityConfiguration extends SecurityConfiguration {
*
* @return configuration used when decrypting UserInfo JWTs, or null
*/
- @Nullable public net.shibboleth.oidc.security.JWTDecryptionConfiguration getUserInfoJwtDecryptionConfiguration() {
+ @Nullable public JWTDecryptionConfiguration getUserInfoJwtDecryptionConfiguration() {
return userInfoJwtDecryptConfig;
}
@@ -212,8 +210,7 @@ public class OIDCSecurityConfiguration extends SecurityConfiguration {
* @return configuration used when validating id_token JWT signatures, or null
*/
@Nullable
- public net.shibboleth.oidc.security.SignatureValidationConfiguration<SignedJWT>
- getIdTokenJwtSignatureValidationConfiguration() {
+ public JWTSignatureValidationConfiguration getIdTokenJwtSignatureValidationConfiguration() {
return idTokenJwtSignatureValidationConfig;
}
@@ -223,7 +220,7 @@ public class OIDCSecurityConfiguration extends SecurityConfiguration {
* @param config configuration used when validating id_token JWT signatures, or null
*/
public void setIdTokenJwtSignatureValidationConfiguration(
- @Nullable final net.shibboleth.oidc.security.SignatureValidationConfiguration<SignedJWT> config) {
+ @Nullable final JWTSignatureValidationConfiguration config) {
idTokenJwtSignatureValidationConfig = config;
}
@@ -233,8 +230,7 @@ public class OIDCSecurityConfiguration extends SecurityConfiguration {
* @return configuration used when validating id_token JWT signatures, or null
*/
@Nullable
- public net.shibboleth.oidc.security.SignatureValidationConfiguration<SignedJWT>
- getUserInfoTokenJwtSignatureValidationConfiguration() {
+ public JWTSignatureValidationConfiguration getUserInfoTokenJwtSignatureValidationConfiguration() {
return userInfoTokenJwtSignatureValidationConfig;
}
@@ -244,7 +240,7 @@ public class OIDCSecurityConfiguration extends SecurityConfiguration {
* @param config configuration used when validating id_token JWT signatures, or null
*/
public void setUserInfoTokenJwtSignatureValidationConfiguration(
- @Nullable final net.shibboleth.oidc.security.SignatureValidationConfiguration<SignedJWT> config) {
+ @Nullable final JWTSignatureValidationConfiguration config) {
userInfoTokenJwtSignatureValidationConfig = config;
}
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/AbstractClaimsSetAuditExtractor.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/AbstractClaimsSetAuditExtractor.java
index b39bc63..1c2a494 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/AbstractClaimsSetAuditExtractor.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/AbstractClaimsSetAuditExtractor.java
@@ -117,7 +117,7 @@ public abstract class AbstractClaimsSetAuditExtractor<T> extends AbstractInitial
/**
* Implemented to perform the actual lookup.
*
- * @param req authentication request to perform the lookup from.
+ * @param req authentication request to perform the lookup from
*
* @return lookup value or {@code null} if not found
*
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/encoder/impl/HTTPPostAuthnRequestEncoder.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/encoder/impl/HTTPPostAuthnRequestEncoder.java
index 1485925..b1cd438 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/encoder/impl/HTTPPostAuthnRequestEncoder.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/encoder/impl/HTTPPostAuthnRequestEncoder.java
@@ -42,7 +42,6 @@ import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.net.HttpServletSupport;
-import net.shibboleth.utilities.java.support.net.URISupport;
/**
* A {@link MessageEncoder message encoder} that encodes an OpenID authentication request by
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list