Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 01:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.3.x' into 6.4.x

Browse Source 
Closes gh-17016
This commit is contained in:
Josh Cummings 2025-04-29 14:22:52 -06:00
commit 656ad72608
No known key found for this signature in database
GPG Key ID: 869B37A20E876129
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistrations.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");
* you may not use this file except in compliance with the License.
@ -17,6 +17,7 @@
package org.springframework.security.oauth2.client.registration;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
@ -49,6 +50,7 @@ import org.springframework.web.util.UriComponentsBuilder;
* @author Rob Winch
* @author Josh Cummings
* @author Rafiullah Hamedy
* @author Evgeniy Cheban
* @since 5.1
*/
public final class ClientRegistrations {
@ -251,6 +253,7 @@ public final class ClientRegistrations {
private static ClientRegistration.Builder getBuilder(String issuer,
Supplier<ClientRegistration.Builder>... suppliers) {
String errorMessage = "Unable to resolve Configuration with the provided Issuer of \"" + issuer + "\"";
List<String> errors = new ArrayList<>();
for (Supplier<ClientRegistration.Builder> supplier : suppliers) {
try {
return supplier.get();
@ -259,6 +262,7 @@ public final class ClientRegistrations {
if (!ex.getStatusCode().is4xxClientError()) {
throw ex;
}
errors.add(ex.getMessage());
// else try another endpoint
}
catch (IllegalArgumentException | IllegalStateException ex) {
@ -268,6 +272,9 @@ public final class ClientRegistrations {
throw new IllegalArgumentException(errorMessage, ex);
}
}
if (!errors.isEmpty()) {
throw new IllegalArgumentException(errorMessage + ", errors: " + errors);
}
throw new IllegalArgumentException(errorMessage);
}

31
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationsTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -36,12 +36,14 @@ import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
/**
* @author Rob Winch
* @author Rafiullah Hamedy
* @author Evgeniy Cheban
* @since 5.1
*/
public class ClientRegistrationsTests {
@ -569,6 +571,33 @@ public class ClientRegistrationsTests {
.isEqualTo(ClientAuthenticationMethod.CLIENT_SECRET_BASIC);
}
@Test
public void issuerWhenAllEndpointsFailedThenExceptionIncludesFailureInformation() {
this.issuer = createIssuerFromServer("issuer1");
this.server.setDispatcher(new Dispatcher() {
@Override
public MockResponse dispatch(RecordedRequest request) {
int responseCode = switch (request.getPath()) {
case "/issuer1/.well-known/openid-configuration" -> 405;
case "/.well-known/openid-configuration/issuer1" -> 400;
default -> 404;
};
return new MockResponse().setResponseCode(responseCode);
}
});
String message = """
Unable to resolve Configuration with the provided Issuer of "%s", errors: [\
405 Client Error on GET request for "%s": [no body], \
400 Client Error on GET request for "%s": [no body], \
404 Client Error on GET request for "%s": [no body]]\
""".formatted(this.issuer, this.server.url("/issuer1/.well-known/openid-configuration"),
this.server.url("/.well-known/openid-configuration/issuer1"),
this.server.url("/.well-known/oauth-authorization-server/issuer1"));
assertThatExceptionOfType(IllegalArgumentException.class)
.isThrownBy(() -> ClientRegistrations.fromIssuerLocation(this.issuer).build())
.withMessage(message);
}
private ClientRegistration.Builder registration(String path) throws Exception {
this.issuer = createIssuerFromServer(path);
this.response.put("issuer", this.issuer);