Skip to content

Commit 90b9cfa

Browse files
bhavikkumarrwinch
authored andcommitted
Use SpringUtils to check scheme
Fixes 6183
1 parent be423de commit 90b9cfa

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.springframework.security.web.authentication.RememberMeServices;
3838
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
3939
import org.springframework.util.Assert;
40+
import org.springframework.util.StringUtils;
4041
import org.springframework.web.filter.OncePerRequestFilter;
4142

4243
/**
@@ -154,7 +155,7 @@ protected void doFilterInternal(HttpServletRequest request,
154155

155156
String header = request.getHeader("Authorization");
156157

157-
if (header == null || !header.toLowerCase().startsWith("basic ")) {
158+
if (!StringUtils.startsWithIgnoreCase(header, "basic ")) {
158159
chain.doFilter(request, response);
159160
return;
160161
}

web/src/main/java/org/springframework/security/web/server/ServerHttpBasicAuthenticationConverter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.springframework.http.server.reactive.ServerHttpRequest;
2323
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
2424
import org.springframework.security.core.Authentication;
25+
import org.springframework.util.StringUtils;
2526
import org.springframework.web.server.ServerWebExchange;
2627

2728
import reactor.core.publisher.Mono;
@@ -46,7 +47,7 @@ public Mono<Authentication> apply(ServerWebExchange exchange) {
4647
ServerHttpRequest request = exchange.getRequest();
4748

4849
String authorization = request.getHeaders().getFirst(HttpHeaders.AUTHORIZATION);
49-
if (authorization == null || !authorization.toLowerCase().startsWith("basic ")) {
50+
if (!StringUtils.startsWithIgnoreCase(authorization, "basic ")) {
5051
return Mono.empty();
5152
}
5253

0 commit comments

Comments
 (0)