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

JwtAuthenticationTokenTests Polish 

Using Jwt.Builder to clean up some of this test's config.

Issue: gh-6893
This commit is contained in:
Josh Cummings 2019-05-23 11:24:40 -06:00
parent 936d28d328
commit af3c6d4972
No known key found for this signature in database
GPG Key ID: 49EF60DD7FF83443
1 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationTokenTests.java
View File

@ -16,24 +16,19 @@
package org.springframework.security.oauth2.server.resource.authentication; package org.springframework.security.oauth2.server.resource.authentication;
import java.time.Instant;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.assertj.core.util.Maps;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.oauth2.jose.jws.JwsAlgorithms; import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.oauth2.jwt.Jwt; import org.springframework.security.oauth2.jwt.Jwt;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatCode;
import static org.springframework.security.oauth2.jwt.JwtClaimNames.SUB; import static org.springframework.security.oauth2.jose.jws.JwsAlgorithms.RS256;
/** /**
* Tests for {@link JwtAuthenticationToken} * Tests for {@link JwtAuthenticationToken}
@ -45,8 +40,7 @@ public class JwtAuthenticationTokenTests {
@Test @Test
public void getNameWhenJwtHasSubjectThenReturnsSubject() { public void getNameWhenJwtHasSubjectThenReturnsSubject() {
Jwt jwt = this.jwt(Maps.newHashMap("sub", "Carl")); Jwt jwt = builder().subject("Carl").build();
JwtAuthenticationToken token = new JwtAuthenticationToken(jwt); JwtAuthenticationToken token = new JwtAuthenticationToken(jwt);
assertThat(token.getName()).isEqualTo("Carl"); assertThat(token.getName()).isEqualTo("Carl");
@ -54,8 +48,7 @@ public class JwtAuthenticationTokenTests {
@Test @Test
public void getNameWhenJwtHasNoSubjectThenReturnsNull() { public void getNameWhenJwtHasNoSubjectThenReturnsNull() {
Jwt jwt = this.jwt(Maps.newHashMap("claim", "value")); Jwt jwt = builder().claim("claim", "value").build();
JwtAuthenticationToken token = new JwtAuthenticationToken(jwt); JwtAuthenticationToken token = new JwtAuthenticationToken(jwt);
assertThat(token.getName()).isNull(); assertThat(token.getName()).isNull();
@ -70,40 +63,34 @@ public class JwtAuthenticationTokenTests {
@Test @Test
public void constructorWhenUsingCorrectParametersThenConstructedCorrectly() { public void constructorWhenUsingCorrectParametersThenConstructedCorrectly() {
Collection authorities = Arrays.asList(new SimpleGrantedAuthority("test")); Collection<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("test");
Map claims = Maps.newHashMap("claim", "value"); Jwt jwt = builder().claim("claim", "value").build();
Jwt jwt = this.jwt(claims);
JwtAuthenticationToken token = new JwtAuthenticationToken(jwt, authorities); JwtAuthenticationToken token = new JwtAuthenticationToken(jwt, authorities);
assertThat(token.getAuthorities()).isEqualTo(authorities); assertThat(token.getAuthorities()).isEqualTo(authorities);
assertThat(token.getPrincipal()).isEqualTo(jwt); assertThat(token.getPrincipal()).isEqualTo(jwt);
assertThat(token.getCredentials()).isEqualTo(jwt); assertThat(token.getCredentials()).isEqualTo(jwt);
assertThat(token.getToken()).isEqualTo(jwt); assertThat(token.getToken()).isEqualTo(jwt);
assertThat(token.getTokenAttributes()).isEqualTo(claims); assertThat(token.getTokenAttributes()).isEqualTo(jwt.getClaims());
assertThat(token.isAuthenticated()).isTrue(); assertThat(token.isAuthenticated()).isTrue();
} }
@Test @Test
public void constructorWhenUsingOnlyJwtThenConstructedCorrectly() { public void constructorWhenUsingOnlyJwtThenConstructedCorrectly() {
Map claims = Maps.newHashMap("claim", "value"); Jwt jwt = builder().claim("claim", "value").build();
Jwt jwt = this.jwt(claims);
JwtAuthenticationToken token = new JwtAuthenticationToken(jwt); JwtAuthenticationToken token = new JwtAuthenticationToken(jwt);
assertThat(token.getAuthorities()).isEmpty(); assertThat(token.getAuthorities()).isEmpty();
assertThat(token.getPrincipal()).isEqualTo(jwt); assertThat(token.getPrincipal()).isEqualTo(jwt);
assertThat(token.getCredentials()).isEqualTo(jwt); assertThat(token.getCredentials()).isEqualTo(jwt);
assertThat(token.getToken()).isEqualTo(jwt); assertThat(token.getToken()).isEqualTo(jwt);
assertThat(token.getTokenAttributes()).isEqualTo(claims); assertThat(token.getTokenAttributes()).isEqualTo(jwt.getClaims());
assertThat(token.isAuthenticated()).isFalse(); assertThat(token.isAuthenticated()).isFalse();
} }
@Test @Test
public void getNameWhenConstructedWithJwtThenReturnsSubject() { public void getNameWhenConstructedWithJwtThenReturnsSubject() {
Map claims = Maps.newHashMap(SUB, "Hayden"); Jwt jwt = builder().subject("Hayden").build();
Jwt jwt = this.jwt(claims);
JwtAuthenticationToken token = new JwtAuthenticationToken(jwt); JwtAuthenticationToken token = new JwtAuthenticationToken(jwt);
assertThat(token.getName()).isEqualTo("Hayden"); assertThat(token.getName()).isEqualTo("Hayden");
@ -111,10 +98,8 @@ public class JwtAuthenticationTokenTests {
@Test @Test
public void getNameWhenConstructedWithJwtAndAuthoritiesThenReturnsSubject() { public void getNameWhenConstructedWithJwtAndAuthoritiesThenReturnsSubject() {
Collection authorities = Arrays.asList(new SimpleGrantedAuthority("test")); Collection<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("test");
Map claims = Maps.newHashMap(SUB, "Hayden"); Jwt jwt = builder().subject("Hayden").build();
Jwt jwt = this.jwt(claims);
JwtAuthenticationToken token = new JwtAuthenticationToken(jwt, authorities); JwtAuthenticationToken token = new JwtAuthenticationToken(jwt, authorities);
assertThat(token.getName()).isEqualTo("Hayden"); assertThat(token.getName()).isEqualTo("Hayden");
@ -122,10 +107,8 @@ public class JwtAuthenticationTokenTests {
@Test @Test
public void getNameWhenConstructedWithNameThenReturnsProvidedName() { public void getNameWhenConstructedWithNameThenReturnsProvidedName() {
Collection authorities = Arrays.asList(new SimpleGrantedAuthority("test")); Collection<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("test");
Map claims = Maps.newHashMap("claim", "value"); Jwt jwt = builder().claim("claim", "value").build();
Jwt jwt = this.jwt(claims);
JwtAuthenticationToken token = new JwtAuthenticationToken(jwt, authorities, "Hayden"); JwtAuthenticationToken token = new JwtAuthenticationToken(jwt, authorities, "Hayden");
assertThat(token.getName()).isEqualTo("Hayden"); assertThat(token.getName()).isEqualTo("Hayden");
@ -133,19 +116,15 @@ public class JwtAuthenticationTokenTests {
@Test @Test
public void getNameWhenConstructedWithNoSubjectThenReturnsNull() { public void getNameWhenConstructedWithNoSubjectThenReturnsNull() {
Collection authorities = Arrays.asList(new SimpleGrantedAuthority("test")); Collection<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("test");
Map claims = Maps.newHashMap("claim", "value"); Jwt jwt = builder().claim("claim", "value").build();
Jwt jwt = this.jwt(claims);
assertThat(new JwtAuthenticationToken(jwt, authorities, null).getName()).isNull(); assertThat(new JwtAuthenticationToken(jwt, authorities, null).getName()).isNull();
assertThat(new JwtAuthenticationToken(jwt, authorities).getName()).isNull(); assertThat(new JwtAuthenticationToken(jwt, authorities).getName()).isNull();
assertThat(new JwtAuthenticationToken(jwt).getName()).isNull(); assertThat(new JwtAuthenticationToken(jwt).getName()).isNull();
} }
private Jwt jwt(Map<String, Object> claims) { private Jwt.Builder builder() {
Map<String, Object> headers = new HashMap<>(); return Jwt.withTokenValue("token").header("alg", RS256);
headers.put("alg", JwsAlgorithms.RS256);
return new Jwt("token", Instant.now(), Instant.now().plusSeconds(3600), headers, claims);
} }
} }