Test auth expired

Author: lm2343635

src/main/java/org/mushare/pluto/Pluto.java

@@ -4,6 +4,7 @@
 import org.mushare.pluto.exception.PlutoErrorCode;
 import org.mushare.pluto.exception.PlutoException;
 
+import java.io.UnsupportedEncodingException;
 import java.security.Signature;
 import java.util.Base64;
 
@@ -23,7 +24,7 @@ public static void setup(String server, String appId) {
         shared.appId = appId;
     }
 
-    public static PlutoUser auth(String token) throws PlutoException {
+    public static PlutoUser auth(String token) {
         if (token == null) {
             throw new PlutoException(PlutoErrorCode.jwtFormatError);
         }
@@ -32,28 +33,39 @@ public static PlutoUser auth(String token) throws PlutoException {
             throw new PlutoException(PlutoErrorCode.jwtFormatError);
         }
 
+        String header = null;
+        JSONObject payload = null;
+        try {
+            header = new String(Base64.getDecoder().decode(parts[0]), "utf-8");
+            payload = JSONObject.fromObject(new String(Base64.getDecoder().decode(parts[1]), "utf-8"));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            throw new PlutoException(PlutoErrorCode.other);
+        }
+        // Verify the appId of the jwt token.
+        if (!payload.getString("appId").equals(shared.appId)) {
+            throw new PlutoException(PlutoErrorCode.appIdError);
+        }
+        Long expire = payload.getLong("expire_time") * 1000;
+        if (expire < System.currentTimeMillis()) {
+            throw new PlutoException(PlutoErrorCode.expired);
+        }
+
+        boolean verified = false;
         try {
-            String header = new String(Base64.getDecoder().decode(parts[0]), "utf-8");
-            JSONObject payload = JSONObject.fromObject(new String(Base64.getDecoder().decode(parts[1]), "utf-8"));
-            // Verify the appId of the jwt token.
-            if (!payload.getString("appId").equals(shared.appId)) {
-                throw new PlutoException(PlutoErrorCode.appIdError);
-            }
-            Long expire = payload.getLong("expire_time") * 1000;
-            if (expire < System.currentTimeMillis()) {
-                throw new PlutoException(PlutoErrorCode.expired);
-            }
             Signature signature = Signature.getInstance("SHA256withRSA");
             signature.initVerify(shared.keyManager.getPublicKey());
             signature.update((header + payload).getBytes());
-            if (!signature.verify(Base64.getDecoder().decode(parts[2]))) {
-                throw new PlutoException(PlutoErrorCode.notVerified);
-            }
-            return new PlutoUser(payload);
+            verified = signature.verify(Base64.getDecoder().decode(parts[2]));
         } catch (Exception e) {
             e.printStackTrace();
             throw new PlutoException(PlutoErrorCode.other);
         }
+
+        if (!verified) {
+            throw new PlutoException(PlutoErrorCode.notVerified);
+        }
+        return new PlutoUser(payload);
     }
 
 }

src/main/java/org/mushare/pluto/exception/PlutoException.java

@@ -9,4 +9,8 @@ public PlutoException(PlutoErrorCode code) {
         this.error = new PlutoError(code);
     }
 
+    @Override
+    public String getMessage() {
+        return error.getMessage();
+    }
 }

src/test/java/org/mushare/pluto/PlutoTest.java

@@ -1,6 +1,12 @@
 package org.mushare.pluto;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mushare.pluto.exception.PlutoErrorCode;
+import org.mushare.pluto.exception.PlutoException;
+
+import java.util.Base64;
 
 import static org.junit.Assert.assertTrue;
 
@@ -11,8 +17,20 @@ public void testAuth() {
         Pluto.setup("https://staging.easyjapanese-api-gateway.mushare.cn/pluto/", "org.mushare.easyjapanese");
         String scope = "easyjapanese.admin";
         String token = "eyJ0eXBlIjoiand0IiwiYWxnIjoicnNhIn0.eyJ0eXBlIjoiYWNjZXNzIiwiY3JlYXRlX3RpbWUiOjE1ODQ3MjIyMjQsImV4cGlyZV90aW1lIjoxNTg0NzI1ODI0LCJ1c2VySWQiOjMsImRldmljZUlkIjoiQ0Y0Mzc5MzMtQ0MyMS00QUFCLTgxNjEtMUU1MTVCNjQxQTU5IiwiYXBwSWQiOiJvcmcubXVzaGFyZS5lYXN5amFwYW5lc2UiLCJzY29wZXMiOlsiZWFzeWphcGFuZXNlLmFkbWluIl0sImxvZ2luX3R5cGUiOiJtYWlsIn0.V6HVNGsRvzLkgCzPxV3JH9H1GqF/ycNrKQDp/mzq/OdCOy1v8cu/O9HCjtW2J5NZuYgdtletEuoEdIQBUqtRHAseRPcyUmddWf3NxCHcqpAQZW2hJzp8WRgfP2Gug+O++IBoysntYz6FWSLUqw0HzGlU46J4jQnmzWvW/MR/mvM/7IWS5mtPM8DftlI3hBeeXH6FRKMtRbzr4PD0sTb/rSpJPtcs2YXmlj8C5DOhZd2XQjqnA7HhA3MZ2PAy6hkeZ99qyDUZav5SoOQQ8qCNbGDg/nQbeIaUHcg4Fx0F5lIlFAyHHaEkyhwSN4dLI+4ZD1rIxIXLH+uzcWOCYTIxag";
-        PlutoUser user = Pluto.auth(token);
-        assertTrue("testAuth should return 'true'", user.getScopes().contains(scope));
+        assertTrue("testAuth should return 'true'", Pluto.auth(token).getScopes().contains(scope));
+    }
+
+    @Rule
+    public ExpectedException exceptionRule = ExpectedException.none();
+
+    @Test
+    public void testAuthExpired() {
+        exceptionRule.expect(PlutoException.class);
+        exceptionRule.expectMessage(PlutoErrorCode.expired.toString());
+
+        Pluto.setup("https://staging.easyjapanese-api-gateway.mushare.cn/pluto/", "org.mushare.easyjapanese");
+        String token = "eyJ0eXBlIjoiand0IiwiYWxnIjoicnNhIn0.eyJ0eXBlIjoiYWNjZXNzIiwiY3JlYXRlX3RpbWUiOjE1ODQ3MTA3NzksImV4cGlyZV90aW1lIjoxNTg0NzE0Mzc5LCJ1c2VySWQiOjMsImRldmljZUlkIjoiQ0Y0Mzc5MzMtQ0MyMS00QUFCLTgxNjEtMUU1MTVCNjQxQTU5IiwiYXBwSWQiOiJvcmcubXVzaGFyZS5lYXN5amFwYW5lc2UiLCJzY29wZXMiOlsiZWFzeWphcGFuZXNlLmFkbWluIl0sImxvZ2luX3R5cGUiOiJtYWlsIn0.TR0A/fen5f+kg4APscFQ7JZtp2zNw5KMUeKBzm/GJg4WZp90ihg/OPfU9fcaJhoVNHWqxQ/OIHfAcXaXV+l8EEsTbh/+/Qs0glujX09Vm5z23wITzC36X+a/9bJJj5J1kXDtyx/CVdMmf8vm81T8PJFJuJtnyzA3IMRUGK0KecJ5MQjaOvh7NxZRhJfsCNYQz4V5hxvtI8urs+gi3/QVN04UQ5i0BX+DDdQ1E4MX8+3v2zDPc3ipQ8r9nZl00wmPdcqW5zx9Xooha6X8eTujgQuLiSFDheZGRR6/N+ZYktt/PMI49KIXVseenTTTzpX1Vmg9PAabPLJotdjcRpKtiA";
+        Pluto.auth(token);
     }
 
 }