[java-idp-oidc] branch main updated: Checkstyle fixes.
Henri Mikkonen
henri.mikkonen at iki.fi
Wed Jun 29 14:36:33 UTC 2022
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=c6b35238ba24cb8bc02beb7f18915c5059266615
The following commit(s) were added to refs/heads/main by this push:
new c6b35238 Checkstyle fixes.
c6b35238 is described below
commit c6b35238ba24cb8bc02beb7f18915c5059266615
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed Jun 29 17:36:27 2022 +0300
Checkstyle fixes.
---
.../shibboleth/idp/plugin/oidc/op/profile/ScopeUtil.java | 2 +-
.../oidc/op/token/support/AccessTokenClaimsSet.java | 2 +-
.../op/authn/impl/OIDCClientInfoCredentialValidator.java | 4 +++-
.../decoding/impl/OIDCAuthenticationRequestDecoder.java | 5 +++--
.../impl/OIDCClientRegistrationRequestDecoder.java | 2 +-
.../oidc/op/decoding/impl/OIDCTokenRequestDecoder.java | 2 +-
.../op/decoding/impl/OIDCUserInfoRequestDecoder.java | 2 +-
.../idp/plugin/oidc/op/encoding/impl/ResponseUtil.java | 7 +++++--
.../oauth2/decoding/impl/BaseOAuth2RequestDecoder.java | 10 +++++++++-
.../decoding/impl/OAuth2IntrospectionRequestDecoder.java | 2 +-
.../decoding/impl/OAuth2RevocationRequestDecoder.java | 2 +-
.../oidc/op/oauth2/profile/impl/BuildAccessToken.java | 16 +++++++++++-----
.../oidc/op/oauth2/profile/impl/ValidateAudience.java | 13 ++++++++-----
.../impl/SetAuthorizationCodeToResponseContext.java | 5 ++++-
.../profile/impl/SetRefreshTokenToResponseContext.java | 4 ++++
.../idp/plugin/oidc/op/profile/impl/ValidateGrant.java | 3 ++-
.../oidc/op/userinfo/profile/impl/ParseAccessToken.java | 6 +++++-
.../op/userinfo/profile/impl/ValidateAccessToken.java | 3 ++-
18 files changed, 63 insertions(+), 27 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/ScopeUtil.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/ScopeUtil.java
index ff90a471..ddedfdd4 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/ScopeUtil.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/ScopeUtil.java
@@ -39,7 +39,7 @@ import net.shibboleth.idp.attribute.resolver.scripted.ScriptedIdPAttribute;
*
* @since 3.2.0
*/
-public class ScopeUtil {
+public final class ScopeUtil {
/** Class logger. */
private static Logger log = LoggerFactory.getLogger(ScopeUtil.class);
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java
index 7fcc8804..f39f75da 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java
@@ -133,7 +133,7 @@ public final class AccessTokenClaimsSet extends TokenClaimsSet {
final JWTClaimsSet unsealed = JWTClaimsSet.parse(
dataSealer.unwrap(claims.getStringClaim(TokenClaimsSet.KEY_SEALED_FOR_OP)));
map.remove(TokenClaimsSet.KEY_SEALED_FOR_OP);
- for (Map.Entry<String,Object> claim : unsealed.getClaims().entrySet()) {
+ for (final Map.Entry<String,Object> claim : unsealed.getClaims().entrySet()) {
map.put(claim.getKey(), claim.getValue());
}
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/OIDCClientInfoCredentialValidator.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/OIDCClientInfoCredentialValidator.java
index 5b7e305f..5ea5a6a9 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/OIDCClientInfoCredentialValidator.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/OIDCClientInfoCredentialValidator.java
@@ -66,6 +66,7 @@ public class OIDCClientInfoCredentialValidator extends AbstractUsernamePasswordC
/** Digester for SHA-1. */
@NonnullAfterInit private StringDigester digester;
+ /** Client information. */
@Nullable private OIDCClientInformation clientInformation = null;
/** Constructor. */
@@ -119,7 +120,8 @@ public class OIDCClientInfoCredentialValidator extends AbstractUsernamePasswordC
if (ClientAuthenticationMethod.NONE.equals(clientMetadata.getTokenEndpointAuthMethod())) {
log.debug("{} OIDC client metadata contains 'none' type for endpoint authentication");
final Subject subject = new Subject();
- subject.getPrincipals().add(new UsernamePrincipal(applyTransforms(clientInformation.getID().getValue())));
+ subject.getPrincipals().add(
+ new UsernamePrincipal(applyTransforms(clientInformation.getID().getValue())));
return super.populateSubject(subject);
} else if (clientInformation.getSecret() == null) {
log.debug("{} OIDC client metadata for '{}' missing client secret", getLogPrefix(),
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCAuthenticationRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCAuthenticationRequestDecoder.java
index 0b4ea98a..aa1a40d5 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCAuthenticationRequestDecoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCAuthenticationRequestDecoder.java
@@ -47,7 +47,7 @@ public class OIDCAuthenticationRequestDecoder extends BaseOAuth2RequestDecoder<A
protected AuthenticationRequest parseMessage() throws MessageDecodingException {
try {
final HTTPRequest httpReq = ServletUtils.createHTTPRequest(getHttpServletRequest());
- protocolMessageLog.trace("Inbound request {}", RequestUtil.toString(httpReq));
+ getProtocolMessageLog().trace("Inbound request {}", RequestUtil.toString(httpReq));
return AuthenticationRequest.parse(httpReq);
} catch (final com.nimbusds.oauth2.sdk.ParseException | IOException e) {
log.error("Unable to decode inbound request: {}", e.getMessage());
@@ -75,7 +75,8 @@ public class OIDCAuthenticationRequestDecoder extends BaseOAuth2RequestDecoder<A
.add("prompt", message.getPrompt())
.add("purpose", message.getPurpose())
.add("redirectionURI", message.getRedirectionURI())
- .add("requestObject", message.getRequestObject() == null ? null : message.getRequestObject().serialize())
+ .add("requestObject", message.getRequestObject() == null ?
+ null : message.getRequestObject().serialize())
.add("requestURI", message.getRequestURI())
.add("resources", message.getResources())
.add("responseMode", message.getResponseMode())
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoder.java
index 97dc20f8..5d8c7109 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoder.java
@@ -50,7 +50,7 @@ public class OIDCClientRegistrationRequestDecoder extends BaseOAuth2RequestDecod
protected OIDCClientRegistrationRequest parseMessage() throws MessageDecodingException {
try {
final HTTPRequest httpRequest = ServletUtils.createHTTPRequest(getHttpServletRequest());
- protocolMessageLog.trace("Inbound request {}", RequestUtil.toString(httpRequest));
+ getProtocolMessageLog().trace("Inbound request {}", RequestUtil.toString(httpRequest));
final JSONObject requestJson = httpRequest.getQueryAsJSONObject();
//TODO: Nimbus seems to be interpreting scope in different way as many RPs, currently the scope
//is removed in this phase, better solution TODO.
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoder.java
index ff70048f..ace4221d 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoder.java
@@ -47,7 +47,7 @@ public class OIDCTokenRequestDecoder extends BaseOAuth2RequestDecoder<TokenReque
protected TokenRequest parseMessage() throws MessageDecodingException {
try {
final HTTPRequest httpReq = ServletUtils.createHTTPRequest(getHttpServletRequest());
- protocolMessageLog.trace("Inbound request {}", RequestUtil.toString(httpReq));
+ getProtocolMessageLog().trace("Inbound request {}", RequestUtil.toString(httpReq));
return TokenRequest.parse(httpReq);
} catch (final ParseException | IOException e) {
log.error("Unable to decode inbound request: {}", e.getMessage());
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCUserInfoRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCUserInfoRequestDecoder.java
index fb79462d..d80f9088 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCUserInfoRequestDecoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/decoding/impl/OIDCUserInfoRequestDecoder.java
@@ -46,7 +46,7 @@ public class OIDCUserInfoRequestDecoder extends BaseOAuth2RequestDecoder<UserInf
protected UserInfoRequest parseMessage() throws MessageDecodingException {
try {
final HTTPRequest httpReq = ServletUtils.createHTTPRequest(getHttpServletRequest());
- protocolMessageLog.trace("Inbound request {}", RequestUtil.toString(httpReq));
+ getProtocolMessageLog().trace("Inbound request {}", RequestUtil.toString(httpReq));
return UserInfoRequest.parse(httpReq);
} catch (final ParseException | IOException e) {
log.error("Unable to decode inbound request: {}", e.getMessage());
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/ResponseUtil.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/ResponseUtil.java
index e597478e..4b0f52c9 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/ResponseUtil.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/ResponseUtil.java
@@ -116,6 +116,8 @@ public final class ResponseUtil {
return ret;
}
+ // Checkstyle: CyclomaticComplexity|ReturnCount OFF
+
/**
* Helper method for getting protocol message for a Nimbus response object. This method can currently
* recognize success and error responses for OIDC authentication, token, userinfo, introspetion and
@@ -152,6 +154,7 @@ public final class ResponseUtil {
}
return MoreObjects.toStringHelper(response).toString();
}
+ // Checkstyle: CyclomaticComplexity|ReturnCount ON
/**
* Helper method for getting protocol message for OIDC authentication response.
@@ -352,7 +355,7 @@ public final class ResponseUtil {
* @param response The response message
* @return The response message specific log message
*/
- @Nullable public static String getProtocolMessageForRevocationResponse(@Nonnull Response response) {
+ @Nullable public static String getProtocolMessageForRevocationResponse(final @Nonnull Response response) {
if (response instanceof OAuth2RevocationSuccessResponse) {
final OAuth2RevocationSuccessResponse successResponse = (OAuth2RevocationSuccessResponse) response;
return MoreObjects.toStringHelper(successResponse).omitNullValues().toString();
@@ -373,7 +376,7 @@ public final class ResponseUtil {
* @param response The response message
* @return The response message specific log message
*/
- @Nullable public static String getProtocolMessageForJSONSuccessResponse(@Nonnull Response response) {
+ @Nullable public static String getProtocolMessageForJSONSuccessResponse(final @Nonnull Response response) {
if (response instanceof JSONSuccessResponse) {
final JSONSuccessResponse successResponse = (JSONSuccessResponse) response;
return successResponse.toString();
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/BaseOAuth2RequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/BaseOAuth2RequestDecoder.java
index dbcec29e..e4c175ab 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/BaseOAuth2RequestDecoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/BaseOAuth2RequestDecoder.java
@@ -40,7 +40,7 @@ public abstract class BaseOAuth2RequestDecoder<T extends Request> extends Abstra
private final Logger log = LoggerFactory.getLogger(BaseOAuth2RequestDecoder.class);
/** Used to log protocol messages. */
- @Nonnull protected final Logger protocolMessageLog = LoggerFactory.getLogger("PROTOCOL_MESSAGE.OAUTH2");
+ @Nonnull private final Logger protocolMessageLog = LoggerFactory.getLogger("PROTOCOL_MESSAGE.OAUTH2");
/** {@inheritDoc} */
@Override
@@ -59,6 +59,14 @@ public abstract class BaseOAuth2RequestDecoder<T extends Request> extends Abstra
}
}
+ /**
+ * Get the protocol message logger.
+ *
+ * @return The protocol message logger
+ */
+ @Nonnull protected Logger getProtocolMessageLog() {
+ return protocolMessageLog;
+ }
/**
* Parses the message into the exact type of the request message.
*
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2IntrospectionRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2IntrospectionRequestDecoder.java
index d25b5133..581d97bc 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2IntrospectionRequestDecoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2IntrospectionRequestDecoder.java
@@ -46,7 +46,7 @@ public class OAuth2IntrospectionRequestDecoder extends BaseOAuth2RequestDecoder<
protected TokenIntrospectionRequest parseMessage() throws MessageDecodingException {
try {
final HTTPRequest httpReq = ServletUtils.createHTTPRequest(getHttpServletRequest());
- protocolMessageLog.trace("Inbound request {}", RequestUtil.toString(httpReq));
+ getProtocolMessageLog().trace("Inbound request {}", RequestUtil.toString(httpReq));
return TokenIntrospectionRequest.parse(httpReq);
} catch (final com.nimbusds.oauth2.sdk.ParseException | IOException e) {
log.error("Unable to decode inbound request: {}", e.getMessage());
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2RevocationRequestDecoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2RevocationRequestDecoder.java
index 70b9dc9b..274b2089 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2RevocationRequestDecoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/decoding/impl/OAuth2RevocationRequestDecoder.java
@@ -46,7 +46,7 @@ public class OAuth2RevocationRequestDecoder extends BaseOAuth2RequestDecoder<Tok
protected TokenRevocationRequest parseMessage() throws MessageDecodingException {
try {
final HTTPRequest httpReq = ServletUtils.createHTTPRequest(getHttpServletRequest());
- protocolMessageLog.trace("Inbound request {}", RequestUtil.toString(httpReq));
+ getProtocolMessageLog().trace("Inbound request {}", RequestUtil.toString(httpReq));
return TokenRevocationRequest.parse(httpReq);
} catch (final com.nimbusds.oauth2.sdk.ParseException | IOException e) {
log.error("Unable to decode inbound request: {}", e.getMessage());
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildAccessToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildAccessToken.java
index 0c917ddd..ea65d84f 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildAccessToken.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildAccessToken.java
@@ -141,7 +141,7 @@ public class BuildAccessToken extends AbstractOIDCResponseAction {
private Function<ProfileRequestContext,BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>>>
tokenClaimsSetManipulationStrategyLookupStrategy;
- /** The strategy used for manipulating the token claims set */
+ /** The strategy used for manipulating the token claims set. */
@Nullable private BiFunction<ProfileRequestContext,Map<String,Object>,Map<String,Object>> manipulationStrategy;
/** Authorize Code / Refresh Token the access token is based on, if any. */
@@ -335,6 +335,7 @@ public class BuildAccessToken extends AbstractOIDCResponseAction {
}
}
+ // Checkstyle: CyclomaticComplexity|MethodLength OFF
/** {@inheritDoc} */
@Override
protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
@@ -354,7 +355,8 @@ public class BuildAccessToken extends AbstractOIDCResponseAction {
tokenClaimsSet = getOidcResponseContext().getAuthorizationGrantClaimsSet();
if (tokenClaimsSet != null && !(tokenClaimsSet instanceof RefreshTokenClaimsSet)
&& !(tokenClaimsSet instanceof AuthorizeCodeClaimsSet)) {
- log.error("{} Authorization grant is of unknown type: {}", getLogPrefix(), tokenClaimsSet.getClass().getName());
+ log.error("{} Authorization grant is of unknown type: {}", getLogPrefix(),
+ tokenClaimsSet.getClass().getName());
ActionSupport.buildEvent(profileRequestContext, EventIds.INVALID_PROFILE_CTX);
return false;
}
@@ -502,7 +504,8 @@ public class BuildAccessToken extends AbstractOIDCResponseAction {
final Map<String, Object> result = manipulationStrategy.apply(profileRequestContext,
claimsSet.getClaimsSet().toJSONObject());
if (result == null) {
- log.debug("{} Manipulation strategy returned null, leaving token claims set untouched.", getLogPrefix());
+ log.debug("{} Manipulation strategy returned null, leaving token claims set untouched.",
+ getLogPrefix());
} else {
log.debug("{} Applying the manipulated claims into the token claims set", getLogPrefix());
try {
@@ -530,6 +533,7 @@ public class BuildAccessToken extends AbstractOIDCResponseAction {
ActionSupport.buildEvent(profileRequestContext, EventIds.MESSAGE_PROC_ERROR);
}
}
+ // Checkstyle: CyclomaticComplexity|MethodLength ON
/**
* Rewrites a plaintext claimsset to hide custom claims used solely by the OP.
@@ -541,7 +545,8 @@ public class BuildAccessToken extends AbstractOIDCResponseAction {
* @throws ParseException if unable to parse a claims set
* @throws DataSealerException if unable to seal the custom claims
*/
- @Nonnull private JWTClaimsSet sealClaims(@Nonnull final JWTClaimsSet claims) throws DataSealerException, ParseException {
+ @Nonnull private JWTClaimsSet sealClaims(@Nonnull final JWTClaimsSet claims)
+ throws DataSealerException, ParseException {
// Rewrite as a mutable map.
final Map<String,Object> map = claims.toJSONObject();
@@ -562,7 +567,8 @@ public class BuildAccessToken extends AbstractOIDCResponseAction {
}
if (map.containsKey(TokenClaimsSet.KEY_DELIVERY_CLAIMS_USERINFO)) {
- toSeal.put(TokenClaimsSet.KEY_DELIVERY_CLAIMS_USERINFO, map.remove(TokenClaimsSet.KEY_DELIVERY_CLAIMS_USERINFO));
+ toSeal.put(TokenClaimsSet.KEY_DELIVERY_CLAIMS_USERINFO,
+ map.remove(TokenClaimsSet.KEY_DELIVERY_CLAIMS_USERINFO));
}
if (map.containsKey(TokenClaimsSet.KEY_CONSENTED_CLAIMS)) {
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateAudience.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateAudience.java
index 20ae0969..7c30d171 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateAudience.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateAudience.java
@@ -163,7 +163,7 @@ public class ValidateAudience extends AbstractOIDCAuthenticationResponseAction {
selfAudienceCondition = Constraint.isNotNull(condition, "Self audience condition cannot be null");
}
-// Checkstyle: CyclomaticComplexity OFF
+// Checkstyle: CyclomaticComplexity|MethodLength OFF
/** {@inheritDoc} */
@Override
protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
@@ -187,9 +187,11 @@ public class ValidateAudience extends AbstractOIDCAuthenticationResponseAction {
if (allowedAudience == null || allowedAudience.isEmpty()) {
if (allowNone) {
if (previouslyGrantedAudience != null || requestedAudience != null) {
- log.warn("{} No allowed audiences for client {}, OP will be sole audience", getLogPrefix(), clientId);
+ log.warn("{} No allowed audiences for client {}, OP will be sole audience", getLogPrefix(),
+ clientId);
} else {
- log.debug("{} No allowed audiences for client {}, OP will be sole audience", getLogPrefix(), clientId);
+ log.debug("{} No allowed audiences for client {}, OP will be sole audience", getLogPrefix(),
+ clientId);
}
} else {
log.warn("{} No allowed audience for client {}", getLogPrefix(), clientId);
@@ -208,7 +210,8 @@ public class ValidateAudience extends AbstractOIDCAuthenticationResponseAction {
if (requestedAudience == null) {
// Nothing requested or previously granted.
if (allowNone) {
- log.debug("{} No audience in request for client {}, OP will be sole audience", getLogPrefix(), clientId);
+ log.debug("{} No audience in request for client {}, OP will be sole audience", getLogPrefix(),
+ clientId);
return;
}
log.debug("{} No audience in request for client {}, using first allowed", getLogPrefix(), clientId);
@@ -251,6 +254,6 @@ public class ValidateAudience extends AbstractOIDCAuthenticationResponseAction {
proxyCtx.getRequesters().addAll(effectiveAudience);
}
-// Checkstyle: CyclomaticComplexity ON
+// Checkstyle: CyclomaticComplexity|MethodLength ON
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthorizationCodeToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthorizationCodeToResponseContext.java
index e8142371..15400a08 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthorizationCodeToResponseContext.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetAuthorizationCodeToResponseContext.java
@@ -316,6 +316,8 @@ public class SetAuthorizationCodeToResponseContext extends AbstractOIDCAuthentic
return true;
}
+ // Checkstyle: MethodLength OFF
+
/** {@inheritDoc} */
@Override
protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
@@ -392,7 +394,8 @@ public class SetAuthorizationCodeToResponseContext extends AbstractOIDCAuthentic
log.error("{} Authorization Code generation failed {}", getLogPrefix(), e.getMessage());
ActionSupport.buildEvent(profileRequestContext, EventIds.UNABLE_TO_ENCRYPT);
}
-
}
+ // Checkstyle: MethodLength ON
+
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRefreshTokenToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRefreshTokenToResponseContext.java
index 2ce9ebd8..61ff814a 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRefreshTokenToResponseContext.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetRefreshTokenToResponseContext.java
@@ -243,6 +243,8 @@ public class SetRefreshTokenToResponseContext extends AbstractOIDCResponseAction
return true;
}
+ // Checkstyle: CyclomaticComplexity OFF
+
/** {@inheritDoc} */
@Override
protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
@@ -304,4 +306,6 @@ public class SetRefreshTokenToResponseContext extends AbstractOIDCResponseAction
}
}
+ // Checkstyle: CyclomaticComplexity ON
+
}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrant.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrant.java
index 14ba449b..765f67eb 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrant.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrant.java
@@ -216,7 +216,8 @@ public class ValidateGrant extends AbstractOIDCTokenResponseAction {
log.error("{} Replay detected of authz code {}", getLogPrefix(), authzCodeClaimsSet.getID());
if (!revokeChain(authzCodeClaimsSet.getID(),
chainRevocationLifetimeLookupStrategy.apply(profileRequestContext))) {
- log.warn("{} Fatal error, unable to save replayed code to revocation cache", getLogPrefix());
+ log.warn("{} Fatal error, unable to save replayed code to revocation cache",
+ getLogPrefix());
}
ActionSupport.buildEvent(profileRequestContext, OidcEventIds.INVALID_GRANT);
return;
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/ParseAccessToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/ParseAccessToken.java
index 54989a7f..b39f85d6 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/ParseAccessToken.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/ParseAccessToken.java
@@ -111,7 +111,9 @@ public class ParseAccessToken extends AbstractOIDCUserInfoValidationResponseActi
throw new ComponentInitializationException("DataSealer cannot be null");
}
}
-
+
+ // Checkstyle: CyclomaticComplexity OFF
+
/** {@inheritDoc} */
@Override
protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
@@ -173,6 +175,8 @@ public class ParseAccessToken extends AbstractOIDCUserInfoValidationResponseActi
getOidcResponseContext().setAuthorizationGrantClaimsSet(accessTokenClaimsSet);
}
+ // Checkstyle: CyclomaticComplexity ON
+
/**
* Attempt to parse token.
*
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/ValidateAccessToken.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/ValidateAccessToken.java
index 2941b8f1..edc5e804 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/ValidateAccessToken.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/userinfo/profile/impl/ValidateAccessToken.java
@@ -101,7 +101,8 @@ public class ValidateAccessToken extends AbstractOIDCUserInfoValidationResponseA
final TokenClaimsSet tokenClaims = getOidcResponseContext().getAuthorizationGrantClaimsSet();
if (!(tokenClaims instanceof AccessTokenClaimsSet) || tokenClaims.getClaimsSet() == null) {
- log.error("{} Claims validation failed, unable to locate access token claims set to validate", getLogPrefix());
+ log.error("{} Claims validation failed, unable to locate access token claims set to validate",
+ getLogPrefix());
ActionSupport.buildEvent(profileRequestContext, OidcEventIds.INVALID_GRANT);
return;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list