Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-05 17:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Align Test Support Claims

Browse Source 
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
9 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java
+7 -7
View File
@@ -185,7 +185,7 @@ public class SecurityMockServerConfigurers {
*/
public static OAuth2LoginMutator mockOAuth2Login() {
OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token",
null, null, Collections.singleton("user"));
null, null, Collections.singleton("read"));
return new OAuth2LoginMutator(accessToken);
}
@@ -200,7 +200,7 @@ public class SecurityMockServerConfigurers {
*/
public static OidcLoginMutator mockOidcLogin() {
OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token",
null, null, Collections.singleton("user"));
null, null, Collections.singleton("read"));
return new OidcLoginMutator(accessToken);
}
@@ -844,7 +844,7 @@ public class SecurityMockServerConfigurers {
private Map<String, Object> defaultAttributes() {
Map<String, Object> attributes = new HashMap<>();
attributes.put(this.nameAttributeKey, "test-subject");
attributes.put(this.nameAttributeKey, "user");
return attributes;
}
@@ -907,7 +907,7 @@ public class SecurityMockServerConfigurers {
*/
public OidcLoginMutator idToken(Consumer<OidcIdToken.Builder> idTokenBuilderConsumer) {
OidcIdToken.Builder builder = OidcIdToken.withTokenValue("id-token");
builder.subject("test-subject");
builder.subject("user");
idTokenBuilderConsumer.accept(builder);
this.idToken = builder.build();
this.oidcUser = this::defaultPrincipal;
@@ -1018,7 +1018,7 @@ public class SecurityMockServerConfigurers {
private OidcIdToken getOidcIdToken() {
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 {
return this.idToken;
}
@@ -1041,7 +1041,7 @@ public class SecurityMockServerConfigurers {
private String registrationId = "test";
private ClientRegistration clientRegistration;
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 =
new WebSessionServerOAuth2AuthorizedClientRepository();
@@ -1122,7 +1122,7 @@ public class SecurityMockServerConfigurers {
throw new IllegalArgumentException("Please specify a ClientRegistration via one " +
"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() {
test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java
+7 -7
View File
@@ -398,7 +398,7 @@ public final class SecurityMockMvcRequestPostProcessors {
*/
public static OAuth2LoginRequestPostProcessor oauth2Login() {
OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token",
null, null, Collections.singleton("user"));
null, null, Collections.singleton("read"));
return new OAuth2LoginRequestPostProcessor(accessToken);
}
@@ -428,7 +428,7 @@ public final class SecurityMockMvcRequestPostProcessors {
*/
public static OidcLoginRequestPostProcessor oidcLogin() {
OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "access-token",
null, null, Collections.singleton("user"));
null, null, Collections.singleton("read"));
return new OidcLoginRequestPostProcessor(accessToken);
}
@@ -1435,7 +1435,7 @@ public final class SecurityMockMvcRequestPostProcessors {
private Map<String, Object> defaultAttributes() {
Map<String, Object> attributes = new HashMap<>();
attributes.put(this.nameAttributeKey, "test-subject");
attributes.put(this.nameAttributeKey, "user");
return attributes;
}
@@ -1495,7 +1495,7 @@ public final class SecurityMockMvcRequestPostProcessors {
*/
public OidcLoginRequestPostProcessor idToken(Consumer<OidcIdToken.Builder> idTokenBuilderConsumer) {
OidcIdToken.Builder builder = OidcIdToken.withTokenValue("id-token");
builder.subject("test-subject");
builder.subject("user");
idTokenBuilderConsumer.accept(builder);
this.idToken = builder.build();
this.oidcUser = this::defaultPrincipal;
@@ -1577,7 +1577,7 @@ public final class SecurityMockMvcRequestPostProcessors {
private OidcIdToken getOidcIdToken() {
if (this.idToken == null) {
return new OidcIdToken("id-token", null, null,
Collections.singletonMap(IdTokenClaimNames.SUB, "test-subject"));
Collections.singletonMap(IdTokenClaimNames.SUB, "user"));
} else {
return this.idToken;
}
@@ -1600,7 +1600,7 @@ public final class SecurityMockMvcRequestPostProcessors {
private String registrationId = "test";
private ClientRegistration clientRegistration;
private OAuth2AccessToken accessToken = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER,
"access-token", null, null, Collections.singleton("user"));
"access-token", null, null, Collections.singleton("read"));
private OAuth2ClientRequestPostProcessor() {
}
@@ -1654,7 +1654,7 @@ public final class SecurityMockMvcRequestPostProcessors {
"of the clientRegistration methods");
}
OAuth2AuthorizedClient client = new OAuth2AuthorizedClient
(this.clientRegistration, "test-subject", this.accessToken);
(this.clientRegistration, "user", this.accessToken);
OAuth2AuthorizedClientRepository authorizedClientRepository =
new HttpSessionOAuth2AuthorizedClientRepository();
authorizedClientRepository.saveAuthorizedClient(client, null, request, new MockHttpServletResponse());