Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Align Test Support Claims 

Make all sub claims 'user' and all scopes 'read' to align with
existing support for JWT

Issue gh-7828
Issue gh-7789
Issue gh-7680
Issue gh-7618
This commit is contained in:
Josh Cummings 2020-03-02 17:58:48 -07:00
parent 30adabb685
commit 689fc9df0c
No known key found for this signature in database
GPG Key ID: 49EF60DD7FF83443
9 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/boot/oauth2login-webflux/src/test/java/sample/OAuth2LoginControllerTests.java
View File

@ -79,6 +79,6 @@ public class OAuth2LoginControllerTests {
public void indexGreetsAuthenticatedUser() { public void indexGreetsAuthenticatedUser() {
this.rest.mutateWith(mockOAuth2Login()) this.rest.mutateWith(mockOAuth2Login())
.get().uri("/").exchange() .get().uri("/").exchange()
.expectBody(String.class).value(containsString("test-subject")); .expectBody(String.class).value(containsString("user"));
} }
} }

4
samples/boot/oauth2login/src/integration-test/java/sample/OAuth2LoginApplicationTests.java
View File

@ -263,9 +263,9 @@ public class OAuth2LoginApplicationTests {
public void requestWhenMockOAuth2LoginThenIndex() throws Exception { public void requestWhenMockOAuth2LoginThenIndex() throws Exception {
ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId("github"); ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId("github");
this.mvc.perform(get("/").with(oauth2Login().clientRegistration(clientRegistration))) this.mvc.perform(get("/").with(oauth2Login().clientRegistration(clientRegistration)))
.andExpect(model().attribute("userName", "test-subject")) .andExpect(model().attribute("userName", "user"))
.andExpect(model().attribute("clientName", "GitHub")) .andExpect(model().attribute("clientName", "GitHub"))
.andExpect(model().attribute("userAttributes", Collections.singletonMap("sub", "test-subject"))); .andExpect(model().attribute("userAttributes", Collections.singletonMap("sub", "user")));
} }
private void assertLoginPage(HtmlPage page) { private void assertLoginPage(HtmlPage page) {

4
samples/boot/oauth2login/src/test/java/sample/web/OAuth2LoginControllerTests.java
View File

@ -64,9 +64,9 @@ public class OAuth2LoginControllerTests {
@Test @Test
public void rootWhenAuthenticatedReturnsUserAndClient() throws Exception { public void rootWhenAuthenticatedReturnsUserAndClient() throws Exception {
this.mvc.perform(get("/").with(oauth2Login())) this.mvc.perform(get("/").with(oauth2Login()))
.andExpect(model().attribute("userName", "test-subject")) .andExpect(model().attribute("userName", "user"))
.andExpect(model().attribute("clientName", "test")) .andExpect(model().attribute("clientName", "test"))
.andExpect(model().attribute("userAttributes", Collections.singletonMap("sub", "test-subject"))); .andExpect(model().attribute("userAttributes", Collections.singletonMap("sub", "user")));
} }
@Test @Test

14
test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java
View File

@ -185,7 +185,7 @@ public class SecurityMockServerConfigurers {
*/ */
public static OAuth2LoginMutator mockOAuth2Login() { public static OAuth2LoginMutator mockOAuth2Login() {
OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token", OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token",
null, null, Collections.singleton("user")); null, null, Collections.singleton("read"));
return new OAuth2LoginMutator(accessToken); return new OAuth2LoginMutator(accessToken);
} }
@ -200,7 +200,7 @@ public class SecurityMockServerConfigurers {
*/ */
public static OidcLoginMutator mockOidcLogin() { public static OidcLoginMutator mockOidcLogin() {
OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token", OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token",
null, null, Collections.singleton("user")); null, null, Collections.singleton("read"));
return new OidcLoginMutator(accessToken); return new OidcLoginMutator(accessToken);
} }
@ -844,7 +844,7 @@ public class SecurityMockServerConfigurers {
private Map<String, Object> defaultAttributes() { private Map<String, Object> defaultAttributes() {
Map<String, Object> attributes = new HashMap<>(); Map<String, Object> attributes = new HashMap<>();
attributes.put(this.nameAttributeKey, "test-subject"); attributes.put(this.nameAttributeKey, "user");
return attributes; return attributes;
} }
@ -907,7 +907,7 @@ public class SecurityMockServerConfigurers {
*/ */
public OidcLoginMutator idToken(Consumer<OidcIdToken.Builder> idTokenBuilderConsumer) { public OidcLoginMutator idToken(Consumer<OidcIdToken.Builder> idTokenBuilderConsumer) {
OidcIdToken.Builder builder = OidcIdToken.withTokenValue("id-token"); OidcIdToken.Builder builder = OidcIdToken.withTokenValue("id-token");
builder.subject("test-subject"); builder.subject("user");
idTokenBuilderConsumer.accept(builder); idTokenBuilderConsumer.accept(builder);
this.idToken = builder.build(); this.idToken = builder.build();
this.oidcUser = this::defaultPrincipal; this.oidcUser = this::defaultPrincipal;
@ -1018,7 +1018,7 @@ public class SecurityMockServerConfigurers {
private OidcIdToken getOidcIdToken() { private OidcIdToken getOidcIdToken() {
if (this.idToken == null) { if (this.idToken == null) {
return new OidcIdToken("id-token", null, null, Collections.singletonMap(IdTokenClaimNames.SUB, "test-subject")); return new OidcIdToken("id-token", null, null, Collections.singletonMap(IdTokenClaimNames.SUB, "user"));
} else { } else {
return this.idToken; return this.idToken;
} }
@ -1041,7 +1041,7 @@ public class SecurityMockServerConfigurers {
private String registrationId = "test"; private String registrationId = "test";
private ClientRegistration clientRegistration; private ClientRegistration clientRegistration;
private OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, private OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER,
"access-token", null, null, Collections.singleton("user")); "access-token", null, null, Collections.singleton("read"));
private ServerOAuth2AuthorizedClientRepository authorizedClientRepository = private ServerOAuth2AuthorizedClientRepository authorizedClientRepository =
new WebSessionServerOAuth2AuthorizedClientRepository(); new WebSessionServerOAuth2AuthorizedClientRepository();
@ -1122,7 +1122,7 @@ public class SecurityMockServerConfigurers {
throw new IllegalArgumentException("Please specify a ClientRegistration via one " + throw new IllegalArgumentException("Please specify a ClientRegistration via one " +
"of the clientRegistration methods"); "of the clientRegistration methods");
} }
return new OAuth2AuthorizedClient(this.clientRegistration, "test-subject", this.accessToken); return new OAuth2AuthorizedClient(this.clientRegistration, "user", this.accessToken);
} }
private ClientRegistration.Builder clientRegistrationBuilder() { private ClientRegistration.Builder clientRegistrationBuilder() {

14
test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java
View File

@ -398,7 +398,7 @@ public final class SecurityMockMvcRequestPostProcessors {
*/ */
public static OAuth2LoginRequestPostProcessor oauth2Login() { public static OAuth2LoginRequestPostProcessor oauth2Login() {
OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token", OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token",
null, null, Collections.singleton("user")); null, null, Collections.singleton("read"));
return new OAuth2LoginRequestPostProcessor(accessToken); return new OAuth2LoginRequestPostProcessor(accessToken);
} }
@ -428,7 +428,7 @@ public final class SecurityMockMvcRequestPostProcessors {
*/ */
public static OidcLoginRequestPostProcessor oidcLogin() { public static OidcLoginRequestPostProcessor oidcLogin() {
OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token", OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token",
null, null, Collections.singleton("user")); null, null, Collections.singleton("read"));
return new OidcLoginRequestPostProcessor(accessToken); return new OidcLoginRequestPostProcessor(accessToken);
} }
@ -1435,7 +1435,7 @@ public final class SecurityMockMvcRequestPostProcessors {
private Map<String, Object> defaultAttributes() { private Map<String, Object> defaultAttributes() {
Map<String, Object> attributes = new HashMap<>(); Map<String, Object> attributes = new HashMap<>();
attributes.put(this.nameAttributeKey, "test-subject"); attributes.put(this.nameAttributeKey, "user");
return attributes; return attributes;
} }
@ -1495,7 +1495,7 @@ public final class SecurityMockMvcRequestPostProcessors {
*/ */
public OidcLoginRequestPostProcessor idToken(Consumer<OidcIdToken.Builder> idTokenBuilderConsumer) { public OidcLoginRequestPostProcessor idToken(Consumer<OidcIdToken.Builder> idTokenBuilderConsumer) {
OidcIdToken.Builder builder = OidcIdToken.withTokenValue("id-token"); OidcIdToken.Builder builder = OidcIdToken.withTokenValue("id-token");
builder.subject("test-subject"); builder.subject("user");
idTokenBuilderConsumer.accept(builder); idTokenBuilderConsumer.accept(builder);
this.idToken = builder.build(); this.idToken = builder.build();
this.oidcUser = this::defaultPrincipal; this.oidcUser = this::defaultPrincipal;
@ -1577,7 +1577,7 @@ public final class SecurityMockMvcRequestPostProcessors {
private OidcIdToken getOidcIdToken() { private OidcIdToken getOidcIdToken() {
if (this.idToken == null) { if (this.idToken == null) {
return new OidcIdToken("id-token", null, null, return new OidcIdToken("id-token", null, null,
Collections.singletonMap(IdTokenClaimNames.SUB, "test-subject")); Collections.singletonMap(IdTokenClaimNames.SUB, "user"));
} else { } else {
return this.idToken; return this.idToken;
} }
@ -1600,7 +1600,7 @@ public final class SecurityMockMvcRequestPostProcessors {
private String registrationId = "test"; private String registrationId = "test";
private ClientRegistration clientRegistration; private ClientRegistration clientRegistration;
private OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, private OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER,
"access-token", null, null, Collections.singleton("user")); "access-token", null, null, Collections.singleton("read"));
private OAuth2ClientRequestPostProcessor() { private OAuth2ClientRequestPostProcessor() {
} }
@ -1654,7 +1654,7 @@ public final class SecurityMockMvcRequestPostProcessors {
"of the clientRegistration methods"); "of the clientRegistration methods");
} }
OAuth2AuthorizedClient client = new OAuth2AuthorizedClient OAuth2AuthorizedClient client = new OAuth2AuthorizedClient
(this.clientRegistration, "test-subject", this.accessToken); (this.clientRegistration, "user", this.accessToken);
OAuth2AuthorizedClientRepository authorizedClientRepository = OAuth2AuthorizedClientRepository authorizedClientRepository =
new HttpSessionOAuth2AuthorizedClientRepository(); new HttpSessionOAuth2AuthorizedClientRepository();
authorizedClientRepository.saveAuthorizedClient(client, null, request, new MockHttpServletResponse()); authorizedClientRepository.saveAuthorizedClient(client, null, request, new MockHttpServletResponse());

6
test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOAuth2LoginTests.java
View File

@ -86,9 +86,9 @@ public class SecurityMockServerConfigurersOAuth2LoginTests extends AbstractMockS
assertThat(token.getAuthorizedClientRegistrationId()).isEqualTo("test"); assertThat(token.getAuthorizedClientRegistrationId()).isEqualTo("test");
assertThat(token.getPrincipal()).isInstanceOf(OAuth2User.class); assertThat(token.getPrincipal()).isInstanceOf(OAuth2User.class);
assertThat(token.getPrincipal().getAttributes()) assertThat(token.getPrincipal().getAttributes())
.containsEntry("sub", "test-subject"); .containsEntry("sub", "user");
assertThat((Collection<GrantedAuthority>) token.getPrincipal().getAuthorities()) assertThat((Collection<GrantedAuthority>) token.getPrincipal().getAuthorities())
.contains(new SimpleGrantedAuthority("SCOPE_user")); .contains(new SimpleGrantedAuthority("SCOPE_read"));
} }
@Test @Test
@ -134,7 +134,7 @@ public class SecurityMockServerConfigurersOAuth2LoginTests extends AbstractMockS
@Test @Test
public void oauth2LoginWhenOAuth2UserSpecifiedThenLastCalledTakesPrecedence() throws Exception { public void oauth2LoginWhenOAuth2UserSpecifiedThenLastCalledTakesPrecedence() throws Exception {
OAuth2User oauth2User = new DefaultOAuth2User( OAuth2User oauth2User = new DefaultOAuth2User(
AuthorityUtils.createAuthorityList("SCOPE_user"), AuthorityUtils.createAuthorityList("SCOPE_read"),
Collections.singletonMap("sub", "subject"), Collections.singletonMap("sub", "subject"),
"sub"); "sub");

6
test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOidcLoginTests.java
View File

@ -86,9 +86,9 @@ public class SecurityMockServerConfigurersOidcLoginTests extends AbstractMockSer
assertThat(token.getAuthorizedClientRegistrationId()).isEqualTo("test"); assertThat(token.getAuthorizedClientRegistrationId()).isEqualTo("test");
assertThat(token.getPrincipal()).isInstanceOf(OidcUser.class); assertThat(token.getPrincipal()).isInstanceOf(OidcUser.class);
assertThat(token.getPrincipal().getAttributes()) assertThat(token.getPrincipal().getAttributes())
.containsEntry("sub", "test-subject"); .containsEntry("sub", "user");
assertThat((Collection<GrantedAuthority>) token.getPrincipal().getAuthorities()) assertThat((Collection<GrantedAuthority>) token.getPrincipal().getAuthorities())
.contains(new SimpleGrantedAuthority("SCOPE_user")); .contains(new SimpleGrantedAuthority("SCOPE_read"));
assertThat(((OidcUser) token.getPrincipal()).getIdToken().getTokenValue()) assertThat(((OidcUser) token.getPrincipal()).getIdToken().getTokenValue())
.isEqualTo("id-token"); .isEqualTo("id-token");
} }
@ -150,7 +150,7 @@ public class SecurityMockServerConfigurersOidcLoginTests extends AbstractMockSer
@Test @Test
public void oidcLoginWhenOidcUserSpecifiedThenLastCalledTakesPrecedence() throws Exception { public void oidcLoginWhenOidcUserSpecifiedThenLastCalledTakesPrecedence() throws Exception {
OidcUser oidcUser = new DefaultOidcUser( OidcUser oidcUser = new DefaultOidcUser(
AuthorityUtils.createAuthorityList("SCOPE_user"), idToken().build()); AuthorityUtils.createAuthorityList("SCOPE_read"), idToken().build());
this.client.mutateWith(mockOidcLogin() this.client.mutateWith(mockOidcLogin()
.idToken(i -> i.subject("foo")) .idToken(i -> i.subject("foo"))

8
test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOAuth2LoginTests.java
View File

@ -90,7 +90,7 @@ public class SecurityMockMvcRequestPostProcessorsOAuth2LoginTests {
throws Exception { throws Exception {
this.mvc.perform(get("/name").with(oauth2Login())) this.mvc.perform(get("/name").with(oauth2Login()))
.andExpect(content().string("test-subject")); .andExpect(content().string("user"));
this.mvc.perform(get("/admin/id-token/name").with(oauth2Login())) this.mvc.perform(get("/admin/id-token/name").with(oauth2Login()))
.andExpect(status().isForbidden()); .andExpect(status().isForbidden());
} }
@ -120,7 +120,7 @@ public class SecurityMockMvcRequestPostProcessorsOAuth2LoginTests {
@Test @Test
public void oauth2LoginWhenNameSpecifiedThenUserHasName() throws Exception { public void oauth2LoginWhenNameSpecifiedThenUserHasName() throws Exception {
OAuth2User oauth2User = new DefaultOAuth2User( OAuth2User oauth2User = new DefaultOAuth2User(
AuthorityUtils.commaSeparatedStringToAuthorityList("SCOPE_user"), AuthorityUtils.commaSeparatedStringToAuthorityList("SCOPE_read"),
Collections.singletonMap("custom-attribute", "test-subject"), Collections.singletonMap("custom-attribute", "test-subject"),
"custom-attribute"); "custom-attribute");
this.mvc.perform(get("/attributes/custom-attribute") this.mvc.perform(get("/attributes/custom-attribute")
@ -142,7 +142,7 @@ public class SecurityMockMvcRequestPostProcessorsOAuth2LoginTests {
@Test @Test
public void oauth2LoginWhenOAuth2UserSpecifiedThenLastCalledTakesPrecedence() throws Exception { public void oauth2LoginWhenOAuth2UserSpecifiedThenLastCalledTakesPrecedence() throws Exception {
OAuth2User oauth2User = new DefaultOAuth2User( OAuth2User oauth2User = new DefaultOAuth2User(
AuthorityUtils.createAuthorityList("SCOPE_user"), AuthorityUtils.createAuthorityList("SCOPE_read"),
Collections.singletonMap("username", "user"), Collections.singletonMap("username", "user"),
"username"); "username");
@ -167,7 +167,7 @@ public class SecurityMockMvcRequestPostProcessorsOAuth2LoginTests {
http http
.authorizeRequests(authorize -> authorize .authorizeRequests(authorize -> authorize
.mvcMatchers("/admin/**").hasAuthority("SCOPE_admin") .mvcMatchers("/admin/**").hasAuthority("SCOPE_admin")
.anyRequest().hasAuthority("SCOPE_user") .anyRequest().hasAuthority("SCOPE_read")
).oauth2Login(); ).oauth2Login();
} }

6
test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOidcLoginTests.java
View File

@ -95,7 +95,7 @@ public class SecurityMockMvcRequestPostProcessorsOidcLoginTests {
throws Exception { throws Exception {
this.mvc.perform(get("/name").with(oidcLogin())) this.mvc.perform(get("/name").with(oidcLogin()))
.andExpect(content().string("test-subject")); .andExpect(content().string("user"));
this.mvc.perform(get("/admin/id-token/name").with(oidcLogin())) this.mvc.perform(get("/admin/id-token/name").with(oidcLogin()))
.andExpect(status().isForbidden()); .andExpect(status().isForbidden());
} }
@ -133,7 +133,7 @@ public class SecurityMockMvcRequestPostProcessorsOidcLoginTests {
@Test @Test
public void oidcLoginWhenOidcUserSpecifiedThenLastCalledTakesPrecedence() throws Exception { public void oidcLoginWhenOidcUserSpecifiedThenLastCalledTakesPrecedence() throws Exception {
OidcUser oidcUser = new DefaultOidcUser( OidcUser oidcUser = new DefaultOidcUser(
AuthorityUtils.createAuthorityList("SCOPE_user"), idToken().build()); AuthorityUtils.createAuthorityList("SCOPE_read"), idToken().build());
this.mvc.perform(get("/id-token/sub") this.mvc.perform(get("/id-token/sub")
.with(oidcLogin() .with(oidcLogin()
@ -156,7 +156,7 @@ public class SecurityMockMvcRequestPostProcessorsOidcLoginTests {
http http
.authorizeRequests() .authorizeRequests()
.mvcMatchers("/admin/**").hasAuthority("SCOPE_admin") .mvcMatchers("/admin/**").hasAuthority("SCOPE_admin")
.anyRequest().hasAuthority("SCOPE_user") .anyRequest().hasAuthority("SCOPE_read")
.and() .and()
.oauth2Login(); .oauth2Login();
} }