Merge pull request #330 from wklken/ft_upgrade_py3_bugfix

Ft upgrade py3 bugfix
TencentBlueKing · May 20, 2021 · b5b029a · b5b029a
2 parents 1e646a2 + a4c3341
commit b5b029a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 8 deletions.
diff --git a/paas2/VERSION b/paas2/VERSION
@@ -1 +1 @@
-2.13.1
+2.13.2
diff --git a/paas2/appengine/requirements.txt b/paas2/appengine/requirements.txt
@@ -6,7 +6,7 @@ PyYAML==5.1
 uWSGI==2.0.13.1
 pymysql==0.6.7
 gunicorn==19.9.0
-gevent==1.1.2
+gevent==1.5.0
 pytz==2016.6.1
 six==1.15.0
 python-consul==1.1.0

diff --git a/paas2/esb/requirements.txt b/paas2/esb/requirements.txt
@@ -14,7 +14,7 @@ django==1.11.29
 enum34==1.1.6
 funcsigs==1.0.2; python_version >= "2.7" and python_full_version < "3.0.0" and python_version < "3.0" or python_full_version >= "3.4.0" and python_version < "3.0"
 future==0.18.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")
-gevent==1.1.2
+gevent==1.5.0
 greenlet==1.0.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
 gunicorn==19.9.0; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.2.0")
 idna==2.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"

diff --git a/paas2/login/common/encryption.py b/paas2/login/common/encryption.py
@@ -22,6 +22,7 @@
 from Crypto.Cipher import AES
 
 from django.conf import settings
+from django.utils.encoding import force_bytes, force_text
 
 """
 登录态加密方法.
@@ -52,14 +53,16 @@ def decrypt(ciphertext, key="", base64=True):
     """
     if not key:
         key = settings.SECRET_KEY
+    key = force_bytes(key)
 
     if base64:
-        ciphertext = urlsafe_b64decode(str(ciphertext + "=" * (4 - len(ciphertext) % 4)))
+        # ciphertext = urlsafe_b64decode(str(ciphertext + "=" * (4 - len(ciphertext) % 4)))
+        ciphertext = urlsafe_b64decode(ciphertext + "=" * (4 - len(ciphertext) % 4))
 
     data = ciphertext
     key = hashlib.md5(key).digest()
     cipher = AES.new(key, AES.MODE_ECB)
-    return unpad(cipher.decrypt(data))
+    return unpad(force_text(cipher.decrypt(data)))
 
 
 def encrypt(plaintext, key="", base64=True):
@@ -69,13 +72,15 @@ def encrypt(plaintext, key="", base64=True):
     if not key:
         key = settings.SECRET_KEY
 
+    key = force_bytes(key)
     key = hashlib.md5(key).digest()
     cipher = AES.new(key, AES.MODE_ECB)
     ciphertext = cipher.encrypt(pad(plaintext))
 
     # 将密文base64加密
     if base64:
-        ciphertext = urlsafe_b64encode(str(ciphertext)).rstrip("=")
+        # ciphertext = urlsafe_b64encode(str(ciphertext)).rstrip(b"=")
+        ciphertext = urlsafe_b64encode(ciphertext).rstrip(b"=")
 
     return ciphertext
 

diff --git a/paas2/login/requirements.txt b/paas2/login/requirements.txt
@@ -8,7 +8,7 @@ gunicorn==19.9.0
 uWSGI==2.0.13.1
 xlrd==1.0.0
 xlwt==1.1.2
-gevent==1.1.2
+gevent==1.5.0
 pytz==2016.6.1
 python-dateutil==2.8.1
 django_oauth_toolkit==0.12.0

diff --git a/paas2/paas/.gitignore b/paas2/paas/.gitignore
@@ -95,3 +95,4 @@ conf/settings_production.py
 # .jshintrc
 # gulpfile.js
 # package.json
+.envrc
diff --git a/paas2/paas/requirements.txt b/paas2/paas/requirements.txt
@@ -10,7 +10,7 @@ pymysql==0.6.7
 redis==2.10.5
 PyYAML==5.1
 Pillow==6.2.2
-gevent==1.1.2
+gevent==1.5.0
 pytz==2016.6.1
 python-dateutil==2.8.1
 boto==2.43.0

diff --git a/paas2/release.md b/paas2/release.md
@@ -1,5 +1,8 @@
 Release Log
 ===============================
+# 2.13.2
+    - update: bugfix for python3/upgrade gevent to 1.15.0
+
 # 2.13.1
     - update: sync with newest branch