添加注释

mpusher · Jan 8, 2016 · de64383 · de64383
1 parent fb286bd
commit de64383
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/mpush-common/src/main/java/com/shinemo/mpush/common/security/AesCipher.java b/mpush-common/src/main/java/com/shinemo/mpush/common/security/AesCipher.java
@@ -1,5 +1,6 @@
 package com.shinemo.mpush.common.security;
 
+import com.shinemo.mpush.api.Constants;
 import com.shinemo.mpush.api.connection.Cipher;
 import com.shinemo.mpush.tools.crypto.AESUtils;
 
@@ -44,7 +45,7 @@ public String toString(byte[] a) {
     public static byte[] toArray(String str) {
         String[] a = str.split("\\|");
         if (a.length != CipherBox.INSTANCE.getAesKeyLength()) {
-            throw new RuntimeException("decode cipher ex key length invalid");
+            return null;
         }
         byte[] bytes = new byte[a.length];
         for (int i = 0; i < a.length; i++) {

diff --git a/mpush-core/src/main/java/com/shinemo/mpush/core/handler/FastConnectHandler.java b/mpush-core/src/main/java/com/shinemo/mpush/core/handler/FastConnectHandler.java
@@ -27,22 +27,33 @@ public FastConnectMessage decode(Packet packet, Connection connection) {
     @Override
     public void handle(FastConnectMessage message) {
         ReusableSession session = ReusableSessionManager.INSTANCE.getSession(message.sessionId);
+
         if (session == null) {
-            ErrorMessage.from(message).setReason("session expire").send();
+
+            ErrorMessage.from(message).setReason("session expired").send();
+
             LOGGER.warn("fast connect failure, session is expired, sessionId={}, deviceId={}", message.sessionId, message.deviceId);
+
         } else if (!session.context.deviceId.equals(message.deviceId)) {
-            ErrorMessage.from(message).setReason("error device").send();
+
-            LOGGER.warn("fast connect failure, not same device, deviceId={}, session={}", message.deviceId, session.context);
+            ErrorMessage.from(message).setReason("invalid device").send();
+
+            LOGGER.warn("fast connect failure, not the same device, deviceId={}, session={}", message.deviceId, session.context);
+
         } else {
+
             int heartbeat = MPushUtil.getHeartbeat(message.minHeartbeat, message.maxHeartbeat);
+
             session.context.setHeartbeat(heartbeat);
             message.getConnection().setSessionContext(session.context);
+
             FastConnectOkMessage
                     .from(message)
                     .setServerHost(MPushUtil.getLocalIp())
                     .setServerTime(System.currentTimeMillis())
                     .setHeartbeat(heartbeat)
                     .send();
+
             LOGGER.warn("fast connect success, session={}", message.deviceId, session.context);
         }
     }

diff --git a/mpush-core/src/main/java/com/shinemo/mpush/core/session/ReusableSession.java b/mpush-core/src/main/java/com/shinemo/mpush/core/session/ReusableSession.java
@@ -13,7 +13,7 @@ public final class ReusableSession {
     public long expireTime;
     public SessionContext context;
 
-    public String encode() {
+    public static String encode(SessionContext context) {
         StringBuffer sb = new StringBuffer();
         sb.append(context.osName).append(',');
         sb.append(context.osVersion).append(',');
@@ -23,17 +23,20 @@ public String encode() {
         return sb.toString();
     }
 
-    public void decode(String value) throws Exception {
+    public static ReusableSession decode(String value) {
         String[] array = value.split(",");
-        if (array.length != 6) throw new RuntimeException("decode session exception");
+        if (array.length != 6) return null;
         SessionContext context = new SessionContext();
         context.osName = array[0];
         context.osVersion = array[1];
         context.clientVersion = array[2];
         context.deviceId = array[3];
         byte[] key = AesCipher.toArray(array[4]);
         byte[] iv = AesCipher.toArray(array[5]);
+        if (key == null || iv == null) return null;
         context.cipher = new AesCipher(key, iv);
-        this.context = context;
+        ReusableSession session = new ReusableSession();
+        session.context = context;
+        return session;
     }
 }
diff --git a/mpush-core/src/main/java/com/shinemo/mpush/core/session/ReusableSessionManager.java b/mpush-core/src/main/java/com/shinemo/mpush/core/session/ReusableSessionManager.java
@@ -14,20 +14,14 @@ public final class ReusableSessionManager {
     private int expiredTime = ConfigCenter.INSTANCE.getSessionExpiredTime();
 
     public boolean cacheSession(ReusableSession session) {
-        RedisManage.set(session.sessionId, session.encode(), expiredTime);
+        RedisManage.set(session.sessionId, ReusableSession.encode(session.context), expiredTime);
         return true;
     }
 
     public ReusableSession getSession(String sessionId) {
         String value = RedisManage.get(sessionId, String.class);
         if (Strings.isBlank(value)) return null;
-        ReusableSession session = new ReusableSession();
+        return ReusableSession.decode(value);
-        try {
-            session.decode(value);
-        } catch (Exception e) {
-            return null;
-        }
-        return session;
     }
 
     public ReusableSession genSession(SessionContext context) {