diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilter.java index 3afd969bed..30bad8f8a9 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilter.java @@ -58,7 +58,7 @@ public class RequestAttributeAuthenticationFilter extends AbstractPreAuthenticat * missing and {@code exceptionIfVariableMissing} is set to {@code true}. */ @Override - protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) { + protected @Nullable Object getPreAuthenticatedPrincipal(HttpServletRequest request) { String principal = (String) request.getAttribute(this.principalEnvironmentVariable); if (principal == null && this.exceptionIfVariableMissing) { throw new PreAuthenticatedCredentialsNotFoundException( @@ -73,7 +73,7 @@ public class RequestAttributeAuthenticationFilter extends AbstractPreAuthenticat * credentials value. Otherwise a dummy value will be used. */ @Override - protected Object getPreAuthenticatedCredentials(HttpServletRequest request) { + protected @Nullable Object getPreAuthenticatedCredentials(HttpServletRequest request) { if (this.credentialsEnvironmentVariable != null) { return request.getAttribute(this.credentialsEnvironmentVariable); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java index c2c51e9a48..ae00e9e4a5 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java @@ -59,7 +59,7 @@ public class RequestHeaderAuthenticationFilter extends AbstractPreAuthenticatedP * {@code exceptionIfHeaderMissing} is set to {@code true}. */ @Override - protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) { + protected @Nullable Object getPreAuthenticatedPrincipal(HttpServletRequest request) { String principal = request.getHeader(this.principalRequestHeader); if (principal == null && this.exceptionIfHeaderMissing) { throw new PreAuthenticatedCredentialsNotFoundException( @@ -74,7 +74,7 @@ public class RequestHeaderAuthenticationFilter extends AbstractPreAuthenticatedP * will be used. */ @Override - protected Object getPreAuthenticatedCredentials(HttpServletRequest request) { + protected @Nullable Object getPreAuthenticatedCredentials(HttpServletRequest request) { if (this.credentialsRequestHeader != null) { return request.getHeader(this.credentialsRequestHeader); }