|
|
|
@ -29,6 +29,8 @@ import org.springframework.security.core.context.SecurityContext; |
|
|
|
import org.springframework.security.core.context.SecurityContextHolder; |
|
|
|
import org.springframework.security.core.context.SecurityContextHolder; |
|
|
|
import org.springframework.security.core.context.SecurityContextHolderStrategy; |
|
|
|
import org.springframework.security.core.context.SecurityContextHolderStrategy; |
|
|
|
import org.springframework.util.Assert; |
|
|
|
import org.springframework.util.Assert; |
|
|
|
|
|
|
|
import org.jspecify.annotations.Nullable; |
|
|
|
|
|
|
|
import org.jspecify.annotations.NullUnmarked; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* <p> |
|
|
|
* <p> |
|
|
|
@ -93,7 +95,7 @@ public class SecurityEvaluationContextExtension implements EvaluationContextExte |
|
|
|
private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder |
|
|
|
private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder |
|
|
|
.getContextHolderStrategy(); |
|
|
|
.getContextHolderStrategy(); |
|
|
|
|
|
|
|
|
|
|
|
private Authentication authentication; |
|
|
|
private @Nullable Authentication authentication; |
|
|
|
|
|
|
|
|
|
|
|
private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl(); |
|
|
|
private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl(); |
|
|
|
|
|
|
|
|
|
|
|
@ -146,7 +148,7 @@ public class SecurityEvaluationContextExtension implements EvaluationContextExte |
|
|
|
this.securityContextHolderStrategy = securityContextHolderStrategy; |
|
|
|
this.securityContextHolderStrategy = securityContextHolderStrategy; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private Authentication getAuthentication() { |
|
|
|
private @Nullable Authentication getAuthentication() { |
|
|
|
if (this.authentication != null) { |
|
|
|
if (this.authentication != null) { |
|
|
|
return this.authentication; |
|
|
|
return this.authentication; |
|
|
|
} |
|
|
|
} |
|
|
|
|