Improve Logging

Closes gh-14837
This commit is contained in:
Josh Cummings
2024-04-17 16:42:02 -06:00
parent 71a51db3a1
commit 657760af5b

View File

@@ -67,7 +67,7 @@ public final class RequestMatcherDelegatingAuthorizationManager implements Autho
@Override @Override
public AuthorizationDecision check(Supplier<Authentication> authentication, HttpServletRequest request) { public AuthorizationDecision check(Supplier<Authentication> authentication, HttpServletRequest request) {
if (this.logger.isTraceEnabled()) { if (this.logger.isTraceEnabled()) {
this.logger.trace(LogMessage.format("Authorizing %s", request)); this.logger.trace(LogMessage.format("Authorizing %s", requestLine(request)));
} }
for (RequestMatcherEntry<AuthorizationManager<RequestAuthorizationContext>> mapping : this.mappings) { for (RequestMatcherEntry<AuthorizationManager<RequestAuthorizationContext>> mapping : this.mappings) {
@@ -76,7 +76,7 @@ public final class RequestMatcherDelegatingAuthorizationManager implements Autho
if (matchResult.isMatch()) { if (matchResult.isMatch()) {
AuthorizationManager<RequestAuthorizationContext> manager = mapping.getEntry(); AuthorizationManager<RequestAuthorizationContext> manager = mapping.getEntry();
if (this.logger.isTraceEnabled()) { 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, return manager.check(authentication,
new RequestAuthorizationContext(request, matchResult.getVariables())); new RequestAuthorizationContext(request, matchResult.getVariables()));
@@ -86,6 +86,10 @@ public final class RequestMatcherDelegatingAuthorizationManager implements Autho
return null; return null;
} }
private static String requestLine(HttpServletRequest request) {
return request.getMethod() + " " + UrlUtils.buildRequestUrl(request);
}
/** /**
* Creates a builder for {@link RequestMatcherDelegatingAuthorizationManager}. * Creates a builder for {@link RequestMatcherDelegatingAuthorizationManager}.
* @return the new {@link Builder} instance * @return the new {@link Builder} instance