Merge branch '1.1.x'

spring-projects · Nov 6, 2023 · cf801c3 · cf801c3
2 parents 6d15154 + 55595ac
commit cf801c3
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/.../authorization/config/annotation/web/configurers/OAuth2AuthorizationServerConfigurer.java b/.../authorization/config/annotation/web/configurers/OAuth2AuthorizationServerConfigurer.java
@@ -55,6 +55,7 @@
 import org.springframework.security.web.util.matcher.OrRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * An {@link AbstractHttpConfigurer} for OAuth 2.0 Authorization Server support.
@@ -387,6 +388,9 @@ private static void validateAuthorizationServerSettings(AuthorizationServerSetti
 			} catch (Exception ex) {
 				throw new IllegalArgumentException("issuer must be a valid URL", ex);
 			}
+			if (StringUtils.hasText(issuerUri.getPath())) {
+				throw new IllegalArgumentException("Path component for issuer ('" + issuerUri.getPath() + "') is currently not supported");
+			}
 			// rfc8414 https://datatracker.ietf.org/doc/html/rfc8414#section-2
 			if (issuerUri.getQuery() != null || issuerUri.getFragment() != null) {
 				throw new IllegalArgumentException("issuer cannot contain query or fragment component");

diff --git a/...erver/authorization/config/annotation/web/configurers/OidcProviderConfigurationTests.java b/...erver/authorization/config/annotation/web/configurers/OidcProviderConfigurationTests.java
@@ -163,6 +163,13 @@ public void loadContextWhenIssuerNotValidUriThenThrowException() {
 		);
 	}
 
+	@Test
+	public void loadContextWhenIssuerWithPathThenThrowException() {
+		assertThatThrownBy(
+				() -> this.spring.register(AuthorizationServerConfigurationWithIssuerPath.class).autowire()
+		);
+	}
+
 	@Test
 	public void loadContextWhenIssuerWithQueryThenThrowException() {
 		assertThatThrownBy(
@@ -184,6 +191,13 @@ public void loadContextWhenIssuerWithQueryAndFragmentThenThrowException() {
 		);
 	}
 
+	@Test
+	public void loadContextWhenIssuerWithEmptyPathThenThrowException() {
+		assertThatThrownBy(
+				() -> this.spring.register(AuthorizationServerConfigurationWithIssuerEmptyPath.class).autowire()
+		);
+	}
+
 	@Test
 	public void loadContextWhenIssuerWithEmptyQueryThenThrowException() {
 		assertThatThrownBy(
@@ -301,6 +315,15 @@ AuthorizationServerSettings authorizationServerSettings() {
 		}
 	}
 
+	@EnableWebSecurity
+	static class AuthorizationServerConfigurationWithIssuerPath extends AuthorizationServerConfiguration {
+
+		@Bean
+		AuthorizationServerSettings authorizationServerSettings() {
+			return AuthorizationServerSettings.builder().issuer(ISSUER_URL + "/issuer1").build();
+		}
+	}
+
 	@EnableWebSecurity
 	static class AuthorizationServerConfigurationWithIssuerQuery extends AuthorizationServerConfiguration {
 
@@ -328,6 +351,15 @@ AuthorizationServerSettings authorizationServerSettings() {
 		}
 	}
 
+	@EnableWebSecurity
+	static class AuthorizationServerConfigurationWithIssuerEmptyPath extends AuthorizationServerConfiguration {
+
+		@Bean
+		AuthorizationServerSettings authorizationServerSettings() {
+			return AuthorizationServerSettings.builder().issuer(ISSUER_URL + "/").build();
+		}
+	}
+
 	@EnableWebSecurity
 	static class AuthorizationServerConfigurationWithIssuerEmptyQuery extends AuthorizationServerConfiguration {