You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oltu.apache.org by ja...@apache.org on 2016/07/05 04:55:58 UTC
svn commit: r1751397 - in /oltu/trunk/oauth-2.0/jwt/src:
main/java/org/apache/oltu/oauth2/jwt/io/JWTClaimsSetParser.java
test/java/org/apache/oltu/oauth2/jwt/io/JWTReaderTestCase.java
test/java/org/apache/oltu/oauth2/jwt/io/JWTWriterTestCase.java
Author: jasha
Date: Tue Jul 5 04:55:58 2016
New Revision: 1751397
URL: http://svn.apache.org/viewvc?rev=1751397&view=rev
Log:
OLTU-196 Prevent ClassCastException with Integers
Modified:
oltu/trunk/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/io/JWTClaimsSetParser.java
oltu/trunk/oauth-2.0/jwt/src/test/java/org/apache/oltu/oauth2/jwt/io/JWTReaderTestCase.java
oltu/trunk/oauth-2.0/jwt/src/test/java/org/apache/oltu/oauth2/jwt/io/JWTWriterTestCase.java
Modified: oltu/trunk/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/io/JWTClaimsSetParser.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/io/JWTClaimsSetParser.java?rev=1751397&r1=1751396&r2=1751397&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/io/JWTClaimsSetParser.java (original)
+++ oltu/trunk/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/io/JWTClaimsSetParser.java Tue Jul 5 04:55:58 2016
@@ -16,13 +16,13 @@
*/
package org.apache.oltu.oauth2.jwt.io;
+import org.apache.oltu.commons.json.CustomizableEntityReader;
+import org.apache.oltu.oauth2.jwt.JWT;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.oltu.commons.json.CustomizableEntityReader;
-import org.apache.oltu.oauth2.jwt.JWT;
-
final class JWTClaimsSetParser extends CustomizableEntityReader<JWT, JWT.Builder> implements JWTConstants {
public JWTClaimsSetParser(JWT.Builder builder) {
@@ -34,9 +34,9 @@ final class JWTClaimsSetParser extends C
if (AUDIENCE.equals(key)) {
handleAudience(value);
} else if (EXPIRATION_TIME.equals(key)) {
- getBuilder().setClaimsSetExpirationTime(((Long) value));
+ getBuilder().setClaimsSetExpirationTime(((Number) value).longValue());
} else if (ISSUED_AT.equals(key)) {
- getBuilder().setClaimsSetIssuedAt(((Long) value));
+ getBuilder().setClaimsSetIssuedAt(((Number) value).longValue());
} else if (ISSUER.equals(key)) {
getBuilder().setClaimsSetIssuer(String.valueOf(value));
} else if (JWT_ID.equals(key)) {
Modified: oltu/trunk/oauth-2.0/jwt/src/test/java/org/apache/oltu/oauth2/jwt/io/JWTReaderTestCase.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/jwt/src/test/java/org/apache/oltu/oauth2/jwt/io/JWTReaderTestCase.java?rev=1751397&r1=1751396&r2=1751397&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/jwt/src/test/java/org/apache/oltu/oauth2/jwt/io/JWTReaderTestCase.java (original)
+++ oltu/trunk/oauth-2.0/jwt/src/test/java/org/apache/oltu/oauth2/jwt/io/JWTReaderTestCase.java Tue Jul 5 04:55:58 2016
@@ -16,9 +16,6 @@
*/
package org.apache.oltu.oauth2.jwt.io;
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
import org.apache.oltu.oauth2.jwt.ClaimsSet;
import org.apache.oltu.oauth2.jwt.Header;
import org.apache.oltu.oauth2.jwt.JWT;
@@ -26,6 +23,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertEquals;
+
public final class JWTReaderTestCase implements IOTestCaseConstants {
private JWT jwt;
@@ -66,8 +67,8 @@ public final class JWTReaderTestCase imp
assertEquals("788732372078.apps.googleusercontent.com", claimsSet.getAudience());
assertEquals("accounts.google.com", claimsSet.getIssuer());
assertEquals("106422453082479998429", claimsSet.getSubject());
- assertEquals(1366730217, claimsSet.getExpirationTime());
- assertEquals(1366726317, claimsSet.getIssuedAt());
+ assertEquals(1366730217L, claimsSet.getExpirationTime());
+ assertEquals(1366726317L, claimsSet.getIssuedAt());
}
@Test
@@ -78,8 +79,8 @@ public final class JWTReaderTestCase imp
assertEquals("788732372078.apps.googleusercontent.com", claimsSet.getAudience());
assertEquals("accounts.google.com", claimsSet.getIssuer());
assertEquals("106422453082479998429", claimsSet.getSubject());
- assertEquals(1366730217, claimsSet.getExpirationTime());
- assertEquals(1366726317, claimsSet.getIssuedAt());
+ assertEquals(1366730217L, claimsSet.getExpirationTime());
+ assertEquals(1366726317L, claimsSet.getIssuedAt());
}
}
Modified: oltu/trunk/oauth-2.0/jwt/src/test/java/org/apache/oltu/oauth2/jwt/io/JWTWriterTestCase.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/jwt/src/test/java/org/apache/oltu/oauth2/jwt/io/JWTWriterTestCase.java?rev=1751397&r1=1751396&r2=1751397&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/jwt/src/test/java/org/apache/oltu/oauth2/jwt/io/JWTWriterTestCase.java (original)
+++ oltu/trunk/oauth-2.0/jwt/src/test/java/org/apache/oltu/oauth2/jwt/io/JWTWriterTestCase.java Tue Jul 5 04:55:58 2016
@@ -16,12 +16,13 @@
*/
package org.apache.oltu.oauth2.jwt.io;
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
import org.apache.oltu.oauth2.jwt.JWT;
import org.junit.Test;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertEquals;
+
public final class JWTWriterTestCase implements IOTestCaseConstants {
@Test
@@ -34,8 +35,8 @@ public final class JWTWriterTestCase imp
.setClaimsSetAudience("788732372078.apps.googleusercontent.com")
.setClaimsSetIssuer("accounts.google.com")
.setClaimsSetSubject("106422453082479998429")
- .setClaimsSetExpirationTime(1366730217)
- .setClaimsSetIssuedAt(1366726317)
+ .setClaimsSetExpirationTime(1366730217L)
+ .setClaimsSetIssuedAt(1366726317L)
.setClaimsSetCustomField("id", "106422453082479998429")
.setClaimsSetCustomField("verified_email", "true")
.setClaimsSetCustomField("email_verified", "true")
@@ -61,8 +62,8 @@ public final class JWTWriterTestCase imp
.setClaimsSetAudiences(Arrays.asList("788732372078.apps.googleusercontent.com"))
.setClaimsSetIssuer("accounts.google.com")
.setClaimsSetSubject("106422453082479998429")
- .setClaimsSetExpirationTime(1366730217)
- .setClaimsSetIssuedAt(1366726317)
+ .setClaimsSetExpirationTime(1366730217L)
+ .setClaimsSetIssuedAt(1366726317L)
.setClaimsSetCustomField("id", "106422453082479998429")
.setClaimsSetCustomField("verified_email", "true")
.setClaimsSetCustomField("email_verified", "true")
@@ -88,8 +89,8 @@ public final class JWTWriterTestCase imp
.setClaimsSetAudiences(Arrays.asList("788732372078.apps.googleusercontent.com", "foo"))
.setClaimsSetIssuer("accounts.google.com")
.setClaimsSetSubject("106422453082479998429")
- .setClaimsSetExpirationTime(1366730217)
- .setClaimsSetIssuedAt(1366726317)
+ .setClaimsSetExpirationTime(1366730217L)
+ .setClaimsSetIssuedAt(1366726317L)
.setClaimsSetCustomField("id", "106422453082479998429")
.setClaimsSetCustomField("verified_email", "true")
.setClaimsSetCustomField("email_verified", "true")