Merge branch '6.2.x'
This commit is contained in:
commit
36cd48474d
|
@ -31,6 +31,7 @@ import org.springframework.security.authorization.AuthorityAuthorizationManager;
|
||||||
import org.springframework.security.authorization.AuthorizationDecision;
|
import org.springframework.security.authorization.AuthorizationDecision;
|
||||||
import org.springframework.security.authorization.AuthorizationManager;
|
import org.springframework.security.authorization.AuthorizationManager;
|
||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
|
import org.springframework.security.web.util.UrlUtils;
|
||||||
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
|
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
|
||||||
import org.springframework.security.web.util.matcher.RequestMatcher;
|
import org.springframework.security.web.util.matcher.RequestMatcher;
|
||||||
import org.springframework.security.web.util.matcher.RequestMatcher.MatchResult;
|
import org.springframework.security.web.util.matcher.RequestMatcher.MatchResult;
|
||||||
|
@ -80,7 +81,8 @@ 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", requestLine(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()));
|
||||||
|
|
Loading…
Reference in New Issue