SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Specify clientRegistrationId in TokenRelayFilterFunctions (#3591)

Browse Source 
Closes gh-3541
This commit is contained in:
Steve Riesenberg
2024-11-19 10:19:36 -06:00
committed by GitHub
parent 905080983d
commit 311d9a1caf
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/TokenRelayFilterFunctions.java
View File

@@ -16,9 +16,8 @@
package org.springframework.cloud.gateway.server.mvc.filter;
import java.security.Principal;
import org.springframework.cloud.gateway.server.mvc.common.Shortcut;
import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.client.OAuth2AuthorizeRequest;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager;
@@ -37,13 +36,21 @@ public abstract class TokenRelayFilterFunctions {
@Shortcut
public static HandlerFilterFunction<ServerResponse, ServerResponse> tokenRelay() {
return tokenRelay(null);
}
public static HandlerFilterFunction<ServerResponse, ServerResponse> tokenRelay(String defaultClientRegistrationId) {
return (request, next) -> {
Principal principle = request.servletRequest().getUserPrincipal();
if (principle instanceof OAuth2AuthenticationToken token) {
String clientRegistrationId = token.getAuthorizedClientRegistrationId();
Authentication principal = (Authentication) request.servletRequest().getUserPrincipal();
String clientRegistrationId = defaultClientRegistrationId;
if (clientRegistrationId == null && principal instanceof OAuth2AuthenticationToken token) {
clientRegistrationId = token.getAuthorizedClientRegistrationId();
}
if (clientRegistrationId != null) {
OAuth2AuthorizeRequest authorizeRequest = OAuth2AuthorizeRequest
.withClientRegistrationId(clientRegistrationId)
.principal(token)
.principal(principal)
.build();
OAuth2AuthorizedClientManager clientManager = getApplicationContext(request)
.getBean(OAuth2AuthorizedClientManager.class);

23
spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/TokenRelayFilterFunctionsTests.java
View File

@@ -104,6 +104,29 @@ public class TokenRelayFilterFunctionsTests {
});
}
@Test
public void whenDefaultClientRegistrationIdProvidedAuthorizationHeaderAdded() throws Exception {
OAuth2AccessToken accessToken = mock(OAuth2AccessToken.class);
when(accessToken.getTokenValue()).thenReturn("mytoken");
ClientRegistration clientRegistration = ClientRegistration.withRegistrationId("myregistrationid")
.authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS)
.clientId("myclientid")
.tokenUri("mytokenuri")
.build();
OAuth2AuthorizedClient authorizedClient = new OAuth2AuthorizedClient(clientRegistration, "joe", accessToken);
when(authorizedClientManager.authorize(any(OAuth2AuthorizeRequest.class))).thenReturn(authorizedClient);
request.setUserPrincipal(new TestingAuthenticationToken("my", null));
filter = TokenRelayFilterFunctions.tokenRelay("myId");
filter.filter(ServerRequest.create(request, converters), req -> {
assertThat(req.headers().firstHeader(HttpHeaders.AUTHORIZATION)).isEqualTo("Bearer mytoken");
return null;
});
}
@Test
public void principalIsNotOAuth2AuthenticationToken() throws Exception {
request.setUserPrincipal(new TestingAuthenticationToken("my", null));