[java-oidc-common] branch dev/JCOMOIDC-41 updated: Fix checkstyle
Phil Smart
philip.smart at jisc.ac.uk
Wed Oct 5 11:46:41 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=dcdd8b03f3209b50c5fb7987f2b96309b3f78481
The following commit(s) were added to refs/heads/dev/JCOMOIDC-41 by this push:
new dcdd8b0 Fix checkstyle
dcdd8b0 is described below
commit dcdd8b03f3209b50c5fb7987f2b96309b3f78481
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Oct 5 12:46:35 2022 +0100
Fix checkstyle
---
.../oidc/security/JWTDecryptionParameters.java | 6 ++--
.../security/JWTSignatureSigningConfiguration.java | 18 ++++++++++++
.../JWTSignatureValidationParametersResolver.java | 3 +-
.../context/JWTSecurityParametersContext.java | 3 +-
.../oidc/security/criterion/JWKSetCriterion.java | 6 ++--
.../JWTSignatureSigningConfigurationCriterion.java | 2 --
.../impl/BasicJOSEObjectCredentialResolver.java | 3 +-
.../impl/ChainingJOSEObjectCredentialResolver.java | 4 +--
.../impl/LocalJOSEObjectCredentialResolver.java | 3 +-
.../security/credential/impl/package-info.java | 13 ++-------
.../impl/BaseJWTSignatureSecurityHandler.java | 10 +++----
.../security/impl/BaseSignedJWTTrustEngine.java | 11 ++++++--
...piringJWTSharedSecretCredentialFactoryBean.java | 8 +++---
...BasicJWTSignatureSigningParametersResolver.java | 7 +++--
...icJWTSignatureValidationParametersResolver.java | 4 +--
.../DefaultJWTEncryptionParametersResolver.java | 30 ++++++++++++--------
.../oidc/security/impl/JWKCredentialSupport.java | 19 ++++++++++++-
.../oidc/security/impl/JWTDecrypter.java | 32 ++++++++++------------
...dataDataEncryptionAlgorithmsLookupStrategy.java | 4 +--
.../config/OIDCAuthorizationConfiguration.java | 10 +++----
.../config/OIDCSecurityConfigurationTest.java | 7 +++--
...stractAuthenticationResponseAuditExtractor.java | 3 +-
.../impl/AbstractClaimsSetAuditExtractor.java | 2 +-
.../audit/impl/ForceAuthnAuditExtractor.java | 3 +-
.../audit/impl/RedirectURIAuditExtractor.java | 3 +-
.../audit/impl/ResponseTypeAuditExtractor.java | 3 +-
.../oidc/profile/audit/impl/package-info.java | 13 ++-------
.../encoder/impl/AbstractOIDCMessageEncoder.java | 5 ++--
.../PopulateJWTSignatureSigningParameters.java | 6 ++--
...pulateJWTSignatureSigningParametersHandler.java | 12 +++++---
.../PopulateJWTSignatureValidationParameters.java | 3 +-
...ateJWTSignatureValidationParametersHandler.java | 8 ++----
.../impl/HTTPRedirectAuthnResponseDecoderTest.java | 3 +-
.../impl/HTTPPostAuthnRequestEncoderTest.java | 21 ++++++++++++--
...enticationRequestMessageEncoderFactoryTest.java | 17 ++++++++++++
35 files changed, 192 insertions(+), 113 deletions(-)
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTDecryptionParameters.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTDecryptionParameters.java
index d55ddb3..2d4edf1 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTDecryptionParameters.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTDecryptionParameters.java
@@ -31,15 +31,15 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
*/
public class JWTDecryptionParameters extends AlgorithmPolicyParameters {
+ /** Carries additional criterion made available to the resolvers at runtime.*/
+ @Nonnull private final CriteriaSet additionalCriteria;
+
/** The encrypted content encrypted key's (CEK) credential resolver. */
@Nullable private JOSEObjectCredentialResolver kekKeyCredentialResolver;
/** The content encryption key (CEK) resolver.*/
@Nullable private JOSEObjectCredentialResolver contentEncryptionKeyCredentialResolver;
- /** Carries additional criterion made available to the resolvers at runtime.*/
- @Nonnull final CriteriaSet additionalCriteria;
-
/** Constructor .*/
public JWTDecryptionParameters() {
additionalCriteria = new CriteriaSet();
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureSigningConfiguration.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureSigningConfiguration.java
index 300c9df..5439a76 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureSigningConfiguration.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureSigningConfiguration.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
package net.shibboleth.oidc.security;
import java.util.List;
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationParametersResolver.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationParametersResolver.java
index f22592c..5fe7eaa 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationParametersResolver.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationParametersResolver.java
@@ -23,6 +23,7 @@ import net.shibboleth.utilities.java.support.resolver.Resolver;
/**
* An interface for components which resolve {@link JWTSignatureValidationParameters} based on a {@link CriteriaSet}.
*/
-public interface JWTSignatureValidationParametersResolver extends Resolver<JWTSignatureValidationParameters, CriteriaSet> {
+public interface JWTSignatureValidationParametersResolver extends
+ Resolver<JWTSignatureValidationParameters, CriteriaSet> {
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/context/JWTSecurityParametersContext.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/context/JWTSecurityParametersContext.java
index 15e4ad8..7a54b69 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/context/JWTSecurityParametersContext.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/context/JWTSecurityParametersContext.java
@@ -105,7 +105,8 @@ public final class JWTSecurityParametersContext extends BaseContext {
*
* @return this context
*/
- @Nonnull public JWTSecurityParametersContext setDecryptionParameters(@Nullable final JWTDecryptionParameters params) {
+ @Nonnull public JWTSecurityParametersContext setDecryptionParameters(
+ @Nullable final JWTDecryptionParameters params) {
decryptionParameters = params;
return this;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWKSetCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWKSetCriterion.java
index b879911..ba25c2f 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWKSetCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWKSetCriterion.java
@@ -35,10 +35,10 @@ public final class JWKSetCriterion implements Criterion {
/**
* Constructor.
*
- * @param jwkSet the JWKSet credentials
+ * @param newJwkSet the JWKSet credentials
*/
- public JWKSetCriterion(@Nullable final JWKSet jwkSet) {
- setJWKSet(jwkSet);
+ public JWKSetCriterion(@Nullable final JWKSet newJwkSet) {
+ setJWKSet(newJwkSet);
}
/**
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureSigningConfigurationCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureSigningConfigurationCriterion.java
index 8987acc..16490db 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureSigningConfigurationCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureSigningConfigurationCriterion.java
@@ -21,8 +21,6 @@ import java.util.List;
import javax.annotation.Nonnull;
-import org.opensaml.xmlsec.SignatureSigningConfiguration;
-
import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicJOSEObjectCredentialResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicJOSEObjectCredentialResolver.java
index 2fb4e4d..f07b954 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicJOSEObjectCredentialResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicJOSEObjectCredentialResolver.java
@@ -154,7 +154,8 @@ public class BasicJOSEObjectCredentialResolver extends AbstractCriteriaFiltering
return credentials;
}
- @Nullable protected BasicJWKCredential buildJWKCredential(@Nonnull final JWK jwk, @Nullable final String headerKid) {
+ @Nullable protected BasicJWKCredential buildJWKCredential(
+ @Nonnull final JWK jwk, @Nullable final String headerKid) {
final BasicJWKCredential credential = new BasicJWKCredential();
if (jwk.getKeyType() == KeyType.EC || jwk.getKeyType() == KeyType.RSA) {
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ChainingJOSEObjectCredentialResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ChainingJOSEObjectCredentialResolver.java
index aabf703..53bbc4f 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ChainingJOSEObjectCredentialResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ChainingJOSEObjectCredentialResolver.java
@@ -29,8 +29,8 @@ import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
* A concrete implementation of {@link AbstractChainingCredentialResolver} which is scoped to
* the simple {@link JOSEObjectCredentialResolver} type.
*/
-public class ChainingJOSEObjectCredentialResolver extends AbstractChainingCredentialResolver<JOSEObjectCredentialResolver>
- implements JOSEObjectCredentialResolver {
+public class ChainingJOSEObjectCredentialResolver extends
+ AbstractChainingCredentialResolver<JOSEObjectCredentialResolver> implements JOSEObjectCredentialResolver {
/**
* Constructor.
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolver.java
index 3c730b9..e9690c2 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolver.java
@@ -94,7 +94,8 @@ public class LocalJOSEObjectCredentialResolver extends BasicJOSEObjectCredential
* @param localCredentialResolver resolver of local credentials
*/
public LocalJOSEObjectCredentialResolver(@Nonnull
- @ParameterName(name="localCredentialResolver") final JOSEObjectCredentialResolver localCredentialResolver) {
+ @ParameterName(name="localCredentialResolver")
+ final JOSEObjectCredentialResolver localCredentialResolver) {
localCredResolver = Constraint.isNotNull(localCredentialResolver, "Local credential resolver cannot be null");
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/package-info.java
similarity index 66%
copy from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationParametersResolver.java
copy to oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/package-info.java
index f22592c..ba6571a 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/package-info.java
@@ -15,14 +15,5 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security;
-
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.Resolver;
-
-/**
- * An interface for components which resolve {@link JWTSignatureValidationParameters} based on a {@link CriteriaSet}.
- */
-public interface JWTSignatureValidationParametersResolver extends Resolver<JWTSignatureValidationParameters, CriteriaSet> {
-
-}
+/** Credential resolver implementation classes. */
+package net.shibboleth.oidc.security.credential.impl;
\ No newline at end of file
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java
index 875a27c..d5cfe32 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java
@@ -50,16 +50,16 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
* Base class for SAML security message handlers which evaluate a JWT signature with a signature trust engine.
*/
-public abstract class BaseJWTSignatureSecurityHandler extends BaseTrustEngineSecurityHandler<SignedJWT> {
-
- /** Class logger. */
- @Nonnull
- private final Logger log = LoggerFactory.getLogger(BaseJWTSignatureSecurityHandler.class);
+public abstract class BaseJWTSignatureSecurityHandler extends BaseTrustEngineSecurityHandler<SignedJWT> {
/** Lookup function for parent ProfileRequestContext. */
@Nonnull private static final ParentProfileRequestContextLookup<MessageContext> PRC_LOOKUP
= new ParentProfileRequestContextLookup<>();
+ /** Class logger. */
+ @Nonnull
+ private final Logger log = LoggerFactory.getLogger(BaseJWTSignatureSecurityHandler.class);
+
/**
* Function that looks up provider metadata from the given message context. Can return {@literal null}
* if not used.
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseSignedJWTTrustEngine.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseSignedJWTTrustEngine.java
index 3f1901f..cb0c0d9 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseSignedJWTTrustEngine.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseSignedJWTTrustEngine.java
@@ -48,6 +48,12 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
+//TODO add JavaDoc
+/**
+ * A {@link TrustEngine} implementation for Signed JSON Web Tokens.
+ *
+ * @param <TrustBasisType> the trust basis type
+ */
public abstract class BaseSignedJWTTrustEngine<TrustBasisType> implements TrustEngine<SignedJWT> {
/** Logger. */
@@ -101,7 +107,8 @@ public abstract class BaseSignedJWTTrustEngine<TrustBasisType> implements TrustE
* @return true if signature is valid and trusted, false otherwise
* @throws SecurityException if there is a fatal error evaluating the signature
*/
- protected abstract boolean doValidate(@Nonnull final SignedJWT signedJWT, @Nonnull final CriteriaSet trustBasisCriteria)
+ protected abstract boolean doValidate(
+ @Nonnull final SignedJWT signedJWT, @Nonnull final CriteriaSet trustBasisCriteria)
throws SecurityException ;
/**
@@ -146,7 +153,7 @@ public abstract class BaseSignedJWTTrustEngine<TrustBasisType> implements TrustE
/**
* Attempt to verify a signature using the key from the supplied credential.
*
- * @param signature the signature on which to attempt verification
+ * @param signedJWT the JWT on which to attempt verification
* @param credential the credential containing the candidate validation key
* @return true if the signature can be verified using the key from the credential, otherwise false
*/
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicExpiringJWTSharedSecretCredentialFactoryBean.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicExpiringJWTSharedSecretCredentialFactoryBean.java
index e458357..60cf586 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicExpiringJWTSharedSecretCredentialFactoryBean.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicExpiringJWTSharedSecretCredentialFactoryBean.java
@@ -74,11 +74,11 @@ public class BasicExpiringJWTSharedSecretCredentialFactoryBean
/**
* Set the JCA Algorithm to associate with this credential.
*
- * @param alg the jca algorithm.
+ * @param javaAlg the jca algorithm.
*/
- public void setJcaAlg(@Nullable final String alg) {
- if (StringSupport.trimOrNull(alg) != null) {
- jcaAlg = alg;
+ public void setJcaAlg(@Nullable final String javaAlg) {
+ if (StringSupport.trimOrNull(javaAlg) != null) {
+ jcaAlg = javaAlg;
}
}
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureSigningParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureSigningParametersResolver.java
index c6d8400..ded1de9 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureSigningParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureSigningParametersResolver.java
@@ -63,6 +63,7 @@ public class BasicJWTSignatureSigningParametersResolver
extends AbstractSecurityParametersResolver<JWTSignatureSigningParameters>
implements JWTSignatureSigningParametersResolver {
+ /** Class logger.*/
private final Logger log = LoggerFactory.getLogger(BasicJWTSignatureSigningParametersResolver.class);
/** The AlgorithmRegistry used when processing algorithm URIs. */
@@ -99,7 +100,8 @@ public class BasicJWTSignatureSigningParametersResolver
@Override
@Nonnull
- public Iterable<JWTSignatureSigningParameters> resolve(@Nonnull final CriteriaSet criteria) throws ResolverException {
+ public Iterable<JWTSignatureSigningParameters> resolve(
+ @Nonnull final CriteriaSet criteria) throws ResolverException {
final JWTSignatureSigningParameters params = resolveSingle(criteria);
if (params != null) {
return Collections.singletonList(params);
@@ -188,7 +190,8 @@ public class BasicJWTSignatureSigningParametersResolver
* @param includeExcludePredicate the include/exclude predicate with which to evaluate the
* candidate signing method algorithm URIs
*/
- protected void resolveAndPopulateCredentialAndSignatureAlgorithm(@Nonnull final JWTSignatureSigningParameters params,
+ protected void resolveAndPopulateCredentialAndSignatureAlgorithm(
+ @Nonnull final JWTSignatureSigningParameters params,
@Nonnull final CriteriaSet criteria, final Predicate<String> includeExcludePredicate) {
final List<Credential> credentials = getEffectiveSigningCredentials(criteria);
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureValidationParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureValidationParametersResolver.java
index d0b5dbc..f68b7e2 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureValidationParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureValidationParametersResolver.java
@@ -23,7 +23,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.security.trust.TrustEngine;
-import org.opensaml.xmlsec.criterion.SignatureValidationConfigurationCriterion;
import org.opensaml.xmlsec.impl.AbstractSecurityParametersResolver;
import org.opensaml.xmlsec.signature.support.SignatureTrustEngine;
import org.slf4j.Logger;
@@ -75,7 +74,8 @@ public class BasicJWTSignatureValidationParametersResolver
/** {@inheritDoc} */
@Override
@Nullable
- public JWTSignatureValidationParameters resolveSingle(@Nonnull final CriteriaSet criteria) throws ResolverException {
+ public JWTSignatureValidationParameters resolveSingle(
+ @Nonnull final CriteriaSet criteria) throws ResolverException {
Constraint.isNotNull(criteria, "CriteriaSet was null");
Constraint.isNotNull(criteria.get(JWTSignatureValidationConfigurationCriterion.class),
"Resolver requires an instance of SignatureValidationConfigurationCriterion");
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolver.java
index f7564c3..ba4b3a4 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolver.java
@@ -74,13 +74,13 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
* encryption keys will be resolved from the OpenID Providers keyset document, and symmetric keys will be derived from
* the client_secret (although any resolvers could be supplied, and hence this behaviour is not guranteed). </p>
*
- * <p>Symmetric keys are expected to be returned in their original format. The resolver will derive the correct symmetric
- * key to add to the correct parameters e.g. for key wrapping and direct content encryption.</p>
+ * <p>Symmetric keys are expected to be returned in their original format. The resolver will derive the correct
+ * symmetric key to add to the correct parameters e.g. for key wrapping and direct content encryption.</p>
*
- * <p>Note: the criteria supplied to the credential resolvers should be relatively light on evaluable criterion. For example,
- * only containing the {@link EvaluableUsageCredentialCriterion} - alongside any non-evaluable criterion needed by the
- * resolvers. Most of the specific filtering e.g. algorithm and key length, is performed by this resolver itself based
- * on the logic described by the OpenID specifications.</p>
+ * <p>Note: the criteria supplied to the credential resolvers should be relatively light on evaluable criterion.
+ * For example, only containing the {@link EvaluableUsageCredentialCriterion} - alongside any non-evaluable
+ * criterion needed by the resolvers. Most of the specific filtering e.g. algorithm and key length, is performed
+ * by this resolver itself based on the logic described by the OpenID specifications.</p>
*
* <p>
* The following {@link net.shibboleth.utilities.java.support.resolver.Criterion} inputs are supported:
@@ -99,11 +99,17 @@ public class DefaultJWTEncryptionParametersResolver extends AbstractSecurityPara
/** The AlgorithmRegistry used when processing algorithm URIs. */
@Nonnull private AlgorithmRegistry algorithmRegistry;
- /** A lookup strategy to locate data encryption algorithms from the given criteria set and includesExcludes predicate.*/
+ /**
+ * A lookup strategy to locate data encryption algorithms from the given criteria set and
+ * includesExcludes predicate.
+ */
@Nonnull
private BiFunction<CriteriaSet, Predicate<String>, List<String>> dataEncryptionAlgorithmsLookupStrategy;
- /** A lookup strategy to locate key encryption algorithms from the given criteria set and includesExcludes predicate.*/
+ /**
+ * A lookup strategy to locate key encryption algorithms from the given criteria set and
+ * includesExcludes predicate.
+ */
@Nonnull
private BiFunction<CriteriaSet, Predicate<String>, List<String>> keyTransportEncryptionAlgorithmsLookupStrategy;
@@ -177,7 +183,8 @@ public class DefaultJWTEncryptionParametersResolver extends AbstractSecurityPara
/** {@inheritDoc} */
@Override
- @Nullable public JWTEncryptionParameters resolveSingle(@Nonnull final CriteriaSet criteria) throws ResolverException {
+ @Nullable public JWTEncryptionParameters resolveSingle(@Nonnull final CriteriaSet criteria)
+ throws ResolverException {
Constraint.isNotNull(criteria, "CriteriaSet was null");
Constraint.isNotNull(criteria.get(JWTEncryptionConfigurationCriterion.class),
"Resolver requires an instance of JWTEncryptionConfigurationCriterion");
@@ -400,6 +407,7 @@ public class DefaultJWTEncryptionParametersResolver extends AbstractSecurityPara
* @param dataEncryptionCredentials the list of local data encryption credentials
* @param params the encryption parameters to add the credential to
*/
+ // Checkstyle: ParameterNumber|MethodLength|CyclomaticComplexity OFF
protected void resolveCredentialForSupportedAlgorithm(
@Nonnull final CriteriaSet criteria,
@Nonnull final List<JWEAlgorithm> keyTransportAlgorithms,
@@ -484,7 +492,7 @@ public class DefaultJWTEncryptionParametersResolver extends AbstractSecurityPara
}
}
}
-
+ // Checkstyle: ParameterNumber|MethodLength|CyclomaticComplexity ON
/**
* Wrapper to
* {@link JWKCredentialSupport#deriveSymmetricKeyForAlgAndEnc(JWKCredential, JWEAlgorithm, EncryptionMethod)}
@@ -680,7 +688,7 @@ public class DefaultJWTEncryptionParametersResolver extends AbstractSecurityPara
* Convert the encryption methods represented as strings, into Nimbus {@link EncryptionMethod}s for later
* comparison. This will preserve the order of the original list ({@link List} is ordered).
*
- * @param algos the encryption methods to convert
+ * @param encMethods the encryption methods to convert
*
* @return the converted encryption methods
*/
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWKCredentialSupport.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWKCredentialSupport.java
index 359f8e6..4e73cdf 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWKCredentialSupport.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWKCredentialSupport.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.security.impl;
import javax.annotation.Nullable;
@@ -13,7 +30,7 @@ import com.nimbusds.oauth2.sdk.jose.SecretKeyDerivation;
import net.shibboleth.oidc.security.credential.JWKCredential;
/** Provide JWK specific credential support.*/
-public class JWKCredentialSupport {
+public final class JWKCredentialSupport {
/** Constructor. */
private JWKCredentialSupport() { }
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWTDecrypter.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWTDecrypter.java
index 4f0275c..03c6a9f 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWTDecrypter.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/JWTDecrypter.java
@@ -122,20 +122,14 @@ public class JWTDecrypter {
final JWEAlgorithm jwtAlg = encryptedObject.getHeader().getAlgorithm();
- // Direct Encryption
+
if (JWEAlgorithm.DIR.equals(jwtAlg)) {
decryptUsingDirectEncryption(encryptedObject);
- }
- // Key encryption
- else if (JWEAlgorithm.Family.RSA.contains(jwtAlg)) {
+ } else if (JWEAlgorithm.Family.RSA.contains(jwtAlg)) {
decryptUsingKeyEncryption(encryptedObject);
- }
- // Key wrapped
- else if (JWEAlgorithm.Family.AES_GCM_KW.contains(jwtAlg) || JWEAlgorithm.Family.AES_KW.contains(jwtAlg)) {
+ } else if (JWEAlgorithm.Family.AES_GCM_KW.contains(jwtAlg) || JWEAlgorithm.Family.AES_KW.contains(jwtAlg)) {
decryptUsingKeyWrapping(encryptedObject);
- }
- // Key agreement
- else if (JWEAlgorithm.Family.ECDH_ES.contains(jwtAlg)) {
+ } else if (JWEAlgorithm.Family.ECDH_ES.contains(jwtAlg)) {
decryptUsingKeyAgreement(encryptedObject);
} else {
throw new DecryptionException("JWE algorithm '"+jwtAlg.getName()+"' not supported");
@@ -189,7 +183,6 @@ public class JWTDecrypter {
*
* @param criteriaSet the criteria set to add built criteria too
* @param encryptedObject the encrypted JWT from which to deduce decryption key 'alg' criteria
- * @return a set of credential criteria pertaining to the decryption key
*/
@Nullable private void buildKeyManagementAlgorithmCriteria(@Nonnull final CriteriaSet criteriaSet,
@Nonnull final EncryptedJWT encryptedObject) {
@@ -225,8 +218,8 @@ public class JWTDecrypter {
* Optionally build decryption key 'enc' (encryption key algorithm) credential criteria according to
* information in the encrypted object.
*
+ * @param criteriaSet the criteria
* @param encryptedObject the encrypted JWT from which to deduce decryption key 'enc' criteria
- * @return a set of credential criteria pertaining to the decryption key
*/
@Nullable private void buildContentEncryptionKeyAlgorithmCriteria(
@Nonnull final CriteriaSet criteriaSet, @Nonnull final EncryptedJWT encryptedObject) {
@@ -268,7 +261,8 @@ public class JWTDecrypter {
/**
* Dynamically construct key algorithm credential criteria based on the specified algorithm URI.
*
- * @param algURI the algorithm URI
+ * @param algorithmURI the algorithm URI
+ *
* @return a new key algorithm credential criteria instance, or null if criteria could not be determined
*/
@Nullable private KeyAlgorithmCriterion buildKeyAlgorithmCriteria(@Nullable final String algorithmURI) {
@@ -335,7 +329,8 @@ public class JWTDecrypter {
encryptedObject.decrypt(decrypter);
return;
} catch (final JOSEException | DecryptionException e) {
- log.debug("Failed to decrypt JWE using key '{}', continuing: {}", cred.getKeyNames(), e.getMessage());
+ log.debug("Failed to decrypt JWE using key '{}', continuing: {}",
+ cred.getKeyNames(), e.getMessage());
}
}
} catch (final ResolverException e) {
@@ -391,7 +386,8 @@ public class JWTDecrypter {
encryptedObject.decrypt(decrypter);
return;
} catch (final JOSEException | DecryptionException e) {
- log.debug("Failed to decrypt JWE using key '{}', continuing: {}", cred.getKeyNames(), e.getMessage());
+ log.debug("Failed to decrypt JWE using key '{}', continuing: {}",
+ cred.getKeyNames(), e.getMessage());
}
}
} catch (final ResolverException e) {
@@ -434,7 +430,8 @@ public class JWTDecrypter {
encryptedObject.decrypt(decrypter);
return;
} catch (final JOSEException | DecryptionException e) {
- log.debug("Failed to decrypt JWE using key '{}', continuing: {}", cred.getKeyNames(), e.getMessage());
+ log.debug("Failed to decrypt JWE using key '{}', continuing: {}",
+ cred.getKeyNames(), e.getMessage());
}
}
} catch (final ResolverException e) {
@@ -517,6 +514,7 @@ public class JWTDecrypter {
*
* @throws DecryptionException if there is an algorithm mismatch.
*/
+ // Checkstyle: CyclomaticComplexity OFF
private JWEAlgorithm validateKeyManagmentAlgorithm(
@Nonnull final EncryptedJWT encryptedObject, @Nonnull final Credential cred) throws DecryptionException {
@@ -554,7 +552,7 @@ public class JWTDecrypter {
//All fine
return headerAlg;
}
-
+ // Checkstyle: CyclomaticComplexity OFF
/**
* Validates the 'enc' algorithm in the header matches the encryption algorithm specified for the credential,
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategy.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategy.java
index 1440832..782f484 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategy.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategy.java
@@ -39,8 +39,8 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
- * A lookup strategy that finds data/content encryption algorithms from local configuration that are compatible with those
- * advertised by the downstream OpenID Provider.
+ * A lookup strategy that finds data/content encryption algorithms from local configuration that are compatible
+ * with those advertised by the downstream OpenID Provider.
*
* <p>The set of supported and configured encryption methods ('enc') are derived from the intersection of
* those supported by local configuration and those supported by the downstream OpenID Provider.
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 4087527..5b59885 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
@@ -816,7 +816,7 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
}
/**
- * Set the scopes to use for authentication requests
+ * Set the scopes to use for authentication requests.
*
* @param scopes the scopes
*/
@@ -847,8 +847,8 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
*
* @param strategy translation function
*/
- public void setAuthenticationMethodsReferencesTranslationStrategyLookupStrategy(
- @Nonnull final Function<ProfileRequestContext,Function<Collection<String>, Collection<Principal>>> strategy){
+ public void setAuthenticationMethodsReferencesTranslationStrategyLookupStrategy(@Nonnull
+ final Function<ProfileRequestContext,Function<Collection<String>, Collection<Principal>>> strategy){
amrTranslationStrategyLookupStrategy = Constraint.isNotNull(strategy, "Lookup strategy cannot be null");
}
@@ -872,8 +872,8 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
*
* @param strategy translation function
*/
- public void setAuthenticationContextClassReferenceTranslationStrategyLookupStrategy(
- @Nullable final Function<ProfileRequestContext,Function<Collection<String>, Collection<Principal>>> strategy){
+ public void setAuthenticationContextClassReferenceTranslationStrategyLookupStrategy(@Nullable
+ final Function<ProfileRequestContext,Function<Collection<String>, Collection<Principal>>> strategy){
acrTranslationStrategyLookupStrategy = Constraint.isNotNull(strategy, "Lookup strategy cannot be null");
}
diff --git a/oidc-common-profile-api/src/test/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfigurationTest.java b/oidc-common-profile-api/src/test/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfigurationTest.java
index f41cdaa..bb7b428 100644
--- a/oidc-common-profile-api/src/test/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfigurationTest.java
+++ b/oidc-common-profile-api/src/test/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfigurationTest.java
@@ -25,10 +25,11 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
/**
- * Unit tests for {@link OIDCSecurityConfiguration}
+ * Unit tests for {@link OIDCSecurityConfiguration}.
*/
public class OIDCSecurityConfigurationTest {
+ /** OIDC sec. config.*/
private OIDCSecurityConfiguration config;
@BeforeMethod
@@ -45,10 +46,10 @@ public class OIDCSecurityConfigurationTest {
@Test
public void testSetters() {
config = new OIDCSecurityConfiguration();
- EncryptionConfiguration confEnc = Mockito.mock(EncryptionConfiguration.class);
+ final EncryptionConfiguration confEnc = Mockito.mock(EncryptionConfiguration.class);
config.setRequestObjectDecryptionConfiguration(confEnc);
Assert.assertEquals(confEnc, config.getRequestObjectDecryptionConfiguration());
- SignatureSigningConfiguration confDec = Mockito.mock(SignatureSigningConfiguration.class);
+ final SignatureSigningConfiguration confDec = Mockito.mock(SignatureSigningConfiguration.class);
config.setRequestObjectSignatureValidationConfiguration(confDec);
Assert.assertEquals(confDec, config.getRequestObjectSignatureValidationConfiguration());
}
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/AbstractAuthenticationResponseAuditExtractor.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/AbstractAuthenticationResponseAuditExtractor.java
index a7cd4f1..87c41a6 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/AbstractAuthenticationResponseAuditExtractor.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/AbstractAuthenticationResponseAuditExtractor.java
@@ -45,7 +45,8 @@ public abstract class AbstractAuthenticationResponseAuditExtractor<T> implements
*/
protected AbstractAuthenticationResponseAuditExtractor(
@Nonnull final Function<ProfileRequestContext, AuthenticationResponse> strategy) {
- responseLookupStrategy = Constraint.isNotNull(strategy, "AuthenticationResponse lookup strategy cannot be null");
+ responseLookupStrategy = Constraint.isNotNull(
+ strategy, "AuthenticationResponse lookup strategy cannot be null");
}
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 1c2a494..2f5b9bb 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
@@ -93,7 +93,7 @@ public abstract class AbstractClaimsSetAuditExtractor<T> extends AbstractInitial
}
/**
- * Set the strategy used to lookup the {@link JWTClaimsSet} to look for the claim in
+ * Set the strategy used to lookup the {@link JWTClaimsSet} to look for the claim in.
*
* @param strategy the strategy
*/
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/ForceAuthnAuditExtractor.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/ForceAuthnAuditExtractor.java
index 914e845..ce83238 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/ForceAuthnAuditExtractor.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/ForceAuthnAuditExtractor.java
@@ -36,7 +36,8 @@ public class ForceAuthnAuditExtractor extends AbstractAuthenticationRequestAudit
*
* @param strategy lookup strategy for locating the authentication request
*/
- public ForceAuthnAuditExtractor(@Nonnull final Function<ProfileRequestContext, OIDCAuthenticationRequest> strategy) {
+ public ForceAuthnAuditExtractor(
+ @Nonnull final Function<ProfileRequestContext, OIDCAuthenticationRequest> strategy) {
super(strategy);
}
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/RedirectURIAuditExtractor.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/RedirectURIAuditExtractor.java
index edb0d2a..007db1d 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/RedirectURIAuditExtractor.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/RedirectURIAuditExtractor.java
@@ -34,7 +34,8 @@ public class RedirectURIAuditExtractor extends AbstractAuthenticationRequestAudi
*
* @param strategy lookup strategy locating the authentication request
*/
- public RedirectURIAuditExtractor(@Nonnull final Function<ProfileRequestContext, OIDCAuthenticationRequest> strategy) {
+ public RedirectURIAuditExtractor(
+ @Nonnull final Function<ProfileRequestContext, OIDCAuthenticationRequest> strategy) {
super(strategy);
}
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/ResponseTypeAuditExtractor.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/ResponseTypeAuditExtractor.java
index e87079e..8b02472 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/ResponseTypeAuditExtractor.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/ResponseTypeAuditExtractor.java
@@ -35,7 +35,8 @@ public class ResponseTypeAuditExtractor extends AbstractAuthenticationRequestAud
*
* @param strategy lookup strategy locating the authentication request
*/
- public ResponseTypeAuditExtractor(@Nonnull final Function<ProfileRequestContext, OIDCAuthenticationRequest> strategy) {
+ public ResponseTypeAuditExtractor(
+ @Nonnull final Function<ProfileRequestContext, OIDCAuthenticationRequest> strategy) {
super(strategy);
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationParametersResolver.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/package-info.java
similarity index 66%
copy from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationParametersResolver.java
copy to oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/package-info.java
index f22592c..c6e0e7f 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationParametersResolver.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/audit/impl/package-info.java
@@ -15,14 +15,5 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security;
-
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.Resolver;
-
-/**
- * An interface for components which resolve {@link JWTSignatureValidationParameters} based on a {@link CriteriaSet}.
- */
-public interface JWTSignatureValidationParametersResolver extends Resolver<JWTSignatureValidationParameters, CriteriaSet> {
-
-}
+/** Audit extractors .*/
+package net.shibboleth.oidc.profile.audit.impl;
\ No newline at end of file
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/encoder/impl/AbstractOIDCMessageEncoder.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/encoder/impl/AbstractOIDCMessageEncoder.java
index 589c259..fd7ded8 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/encoder/impl/AbstractOIDCMessageEncoder.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/encoder/impl/AbstractOIDCMessageEncoder.java
@@ -107,7 +107,8 @@ public abstract class AbstractOIDCMessageEncoder extends AbstractHttpServletResp
params.forEach(param -> builder.getQueryParams().add(param));
return builder.buildQueryString();
}
-
+
+ // Checkstyle: CyclomaticComplexity OFF
/**
* Create a list of OAuth 2.0 authorization parameters from the {@link OIDCAuthenticationRequest} object.
*
@@ -182,7 +183,7 @@ public abstract class AbstractOIDCMessageEncoder extends AbstractHttpServletResp
return params;
}
-
+ // Checkstyle: CyclomaticComplexity ON
/**
* Ensure the authorization parameters are valid.
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParameters.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParameters.java
index 3fd1f14..139e01b 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParameters.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParameters.java
@@ -62,10 +62,12 @@ public class PopulateJWTSignatureSigningParameters
@Nonnull private final Logger log = LoggerFactory.getLogger(PopulateJWTSignatureSigningParameters.class);
/** Strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for. */
- @Nonnull private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
+ @Nonnull
+ private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
/** Strategy used to look up an existing {@link JWTSecurityParametersContext} to copy. */
- @Nullable private Function<ProfileRequestContext,JWTSecurityParametersContext> existingParametersContextLookupStrategy;
+ @Nullable
+ private Function<ProfileRequestContext,JWTSecurityParametersContext> existingParametersContextLookupStrategy;
/** Strategy used to look up a per-request {@link SignatureSigningConfiguration} list. */
@NonnullAfterInit
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java
index 8bd4c24..0a3d59a 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java
@@ -76,7 +76,8 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
@Nullable private Function<MessageContext,JWTSecurityParametersContext> existingParametersContextLookupStrategy;
/** Strategy used to look up a per-request {@link JWTSignatureSigningConfiguration} list. */
- @NonnullAfterInit private Function<MessageContext, List<JWTSignatureSigningConfiguration>> configurationLookupStrategy;
+ @NonnullAfterInit
+ private Function<MessageContext, List<JWTSignatureSigningConfiguration>> configurationLookupStrategy;
/** Strategy used to look up a SAML metadata context. */
@Nonnull private Function<MessageContext, SAMLMetadataContext> metadataContextLookupStrategy;
@@ -253,6 +254,7 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
}
}
+ // Checkstyle: CyclomaticComplexity|MethodLength OFF
@Override
protected void doInvoke(final MessageContext messageContext) throws MessageHandlerException {
log.debug("{} Resolving SignatureSigningParameters for request", getLogPrefix());
@@ -264,7 +266,8 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
}
if (existingParametersContextLookupStrategy != null) {
- final JWTSecurityParametersContext existingCtx = existingParametersContextLookupStrategy.apply(messageContext);
+ final JWTSecurityParametersContext existingCtx =
+ existingParametersContextLookupStrategy.apply(messageContext);
if (existingCtx != null && existingCtx.getSignatureSigningParameters() != null) {
log.debug("{} Found existing JWTSecurityParametersContext to copy from", getLogPrefix());
paramsCtx.setSignatureSigningParameters(existingCtx.getSignatureSigningParameters());
@@ -318,7 +321,8 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
if (profileConfiguration != null) {
criteria.add(new StaticCredentialCriterion(
- profileConfiguration.getClientCredential((ProfileRequestContext)messageContext.getParent())));
+ profileConfiguration.getClientCredential(
+ (ProfileRequestContext)messageContext.getParent())));
} else {
log.trace("{} Profile configuration not available, "
+ "shared secret signing credential not present", getLogPrefix());
@@ -341,5 +345,5 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
}
}
-
+ // Checkstyle: CyclomaticComplexity|MethodLength ON
}
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParameters.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParameters.java
index 3a8bf09..9892572 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParameters.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParameters.java
@@ -57,7 +57,8 @@ public class PopulateJWTSignatureValidationParameters
@Nonnull private final Logger log = LoggerFactory.getLogger(PopulateJWTSignatureValidationParameters.class);
/** Strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for. */
- @Nonnull private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
+ @Nonnull
+ private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
/** Strategy used to lookup a per-request {@link JWTSignatureValidationConfiguration} list. */
@NonnullAfterInit
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParametersHandler.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParametersHandler.java
index d2ae90f..7ad95d0 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParametersHandler.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParametersHandler.java
@@ -29,8 +29,6 @@ import org.opensaml.messaging.handler.MessageHandlerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.nimbusds.jwt.SignedJWT;
-
import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
import net.shibboleth.oidc.security.JWTSignatureValidationParameters;
import net.shibboleth.oidc.security.JWTSignatureValidationParametersResolver;
@@ -45,9 +43,9 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
- * Handler that resolves and populates {@link JWTSignatureValidationParameters} on a {@link JWTSecurityParametersContext}
- * created/accessed via a lookup function, by default as an immediate child context of the target
- * {@link MessageContext}.
+ * Handler that resolves and populates {@link JWTSignatureValidationParameters} on a
+ * {@link JWTSecurityParametersContext} created/accessed via a lookup function, by default as
+ * an immediate child context of the target {@link MessageContext}.
*/
public class PopulateJWTSignatureValidationParametersHandler extends AbstractMessageHandler {
diff --git a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/decoding/impl/HTTPRedirectAuthnResponseDecoderTest.java b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/decoding/impl/HTTPRedirectAuthnResponseDecoderTest.java
index 49bff29..11d48f2 100644
--- a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/decoding/impl/HTTPRedirectAuthnResponseDecoderTest.java
+++ b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/decoding/impl/HTTPRedirectAuthnResponseDecoderTest.java
@@ -46,7 +46,8 @@ public class HTTPRedirectAuthnResponseDecoderTest {
mockRequest.setMethod("GET");
mockRequest.setRequestURI("https://localhost/idp/profile/Authn/OIDC/RP/"
+ "callback?code=XSpej7DkB2WYcF1Gzth5CCHw6Oxf3gxR&state=91c28622815dd9a92ef7c984c74c9e39.65317332");
- mockRequest.setQueryString("code=XSpej7DkB2WYcF1Gzth5CCHw6Oxf3gxR&state=91c28622815dd9a92ef7c984c74c9e39.65317332");
+ mockRequest.setQueryString(
+ "code=XSpej7DkB2WYcF1Gzth5CCHw6Oxf3gxR&state=91c28622815dd9a92ef7c984c74c9e39.65317332");
mockRequest.setContentType("application/x-www-form-urlencoded");
decoder.setHttpServletRequest(mockRequest);
decoder.initialize();
diff --git a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/encoder/impl/HTTPPostAuthnRequestEncoderTest.java b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/encoder/impl/HTTPPostAuthnRequestEncoderTest.java
index d372654..2fe17e0 100644
--- a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/encoder/impl/HTTPPostAuthnRequestEncoderTest.java
+++ b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/encoder/impl/HTTPPostAuthnRequestEncoderTest.java
@@ -1,9 +1,25 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.profile.encoder.impl;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
-import java.io.UnsupportedEncodingException;
import java.net.URI;
import org.opensaml.messaging.context.MessageContext;
@@ -18,7 +34,6 @@ import com.nimbusds.openid.connect.sdk.OIDCClaimsRequest;
import com.nimbusds.openid.connect.sdk.assurance.claims.VerifiedClaimsSetRequest;
import net.shibboleth.oidc.profile.core.OIDCAuthenticationRequest;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
/*
@@ -92,7 +107,7 @@ public class HTTPPostAuthnRequestEncoderTest {
}
@Test
- public void testSuccesfullEncoding() throws MessageEncodingException, ComponentInitializationException, UnsupportedEncodingException {
+ public void testSuccesfullEncoding() throws Exception {
encoder.initialize();
encoder.encode();
final String response = mockResponse.getContentAsString();
diff --git a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactoryTest.java b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactoryTest.java
index 24dbb79..bd58b1c 100644
--- a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactoryTest.java
+++ b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactoryTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package net.shibboleth.oidc.profile.impl;
import static org.testng.Assert.assertNotNull;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list