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

Improve ClaimAccessor getClaimAsInstant 

Fixes gh-5250
This commit is contained in:
Joe Grandja 2018-05-03 21:03:32 -04:00
parent 2356749cc3
commit fff64db0e2
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/ClaimAccessor.java
View File

@ -83,8 +83,10 @@ public interface ClaimAccessor {
return null;
}
Object claimValue = this.getClaims().get(claim);
if (Long.class.isAssignableFrom(claimValue.getClass())) {
return Instant.ofEpochSecond((Long) claimValue);
if (Long.class.isAssignableFrom(claimValue.getClass()) ||
Integer.class.isAssignableFrom(claimValue.getClass()) ||
Double.class.isAssignableFrom(claimValue.getClass())) {
return Instant.ofEpochSecond(((Number) claimValue).longValue());
}
if (Date.class.isAssignableFrom(claimValue.getClass())) {
return ((Date) claimValue).toInstant();

22
oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/ClaimAccessorTests.java
View File

@ -70,4 +70,26 @@ public class ClaimAccessorTests {
assertThat(this.claimAccessor.getClaimAsInstant(claimName)).isBetween(
expectedClaimValue.minusSeconds(1), expectedClaimValue.plusSeconds(1));
}
// gh-5250
@Test
public void getClaimAsInstantWhenIntegerTypeSecondsThenReturnInstant() {
Instant expectedClaimValue = Instant.now();
String claimName = "integerSeconds";
this.claims.put(claimName, Long.valueOf(expectedClaimValue.getEpochSecond()).intValue());
assertThat(this.claimAccessor.getClaimAsInstant(claimName)).isBetween(
expectedClaimValue.minusSeconds(1), expectedClaimValue.plusSeconds(1));
}
// gh-5250
@Test
public void getClaimAsInstantWhenDoubleTypeSecondsThenReturnInstant() {
Instant expectedClaimValue = Instant.now();
String claimName = "doubleSeconds";
this.claims.put(claimName, Long.valueOf(expectedClaimValue.getEpochSecond()).doubleValue());
assertThat(this.claimAccessor.getClaimAsInstant(claimName)).isBetween(
expectedClaimValue.minusSeconds(1), expectedClaimValue.plusSeconds(1));
}
}