fix rsa bug

Signed-off-by: wmqwxb <[email protected]>
FederatedAI · Dec 21, 2023 · 5098fc1 · 5098fc1
1 parent 96601a7
commit 5098fc1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/org/fedai/fate/board/services/UserService.java b/src/main/java/org/fedai/fate/board/services/UserService.java
@@ -68,7 +68,7 @@ public boolean checkUser(String username, String password) {
         String privateKey = getValue("server.board.encrypt.private_key");
         String encrypted = getValue("server.board.encrypt.enable");
         if ("true".equalsIgnoreCase(encrypted)) {
-            if (StringUtils.isNotBlank(privateKey)) {
+            if (StringUtils.isBlank(privateKey)) {
                 return false;
             }
             try {

diff --git a/src/main/java/org/fedai/fate/board/utils/StandardRSAUtils.java b/src/main/java/org/fedai/fate/board/utils/StandardRSAUtils.java
@@ -2,6 +2,7 @@
 
 import javax.crypto.Cipher;
 import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
 import java.security.*;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
@@ -149,7 +150,7 @@ public static String decryptByPrivateKey(String encryptedDataStr, String private
         }
         byte[] decryptedData = out.toByteArray();
         out.close();
-        return new String(decryptedData);
+        return new String(decryptedData, StandardCharsets.UTF_8).trim();
     }
 
     /**