From 657760af5bfc0b1d723f4e4e70ff3a3e3632bb92 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Wed, 17 Apr 2024 16:42:02 -0600 Subject: [PATCH] Improve Logging Closes gh-14837 --- .../RequestMatcherDelegatingAuthorizationManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/src/main/java/org/springframework/security/web/access/intercept/RequestMatcherDelegatingAuthorizationManager.java b/web/src/main/java/org/springframework/security/web/access/intercept/RequestMatcherDelegatingAuthorizationManager.java index e19285c1ef..4a32e82139 100644 --- a/web/src/main/java/org/springframework/security/web/access/intercept/RequestMatcherDelegatingAuthorizationManager.java +++ b/web/src/main/java/org/springframework/security/web/access/intercept/RequestMatcherDelegatingAuthorizationManager.java @@ -67,7 +67,7 @@ public final class RequestMatcherDelegatingAuthorizationManager implements Autho @Override public AuthorizationDecision check(Supplier authentication, HttpServletRequest request) { if (this.logger.isTraceEnabled()) { - this.logger.trace(LogMessage.format("Authorizing %s", request)); + this.logger.trace(LogMessage.format("Authorizing %s", requestLine(request))); } for (RequestMatcherEntry> mapping : this.mappings) { @@ -76,7 +76,7 @@ public final class RequestMatcherDelegatingAuthorizationManager implements Autho if (matchResult.isMatch()) { AuthorizationManager manager = mapping.getEntry(); if (this.logger.isTraceEnabled()) { - this.logger.trace(LogMessage.format("Checking authorization on %s using %s", request, manager)); + this.logger.trace(LogMessage.format("Checking authorization on %s using %s", requestLine(request), manager)); } return manager.check(authentication, new RequestAuthorizationContext(request, matchResult.getVariables())); @@ -86,6 +86,10 @@ public final class RequestMatcherDelegatingAuthorizationManager implements Autho return null; } + private static String requestLine(HttpServletRequest request) { + return request.getMethod() + " " + UrlUtils.buildRequestUrl(request); + } + /** * Creates a builder for {@link RequestMatcherDelegatingAuthorizationManager}. * @return the new {@link Builder} instance