[java-idp-oidc] branch main updated: JOIDC-112 - PROTOCOL_MESSAGE.OAUTH2 log appender to trace all the exchanged protocol messages

Henri Mikkonen henri.mikkonen at iki.fi
Tue Jun 28 14:44:28 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=5c5e5a3341b351a19011cb0631bcd73c70af1708

The following commit(s) were added to refs/heads/main by this push:
     new 5c5e5a33 JOIDC-112 - PROTOCOL_MESSAGE.OAUTH2 log appender to trace all the exchanged protocol messages
5c5e5a33 is described below

commit 5c5e5a3341b351a19011cb0631bcd73c70af1708
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Tue Jun 28 17:43:01 2022 +0300

    JOIDC-112 - PROTOCOL_MESSAGE.OAUTH2 log appender to trace all the exchanged protocol messages
    
    https://shibboleth.atlassian.net/browse/JOIDC-112
    
    Switched the class loggers' DEBUG-level inbound/outbound request/response logging into
    PROTOCOL_MESSAGE.OAUTH2 TRACE-level.
---
 .../oidc/op/decoding/impl/OIDCAuthenticationRequestDecoder.java       | 2 +-
 .../oidc/op/decoding/impl/OIDCClientRegistrationRequestDecoder.java   | 2 +-
 .../idp/plugin/oidc/op/decoding/impl/OIDCTokenRequestDecoder.java     | 2 +-
 .../idp/plugin/oidc/op/decoding/impl/OIDCUserInfoRequestDecoder.java  | 2 +-
 .../idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java       | 4 ++--
 .../plugin/oidc/op/oauth2/decoding/impl/BaseOAuth2RequestDecoder.java | 2 +-
 .../op/oauth2/decoding/impl/OAuth2IntrospectionRequestDecoder.java    | 2 +-
 .../oidc/op/oauth2/decoding/impl/OAuth2RevocationRequestDecoder.java  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

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 588287d4..0b4ea98a 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());
-            log.debug("Inbound request {}", RequestUtil.toString(httpReq));
+            protocolMessageLog.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());
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 94661099..97dc20f8 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());
-            log.debug("Inbound request {}", RequestUtil.toString(httpRequest));
+            protocolMessageLog.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 65ef5539..ff70048f 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());
-            log.debug("Inbound request {}", RequestUtil.toString(httpReq));
+            protocolMessageLog.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 8aef7af0..fb79462d 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());
-            log.debug("Inbound request {}", RequestUtil.toString(httpReq));
+            protocolMessageLog.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/NimbusResponseEncoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java
index f53c402f..19bf4ddc 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java
@@ -152,11 +152,11 @@ public class NimbusResponseEncoder extends AbstractHttpServletResponseMessageEnc
                 // Write it also to log
                 final StringWriter writer = new StringWriter();
                 velocityEngine.mergeTemplate(velocityTemplateId, "UTF-8", context, writer);
-                log.debug("Outbound response {}", ResponseUtil.toString(response, writer.toString()));
+                protocolMessageLog.trace("Outbound response {}", ResponseUtil.toString(response, writer.toString()));
                 return;
             }
             final HTTPResponse resp = ((Response) getMessageContext().getMessage()).toHTTPResponse();
-            log.debug("Outbound response {}", ResponseUtil.toString(resp));
+            protocolMessageLog.trace("Outbound response {}", ResponseUtil.toString(resp));
             ServletUtils.applyHTTPResponse(resp, response);
         } catch (final IOException e) {
             throw new MessageEncodingException("Problem encoding response", e);
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 bc611fe7..db6449ec 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 private final Logger protocolMessageLog = LoggerFactory.getLogger("PROTOCOL_MESSAGE.OAUTH2");
+    @Nonnull protected final Logger protocolMessageLog = LoggerFactory.getLogger("PROTOCOL_MESSAGE.OAUTH2");
 
     /** {@inheritDoc} */
     @Override
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 2294a0b4..d25b5133 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());
-            log.debug("Inbound request {}", RequestUtil.toString(httpReq));
+            protocolMessageLog.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 12d37b19..70b9dc9b 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());
-            log.debug("Inbound request {}", RequestUtil.toString(httpReq));
+            protocolMessageLog.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());

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list