RsaCipher密钥管理和初始化代码优化

mpusher · Jun 9, 2018 · 6c2e1b7 · 6c2e1b7
1 parent ed14d9c
commit 6c2e1b7
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/...com/mpush/api/spi/core/CipherFactory.java → .../mpush/api/spi/core/RsaCipherFactory.java b/...com/mpush/api/spi/core/CipherFactory.java → .../mpush/api/spi/core/RsaCipherFactory.java
@@ -28,8 +28,8 @@
  *
  * @author [email protected]
  */
-public interface CipherFactory extends Factory<Cipher> {
+public interface RsaCipherFactory extends Factory<Cipher> {
     static Cipher create() {
-        return SpiLoader.load(CipherFactory.class).get();
+        return SpiLoader.load(RsaCipherFactory.class).get();
     }
 }
diff --git a/mpush-common/src/main/java/com/mpush/common/message/BaseMessage.java b/mpush-common/src/main/java/com/mpush/common/message/BaseMessage.java
@@ -19,9 +19,9 @@
 
 package com.mpush.common.message;
 
-import com.mpush.api.message.Message;
+import com.mpush.api.connection.Cipher;
 import com.mpush.api.connection.Connection;
-import com.mpush.api.connection.SessionContext;
+import com.mpush.api.message.Message;
 import com.mpush.api.protocol.Packet;
 import com.mpush.tools.Jsons;
 import com.mpush.tools.common.IOUtils;
@@ -86,8 +86,8 @@ private void decodeBinaryBody0() {
         //1.解密
         byte[] tmp = packet.body;
         if (packet.hasFlag(Packet.FLAG_CRYPTO)) {
-            if (connection.getSessionContext().cipher != null) {
-                tmp = connection.getSessionContext().cipher.decrypt(tmp);
+            if (getCipher() != null) {
+                tmp = getCipher().decrypt(tmp);
             }
         }
         //2.解压
@@ -121,9 +121,9 @@ private void encodeBinaryBody0() {
             }
 
             //2.加密
-            SessionContext context = connection.getSessionContext();
-            if (context.cipher != null) {
-                byte[] result = context.cipher.encrypt(tmp);
+            Cipher cipher = getCipher();
+            if (cipher != null) {
+                byte[] result = cipher.encrypt(tmp);
                 if (result.length > 0) {
                     tmp = result;
                     packet.addFlag(Packet.FLAG_CRYPTO);
@@ -237,6 +237,10 @@ public void runInRequestThread(Runnable runnable) {
         connection.getChannel().eventLoop().execute(runnable);
     }
 
+    protected Cipher getCipher() {
+        return connection.getSessionContext().cipher;
+    }
+
     @Override
     public abstract String toString();
 }
diff --git a/...ush/common/security/RsaCipherFactory.java → ...mon/security/DefaultRsaCipherFactory.java b/...ush/common/security/RsaCipherFactory.java → ...mon/security/DefaultRsaCipherFactory.java
@@ -21,15 +21,15 @@
 
 import com.mpush.api.connection.Cipher;
 import com.mpush.api.spi.Spi;
-import com.mpush.api.spi.core.CipherFactory;
+import com.mpush.api.spi.core.RsaCipherFactory;
 
 /**
  * Created by yxx on 2016/5/19.
  *
  * @author [email protected]
  */
 @Spi
-public class RsaCipherFactory implements CipherFactory {
+public class DefaultRsaCipherFactory implements RsaCipherFactory {
     private static final RsaCipher RSA_CIPHER = RsaCipher.create();
 
     @Override

diff --git a/mpush-common/src/main/resources/META-INF/services/com.mpush.api.spi.core.CipherFactory b/mpush-common/src/main/resources/META-INF/services/com.mpush.api.spi.core.CipherFactory
diff --git a/mpush-common/src/main/resources/META-INF/services/com.mpush.api.spi.core.RsaCipherFactory b/mpush-common/src/main/resources/META-INF/services/com.mpush.api.spi.core.RsaCipherFactory
@@ -0,0 +1 @@
+com.mpush.common.security.DefaultRsaCipherFactory
diff --git a/mpush-netty/src/main/java/com/mpush/netty/connection/NettyConnection.java b/mpush-netty/src/main/java/com/mpush/netty/connection/NettyConnection.java
@@ -19,17 +19,14 @@
 
 package com.mpush.netty.connection;
 
-import com.mpush.api.connection.Cipher;
 import com.mpush.api.connection.Connection;
 import com.mpush.api.connection.SessionContext;
 import com.mpush.api.protocol.Packet;
-import com.mpush.api.spi.core.CipherFactory;
-import com.mpush.netty.codec.PacketEncoder;
+import com.mpush.api.spi.core.RsaCipherFactory;
 import com.mpush.tools.log.Logs;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.socket.DatagramPacket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,7 +37,6 @@
  */
 public final class NettyConnection implements Connection, ChannelFutureListener {
     private static final Logger LOGGER = LoggerFactory.getLogger(NettyConnection.class);
-    private static final Cipher RSA_CIPHER = CipherFactory.create();
     private SessionContext context;
     private Channel channel;
     private volatile byte status = STATUS_NEW;
@@ -54,7 +50,7 @@ public void init(Channel channel, boolean security) {
         this.lastReadTime = System.currentTimeMillis();
         this.status = STATUS_CONNECTED;
         if (security) {
-            this.context.changeCipher(RSA_CIPHER);
+            this.context.changeCipher(RsaCipherFactory.create());
         }
     }