Merge pull request #55 from CMIPT/kaiser-crud

Finish adding salt for password encryption.
CMIPT · Sep 26, 2024 · 831c5ce · 831c5ce
2 parents 0f40356 + 5d2ae09
commit 831c5ce
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/README-zh.md b/README-zh.md
@@ -50,3 +50,4 @@
 | `frontEndUrl`                | `string` | `"http://localhost:3000"`              | 前端地址。 |
 | `deleteGitUser`              | `bool`   | `true`                                 | 清理时是否删除 `git` 用户。 |
 | `deleteServiceUser`          | `bool`   | `true`                                 | 清理时是否删除 `service` 用户。 |
+| `md5Salt`                    | `string` | `""`                                   | `MD5` 加密盐值。 |
diff --git a/config_default.json b/config_default.json
@@ -54,5 +54,6 @@
     "druidLoginPassword": "druid",
     "frontEndUrl": "http://localhost:3000",
     "deleteGitUser": true,
-    "deleteServiceUser": true
+    "deleteServiceUser": true,
+    "md5Salt": ""
 }
diff --git a/script/deploy_helper.py b/script/deploy_helper.py
@@ -346,6 +346,7 @@ def write_other_config(config):
         "gitHomeDirectory": "git.home.directory",
         "gitRepositoryDirectory": "git.repository.directory",
         "gitRepositorySuffix": "git.repository.suffix",
+        "md5Salt": "md5.salt",
     }
     try:
         with open(application_config_file_path, 'a') as f:

diff --git a/src/main/java/edu/cmipt/gcs/util/MD5Converter.java b/src/main/java/edu/cmipt/gcs/util/MD5Converter.java
@@ -1,12 +1,29 @@
 package edu.cmipt.gcs.util;
 
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
+@Component
 public class MD5Converter {
+    private static String MD5_SALT;
+
+    @Value("${md5.salt}")
+    public void setMD5Salt(String salt) {
+        MD5_SALT = salt;
+    }
+
     public static String convertToMD5(String input) {
         try {
-            byte[] hashBytes = MessageDigest.getInstance("MD5").digest(input.getBytes());
+            byte[] hashBytes =
+                    MessageDigest.getInstance("MD5")
+                            .digest(
+                                    new StringBuilder(input)
+                                            .append(MD5_SALT)
+                                            .toString()
+                                            .getBytes());
             StringBuilder hexString = new StringBuilder();
             for (byte b : hashBytes) {
                 String hex = Integer.toHexString(0xff & b);