Merge pull request #49 from carne-iot/0.0.6.RELEASE

0.0.6.release
carne-iot · Nov 22, 2017 · f512805 · f512805
2 parents e2c54ca + ddacc9d
commit f512805
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>ar.edu.itba.iot.carne-iot</groupId>
     <artifactId>server</artifactId>
-    <version>0.0.5.RELEASE</version>
+    <version>0.0.6.RELEASE</version>
     <packaging>pom</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
 

diff --git a/server-core/pom.xml b/server-core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>ar.edu.itba.iot.carne-iot</groupId>
         <artifactId>server</artifactId>
-        <version>0.0.5.RELEASE</version>
+        <version>0.0.6.RELEASE</version>
     </parent>
 
     <artifactId>server-core</artifactId>

diff --git a/server-persistence-interfaces/pom.xml b/server-persistence-interfaces/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>ar.edu.itba.iot.carne-iot</groupId>
         <artifactId>server</artifactId>
-        <version>0.0.5.RELEASE</version>
+        <version>0.0.6.RELEASE</version>
     </parent>
 
     <artifactId>server-persistence-interfaces</artifactId>

diff --git a/server-persistence/pom.xml b/server-persistence/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>ar.edu.itba.iot.carne-iot</groupId>
         <artifactId>server</artifactId>
-        <version>0.0.5.RELEASE</version>
+        <version>0.0.6.RELEASE</version>
     </parent>
 
     <artifactId>server-persistence</artifactId>

diff --git a/server-services-interfaces/pom.xml b/server-services-interfaces/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>ar.edu.itba.iot.carne-iot</groupId>
         <artifactId>server</artifactId>
-        <version>0.0.5.RELEASE</version>
+        <version>0.0.6.RELEASE</version>
     </parent>
 
     <artifactId>server-services-interfaces</artifactId>

diff --git a/server-services/pom.xml b/server-services/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>ar.edu.itba.iot.carne-iot</groupId>
         <artifactId>server</artifactId>
-        <version>0.0.5.RELEASE</version>
+        <version>0.0.6.RELEASE</version>
     </parent>
 
     <artifactId>server-services</artifactId>

diff --git a/server-webapp/pom.xml b/server-webapp/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>ar.edu.itba.iot.carne-iot</groupId>
         <artifactId>server</artifactId>
-        <version>0.0.5.RELEASE</version>
+        <version>0.0.6.RELEASE</version>
     </parent>
 
     <artifactId>server-webapp</artifactId>

diff --git a/.../src/main/java/ar/edu/itba/iot/carne_iot/server/web/security/authentication/JwtAgent.java b/.../src/main/java/ar/edu/itba/iot/carne_iot/server/web/security/authentication/JwtAgent.java
@@ -133,7 +133,11 @@ public JwtTokenData compile(String rawToken) throws IllegalArgumentException {
             final String username = claims.getSubject();
 
             if (roles.contains(Role.ROLE_DEVICE)) {
-                final long deviceId = (long) claims.get(DEVICE_ID_CLAIMS_NAME);
+                final Object deviceIdObject = claims.get(DEVICE_ID_CLAIMS_NAME);
+                if (!(deviceIdObject instanceof Number)) {
+                    throw new MalformedJwtException("The \"device id\" claim must be a number");
+                }
+                final long deviceId = ((Number) deviceIdObject).longValue();
                 return new DeviceJwtTokenData(userId, username, roles, deviceId);
             }
             checkJwtBlacklist(userId, jti);  // Device tokens are not blacklisted