Spring/spring-graphql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

Browse Source
This commit is contained in:
rstoyanchev
2025-02-17 15:21:17 +00:00
parent 36d76a4cd1 6120c31706
commit 914b958d2c
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-graphql/src/main/java/org/springframework/graphql/server/support/BearerTokenAuthenticationExtractor.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import org.springframework.lang.Nullable;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
import org.springframework.security.oauth2.server.resource.BearerTokenError; import org.springframework.security.oauth2.server.resource.BearerTokenError;
@@ -68,7 +69,7 @@ public final class BearerTokenAuthenticationExtractor implements AuthenticationE
@Override @Override
public Mono<Authentication> getAuthentication(Map<String, Object> payload) { public Mono<Authentication> getAuthentication(Map<String, Object> payload) {
String authorizationValue = (String) payload.get(this.authorizationKey); String authorizationValue = getAuthorizationValue(payload);
if (authorizationValue == null) { if (authorizationValue == null) {
return Mono.empty(); return Mono.empty();
} }
@@ -88,4 +89,18 @@ public final class BearerTokenAuthenticationExtractor implements AuthenticationE
return Mono.just(new BearerTokenAuthenticationToken(token)); return Mono.just(new BearerTokenAuthenticationToken(token));
} }
@Nullable
private String getAuthorizationValue(Map<String, Object> payload) {
String value = (String) payload.get(this.authorizationKey);
if (value != null) {
return value;
}
for (String key : payload.keySet()) {
if (key.equalsIgnoreCase(this.authorizationKey)) {
return (String) payload.get(key);
}
}
return null;
}
} }

10
spring-graphql/src/test/java/org/springframework/graphql/server/support/BearerTokenAuthenticationExtractorTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -46,6 +46,14 @@ public class BearerTokenAuthenticationExtractorTests {
assertThat(auth.getName()).isEqualTo("123456789"); assertThat(auth.getName()).isEqualTo("123456789");
} }
@Test // gh-1116
void extractCaseInsensitive() {
Authentication auth = getAuthentication(Map.of("authorization", "Bearer 123456789"));
assertThat(auth).isNotNull();
assertThat(auth.getName()).isEqualTo("123456789");
}
@Test @Test
void noToken() { void noToken() {
Authentication auth = getAuthentication(Collections.emptyMap()); Authentication auth = getAuthentication(Collections.emptyMap());