Merge pull request #1133 from wklken/ft_replace_pycrypto

TencentBlueKing · Mar 22, 2024 · 9bcd2c1 · 9bcd2c1
2 parents 6281b56 + beceb26
commit 9bcd2c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/paas2/VERSION b/paas2/VERSION
@@ -1 +1 @@
-2.14.67
+2.14.68
diff --git a/paas2/login/common/encryption.py b/paas2/login/common/encryption.py
@@ -75,7 +75,8 @@ def encrypt(plaintext, key="", base64=True):
     key = force_bytes(key)
     key = hashlib.md5(key).digest()
     cipher = AES.new(key, AES.MODE_ECB)
-    ciphertext = cipher.encrypt(pad(plaintext))
+    pad_text = pad(plaintext)
+    ciphertext = cipher.encrypt(pad_text.encode("utf-8"))
 
     # 将密文base64加密
     if base64:

diff --git a/paas2/release.md b/paas2/release.md
@@ -1,5 +1,8 @@
 Release Log
 ===============================
+# 2.14.68
+    - fix: login encrypt bk_token fail
+
 # 2.14.67 
     - esb: use cryptography==3.4.8