Fix issue #6

WhiteDG · Mar 13, 2023 · acef2a0 · acef2a0
1 parent 56a9a26
commit acef2a0
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 172 deletions.
diff --git a/mybatis-crypto-core/src/main/java/io/github/whitedg/mybatis/crypto/AbsEncryptionPlugin.java b/mybatis-crypto-core/src/main/java/io/github/whitedg/mybatis/crypto/AbsEncryptionPlugin.java
@@ -1,6 +1,5 @@
 package io.github.whitedg.mybatis.crypto;
 
-import com.esotericsoftware.kryo.kryo5.Kryo;
 import org.apache.ibatis.binding.MapperMethod;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.plugin.Interceptor;
@@ -39,88 +38,49 @@ public Object intercept(Invocation invocation) throws Throwable {
         MappedStatement ms = (MappedStatement) args[0];
         Object parameter = args[1];
         if (Util.encryptionRequired(parameter, ms.getSqlCommandType())) {
-            boolean isParamMap = parameter instanceof MapperMethod.ParamMap;
-            if (isParamMap) {
-                //noinspection unchecked
-                MapperMethod.ParamMap<Object> paramMap = (MapperMethod.ParamMap<Object>) parameter;
-                encryptParamMap(paramMap);
-            } else {
-                Object execParam = encryptEntity(parameter);
-                args[1] = execParam;
-            }
+            doEncrypt(parameter);
             Object result = invocation.proceed();
-            postExecution(ms, parameter, args[1], isParamMap);
+            if (keepParameter) {
+                doDecrypt(parameter);
+            }
             return result;
         } else {
             return invocation.proceed();
         }
     }
 
-    private void postExecution(MappedStatement ms, Object parameter, Object execParam, boolean isParamMap) throws IllegalAccessException {
-        if (!keepParameter) {
-            return;
-        }
-        if (!isParamMap) {
-            handleKeyProperties(ms, parameter, execParam);
-        } else {
-            //noinspection unchecked
-            MapperMethod.ParamMap<Object> plainParamMap = (MapperMethod.ParamMap<Object>) parameter;
-            //noinspection unchecked
-            MapperMethod.ParamMap<Object> cipherParamMap = (MapperMethod.ParamMap<Object>) execParam;
-            for (Map.Entry<String, Object> plainEntry : plainParamMap.entrySet()) {
-                String key = plainEntry.getKey();
-                for (String keyPrefix : mappedKeyPrefixes) {
-                    if (key != null && key.startsWith(keyPrefix)) {
-                        Object plainVal = plainEntry.getValue();
-                        Object cipherVal = cipherParamMap.get(key);
-                        if (plainVal instanceof ArrayList) {
-                            //noinspection rawtypes
-                            ArrayList plainList = (ArrayList) plainVal;
-                            //noinspection rawtypes
-                            ArrayList cipherList = (ArrayList) cipherVal;
-                            for (int i = 0; i < plainList.size(); i++) {
-                                handleKeyProperties(ms, plainList.get(i), cipherList.get(i));
-                            }
-                        } else {
-                            handleKeyProperties(ms, plainVal, cipherVal);
-                        }
-                    }
-                }
-            }
-        }
+    private void doEncrypt(Object parameter) {
+        handleParameter(Mode.ENCRYPT, parameter);
     }
 
-    private void handleKeyProperties(MappedStatement ms, Object parameter, Object copyOfParameter) throws IllegalAccessException {
-        List<Field> keyFields = KeyFieldsProvider.get(ms, copyOfParameter);
-        for (Field keyField : keyFields) {
-            keyField.set(parameter, keyField.get(copyOfParameter));
+    private void doDecrypt(Object parameter) {
+        handleParameter(Mode.DECRYPT, parameter);
+    }
+
+    private void handleParameter(Mode mode, Object parameter) {
+        boolean isParamMap = parameter instanceof MapperMethod.ParamMap;
+        if (isParamMap) {
+            //noinspection unchecked
+            MapperMethod.ParamMap<Object> paramMap = (MapperMethod.ParamMap<Object>) parameter;
+            encryptParamMap(mode, paramMap);
+        } else {
+            encryptEntity(mode, parameter);
         }
     }
 
-    private <T> T encryptEntity(T parameter) throws MybatisCryptoException {
+    private <T> void encryptEntity(Mode mode, T parameter) throws MybatisCryptoException {
         Set<Field> encryptedFields = EncryptedFieldsProvider.get(parameter.getClass());
         if (encryptedFields == null || encryptedFields.isEmpty()) {
-            return parameter;
-        }
-        T execParam = parameter;
-        Kryo kryo = null;
-        try {
-            if (keepParameter) {
-                kryo = KryoPool.obtain();
-                execParam = kryo.copy(parameter);
-            }
-            processFields(encryptedFields, execParam);
-            return execParam;
-        } finally {
-            KryoPool.free(kryo);
+            return;
         }
+        processFields(mode, encryptedFields, parameter);
     }
 
-    private void encryptParamMap(MapperMethod.ParamMap<Object> paramMap) throws MybatisCryptoException {
-        Set<Map.Entry<String, Object>> entrySet = paramMap.entrySet();
-        for (Map.Entry<String, Object> entry : entrySet) {
-            String key = entry.getKey();
-            Object value = entry.getValue();
+    private void encryptParamMap(Mode mode, MapperMethod.ParamMap<Object> paramMap) throws MybatisCryptoException {
+        Set<Map.Entry<String, Object>> paramMapEntrySet = paramMap.entrySet();
+        for (Map.Entry<String, Object> paramEntry : paramMapEntrySet) {
+            String key = paramEntry.getKey();
+            Object value = paramEntry.getValue();
             if (value == null || key == null) {
                 continue;
             }
@@ -134,18 +94,18 @@ private void encryptParamMap(MapperMethod.ParamMap<Object> paramMap) throws Myba
                             Class<?> itemClass = firstItem.getClass();
                             Set<Field> encryptedFields = EncryptedFieldsProvider.get(itemClass);
                             for (Object item : list) {
-                                processFields(encryptedFields, item);
+                                processFields(mode, encryptedFields, item);
                             }
                         }
                     } else {
-                        processFields(EncryptedFieldsProvider.get(value.getClass()), value);
+                        processFields(mode, EncryptedFieldsProvider.get(value.getClass()), value);
                     }
                 }
             }
         }
     }
 
-    private void processFields(Set<Field> encryptedFields, Object entry) throws MybatisCryptoException {
+    private void processFields(Mode mode, Set<Field> encryptedFields, Object entry) throws MybatisCryptoException {
         if (encryptedFields == null || encryptedFields.isEmpty()) {
             return;
         }
@@ -164,8 +124,8 @@ private void processFields(Set<Field> encryptedFields, Object entry) throws Myba
                 }
                 String key = Util.getKeyOrDefault(encryptedField, defaultKey);
                 IEncryptor iEncryptor = EncryptorProvider.getOrDefault(encryptedField, defaultEncryptor);
-                String encryptedVal = iEncryptor.encrypt(originalVal, key);
-                field.set(entry, encryptedVal);
+                String updatedVal = Mode.ENCRYPT.equals(mode) ? iEncryptor.encrypt(originalVal, key) : iEncryptor.decrypt(originalVal, key);
+                field.set(entry, updatedVal);
             } catch (Exception e) {
                 if (failFast) {
                     throw new MybatisCryptoException(e);

diff --git a/mybatis-crypto-core/src/main/java/io/github/whitedg/mybatis/crypto/KeyFieldsProvider.java b/mybatis-crypto-core/src/main/java/io/github/whitedg/mybatis/crypto/KeyFieldsProvider.java
diff --git a/mybatis-crypto-core/src/main/java/io/github/whitedg/mybatis/crypto/KryoPool.java b/mybatis-crypto-core/src/main/java/io/github/whitedg/mybatis/crypto/KryoPool.java
diff --git a/mybatis-crypto-core/src/main/java/io/github/whitedg/mybatis/crypto/Mode.java b/mybatis-crypto-core/src/main/java/io/github/whitedg/mybatis/crypto/Mode.java
@@ -0,0 +1,8 @@
+package io.github.whitedg.mybatis.crypto;
+
+/**
+ * @author White
+ */
+enum Mode {
+    ENCRYPT, DECRYPT
+}
diff --git a/mybatis-crypto-demo/pom.xml b/mybatis-crypto-demo/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>io.github.whitedg</groupId>
             <artifactId>mybatis-crypto-spring-boot-starter</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
         <dependency>
             <groupId>io.github.whitedg</groupId>
@@ -62,6 +62,10 @@
             <artifactId>springdoc-openapi-ui</artifactId>
             <version>1.6.11</version>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
 
     </dependencies>
 

diff --git a/mybatis-crypto-demo/src/main/resources/application-h2.yaml b/mybatis-crypto-demo/src/main/resources/application-h2.yaml
@@ -0,0 +1,12 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:demo_db
+    driver-class-name: org.h2.Driver
+    username: sa
+    password: sa
+  h2:
+    console:
+      enabled: true
+  sql:
+    init:
+      schema-locations: classpath:db/h2/schema.sql
diff --git a/mybatis-crypto-demo/src/main/resources/application-mysql.yaml b/mybatis-crypto-demo/src/main/resources/application-mysql.yaml
@@ -0,0 +1,8 @@
+spring:
+  datasource:
+    username: root
+    password: ne2FRwzOQjONzEOmx0oZ4uh9
+    hikari:
+      jdbc-url: jdbc:mysql://localhost:3306/mybatis_crypto
+      driver-class-name: com.mysql.cj.jdbc.Driver
+
diff --git a/mybatis-crypto-demo/src/main/resources/application.yaml b/mybatis-crypto-demo/src/main/resources/application.yaml
@@ -3,17 +3,8 @@ server:
   port: 7070
 
 spring:
-  datasource:
-    url: jdbc:h2:mem:demo_db
-    driver-class-name: org.h2.Driver
-    username: sa
-    password: sa
-  h2:
-    console:
-      enabled: true
-  sql:
-    init:
-      schema-locations: classpath:db/schema.sql
+  profiles:
+    active: h2
 
 mybatis-crypto:
   enabled: true

diff --git a/mybatis-crypto-demo/src/main/resources/db.mysql/schema.sql b/mybatis-crypto-demo/src/main/resources/db.mysql/schema.sql
@@ -0,0 +1,15 @@
+CREATE
+DATABASE `mybatis_crypto` CHARACTER
+SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+DROP TABLE IF EXISTS `t_user`;
+
+CREATE TABLE `t_user`
+(
+    `id`         INT          NOT NULL AUTO_INCREMENT,
+    `name`       VARCHAR(255) NULL DEFAULT NULL,
+    `email`      VARCHAR(255) NULL DEFAULT NULL,
+    `password`   VARCHAR(255) NULL DEFAULT NULL,
+    `id_card_no` VARCHAR(255) NULL DEFAULT NULL,
+    PRIMARY KEY (`id`)
+);
diff --git a/...pto-demo/src/main/resources/db/schema.sql → ...-demo/src/main/resources/db/h2/schema.sql b/...pto-demo/src/main/resources/db/schema.sql → ...-demo/src/main/resources/db/h2/schema.sql
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
     </modules>
 
     <properties>
-        <revision>1.2.1</revision>
+        <revision>1.2.2</revision>
 
         <java.version>1.8</java.version>
         <maven.compiler.source>8</maven.compiler.source>