Merge pull request #16 from yanghaiji/update_md_fe

yanghaiji · web-flow · commit a5ad2659ce20 · 2023-08-31T10:32:09.000+08:00
优化原有代码 🆕 📖
diff --git a/src/main/java/com/javayh/secure/transmit/encrypt/SecureTransmitTemplate.java b/src/main/java/com/javayh/secure/transmit/encrypt/SecureTransmitTemplate.java
@@ -21,7 +21,7 @@ public interface SecureTransmitTemplate {
      * @param data 加密的数据
      * @return {@link String} 最终的结果
      */
-    String encrypt(String key, String data) throws Exception;
+    String encrypt(String key, String data);
 
     /**
      * 数据解密
diff --git a/src/main/java/com/javayh/secure/transmit/encrypt/aes/AESEncryption.java b/src/main/java/com/javayh/secure/transmit/encrypt/aes/AESEncryption.java
@@ -4,6 +4,7 @@
 import com.javayh.secure.transmit.constant.EncryptConstant;
 import com.javayh.secure.transmit.encrypt.SecureTransmitTemplate;
 import com.javayh.secure.transmit.encrypt.base.Base64Util;
+import com.javayh.secure.transmit.exception.EncryptionException;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.crypto.BadPaddingException;
@@ -43,18 +44,19 @@ public AESEncryption(SecretProperties secretProperties) {
      * @param key     加密的key
      * @param encData
      * @return
-     * @throws Exception
      */
     @Override
-    public String encrypt(String key, String encData) throws Exception {
+    public String encrypt(String key, String encData) {
         key = setSuffix(key, secretProperties.getAes().getIv());
         byte[] result = new byte[0];
         try {
             result = encCipher(key).doFinal(encData.getBytes());
         } catch (IllegalBlockSizeException e) {
             log.error(" IllegalBlockSizeException is error {}", e.getMessage());
+            throw new EncryptionException(e.getMessage());
         } catch (BadPaddingException e) {
             log.error(" BadPaddingException is error {}", e.getMessage());
+            throw new EncryptionException(e.getMessage());
         }
         return Base64Util.encode(result);
     }
diff --git a/src/main/java/com/javayh/secure/transmit/encrypt/aes/AESGCMEncryption.java b/src/main/java/com/javayh/secure/transmit/encrypt/aes/AESGCMEncryption.java
@@ -4,12 +4,15 @@
 import com.javayh.secure.transmit.constant.EncryptConstant;
 import com.javayh.secure.transmit.encrypt.SecureTransmitTemplate;
 import com.javayh.secure.transmit.encrypt.base.Base64Util;
+import com.javayh.secure.transmit.exception.EncryptionException;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
+import javax.crypto.*;
 import javax.crypto.spec.GCMParameterSpec;
 import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 
 /**
  * <p>
@@ -30,14 +33,24 @@ public AESGCMEncryption(SecretProperties secretProperties) {
     }
 
     @Override
-    public String encrypt(String keyAsString, String data) throws Exception {
+    public String encrypt(String keyAsString, String data) {
         SecretKey secretKey = convertStringToKey(keyAsString);
+        Cipher cipher;
+        try {
+            cipher = Cipher.getInstance(EncryptConstant.AES_GCM);
+            GCMParameterSpec gcmParameterSpec = new GCMParameterSpec(128, iv.getBytes());
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey, gcmParameterSpec);
+            return Base64Util.encode(cipher.doFinal(data.getBytes(StandardCharsets.UTF_8)));
+        } catch (NoSuchAlgorithmException |
+                NoSuchPaddingException |
+                InvalidKeyException |
+                InvalidAlgorithmParameterException |
+                IllegalBlockSizeException |
+                BadPaddingException e) {
+            log.error("GCM 解密异常 {}", e.getMessage(), e);
+            throw new EncryptionException(e.getMessage());
+        }
 
-        Cipher cipher = Cipher.getInstance(EncryptConstant.AES_GCM);
-        GCMParameterSpec gcmParameterSpec = new GCMParameterSpec(128, iv.getBytes());
-        cipher.init(Cipher.ENCRYPT_MODE, secretKey, gcmParameterSpec);
-
-        return Base64Util.encode(cipher.doFinal(data.getBytes(StandardCharsets.UTF_8)));
     }
 
 
@@ -53,12 +66,13 @@ public String decrypt(String keyAsString, String encryptedData) {
             return Base64Util.encode(decryptedBytes);
         } catch (Exception e) {
             log.error("AESGCMEncryption 解密失败 {}", e.getMessage());
+            throw new EncryptionException(e.getMessage());
         }
-        return null;
     }
 
     /**
      * 将字符串转换为密钥
+     *
      * @param keyAsString 密钥key
      */
     private SecretKey convertStringToKey(String keyAsString) {
diff --git a/src/main/java/com/javayh/secure/transmit/encrypt/ecc/EccEncryption.java b/src/main/java/com/javayh/secure/transmit/encrypt/ecc/EccEncryption.java
@@ -4,14 +4,15 @@
 import com.javayh.secure.transmit.constant.EncryptConstant;
 import com.javayh.secure.transmit.encrypt.SecureTransmitTemplate;
 import com.javayh.secure.transmit.encrypt.base.Base64Util;
-import lombok.SneakyThrows;
+import com.javayh.secure.transmit.exception.EncryptionException;
 import lombok.extern.slf4j.Slf4j;
 
+import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Security;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.security.*;
+import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Base64;
@@ -39,47 +40,80 @@ public class EccEncryption implements SecureTransmitTemplate {
      * @param plaintext 代加密的数据
      */
     @Override
-    public String encrypt(String pubKey, String plaintext) throws Exception {
+    public String encrypt(String pubKey, String plaintext) {
         PublicKey publicKey = stringToKey(pubKey);
-        Cipher cipher = Cipher.getInstance(EncryptConstant.ECIES, EncryptConstant.BC);
-        cipher.init(Cipher.ENCRYPT_MODE, publicKey);
-        byte[] encryptedBytes = cipher.doFinal(plaintext.getBytes());
-        return Base64Util.encode(encryptedBytes);
+        Cipher cipher = null;
+        try {
+            cipher = Cipher.getInstance(EncryptConstant.ECIES, EncryptConstant.BC);
+            cipher.init(Cipher.ENCRYPT_MODE, publicKey);
+            byte[] encryptedBytes = cipher.doFinal(plaintext.getBytes());
+            return Base64Util.encode(encryptedBytes);
+        } catch (NoSuchAlgorithmException |
+                NoSuchProviderException |
+                NoSuchPaddingException |
+                IllegalBlockSizeException |
+                BadPaddingException |
+                InvalidKeyException e) {
+            log.error("EccEncryption 解密失败 {}", e.getMessage());
+            throw new EncryptionException(e.getMessage());
+        }
+
     }
 
     /**
      * @param priKey        解密私钥 {@link EccProperties#getPrivateKey()}
      * @param encryptedData 待解密的数据
      */
     @Override
-    @SneakyThrows
     public String decrypt(String priKey, String encryptedData) {
         PrivateKey privateKey = stringToPrivateKey(priKey);
-        Cipher cipher = Cipher.getInstance(EncryptConstant.ECIES, EncryptConstant.BC);
-        cipher.init(Cipher.DECRYPT_MODE, privateKey);
-        byte[] encryptedBytes = Base64Util.decode(encryptedData);
-        byte[] decryptedBytes = cipher.doFinal(encryptedBytes);
-        return Base64Util.encode(decryptedBytes);
+        Cipher cipher;
+        try {
+            cipher = Cipher.getInstance(EncryptConstant.ECIES, EncryptConstant.BC);
+            cipher.init(Cipher.DECRYPT_MODE, privateKey);
+            byte[] encryptedBytes = Base64Util.decode(encryptedData);
+            byte[] decryptedBytes = cipher.doFinal(encryptedBytes);
+            return Base64Util.encode(decryptedBytes);
+        } catch (NoSuchAlgorithmException |
+                NoSuchProviderException |
+                NoSuchPaddingException |
+                IllegalBlockSizeException |
+                BadPaddingException |
+                InvalidKeyException e) {
+            log.error("EccEncryption 解密失败 {}", e.getMessage());
+            throw new EncryptionException(e.getMessage());
+        }
+
     }
 
     /**
      * 反算公钥
      */
-    @SneakyThrows
     private static PublicKey stringToKey(String keyString) {
         byte[] keyBytes = Base64.getDecoder().decode(keyString);
-        KeyFactory keyFactory = KeyFactory.getInstance(EncryptConstant.EC, EncryptConstant.BC);
-        return keyFactory.generatePublic(new X509EncodedKeySpec(keyBytes));
+        KeyFactory keyFactory;
+        try {
+            keyFactory = KeyFactory.getInstance(EncryptConstant.EC, EncryptConstant.BC);
+            return keyFactory.generatePublic(new X509EncodedKeySpec(keyBytes));
+        } catch (NoSuchAlgorithmException | NoSuchProviderException | InvalidKeySpecException e) {
+            log.error("EccEncryption 解密失败 {}", e.getMessage());
+            throw new EncryptionException(e.getMessage());
+        }
     }
 
     /**
      * 反算私钥
      */
-    @SneakyThrows
     private static PrivateKey stringToPrivateKey(String keyString) {
         byte[] keyBytes = Base64Util.decode(keyString);
-        KeyFactory keyFactory = KeyFactory.getInstance(EncryptConstant.EC, EncryptConstant.BC);
-        return keyFactory.generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
+        KeyFactory keyFactory;
+        try {
+            keyFactory = KeyFactory.getInstance(EncryptConstant.EC, EncryptConstant.BC);
+            return keyFactory.generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
+        } catch (NoSuchAlgorithmException | NoSuchProviderException | InvalidKeySpecException e) {
+            log.error("EccEncryption 解密失败 {}", e.getMessage());
+            throw new EncryptionException(e.getMessage());
+        }
     }
 
 }
diff --git a/src/main/java/com/javayh/secure/transmit/exception/EncryptionException.java b/src/main/java/com/javayh/secure/transmit/exception/EncryptionException.java
@@ -0,0 +1,86 @@
+package com.javayh.secure.transmit.exception;
+
+/**
+ * <p>
+ * 解密异常
+ * </p>
+ *
+ * @author hai ji
+ * @version 1.0.0
+ * @since 2023-08-22
+ */
+public class EncryptionException extends RuntimeException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public EncryptionException() {
+        super();
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail message.
+     * The cause is not initialized, and may subsequently be initialized by a
+     * call to {@link #initCause}.
+     *
+     * @param message the detail message. The detail message is saved for
+     *                later retrieval by the {@link #getMessage()} method.
+     */
+    public EncryptionException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail message and
+     * cause.  <p>Note that the detail message associated with
+     * {@code cause} is <i>not</i> automatically incorporated in
+     * this runtime exception's detail message.
+     *
+     * @param message the detail message (which is saved for later retrieval
+     *                by the {@link #getMessage()} method).
+     * @param cause   the cause (which is saved for later retrieval by the
+     *                {@link #getCause()} method).  (A <tt>null</tt> value is
+     *                permitted, and indicates that the cause is nonexistent or
+     *                unknown.)
+     * @since 1.4
+     */
+    public EncryptionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified cause and a
+     * detail message of <tt>(cause==null ? null : cause.toString())</tt>
+     * (which typically contains the class and detail message of
+     * <tt>cause</tt>).  This constructor is useful for runtime exceptions
+     * that are little more than wrappers for other throwables.
+     *
+     * @param cause the cause (which is saved for later retrieval by the
+     *              {@link #getCause()} method).  (A <tt>null</tt> value is
+     *              permitted, and indicates that the cause is nonexistent or
+     *              unknown.)
+     * @since 1.4
+     */
+    public EncryptionException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail
+     * message, cause, suppression enabled or disabled, and writable
+     * stack trace enabled or disabled.
+     *
+     * @param message            the detail message.
+     * @param cause              the cause.  (A {@code null} value is permitted,
+     *                           and indicates that the cause is nonexistent or unknown.)
+     * @param enableSuppression  whether or not suppression is enabled
+     *                           or disabled
+     * @param writableStackTrace whether or not the stack trace should
+     *                           be writable
+     * @since 1.7
+     */
+    protected EncryptionException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
