github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修复可能的 decode error

pull/8267/head
ibuler 2022-05-17 22:21:37 +08:00 committed by 老广
parent fe3059c1fd
commit 44ffd09924
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/common/utils/crypto.py
View File

@ -91,12 +91,13 @@ class AESCrypto:
def encrypt(self, text): def encrypt(self, text):
aes = self.aes() aes = self.aes()
return str(base64.encodebytes(aes.encrypt(self.to_16(text))), cipher = base64.encodebytes(aes.encrypt(self.to_16(text)))
encoding='utf8').replace('\n', '') # 加密 return str(cipher, encoding='utf8').replace('\n', '') # 加密
def decrypt(self, text): def decrypt(self, text):
aes = self.aes() aes = self.aes()
return str(aes.decrypt(base64.decodebytes(bytes(text, encoding='utf8'))).rstrip(b'\0').decode("utf8")) # 解密 text_decoded = base64.decodebytes(bytes(text, encoding='utf8'))
return str(aes.decrypt(text_decoded).rstrip(b'\0').decode("utf8"))
class AESCryptoGCM: class AESCryptoGCM:
@ -234,6 +235,8 @@ def rsa_decrypt(cipher_text, rsa_private_key=None):
def rsa_decrypt_by_session_pkey(value): def rsa_decrypt_by_session_pkey(value):
from jumpserver.utils import current_request from jumpserver.utils import current_request
if not current_request:
return value
private_key_name = settings.SESSION_RSA_PRIVATE_KEY_NAME private_key_name = settings.SESSION_RSA_PRIVATE_KEY_NAME
private_key = current_request.session.get(private_key_name) private_key = current_request.session.get(private_key_name)
@ -254,7 +257,11 @@ def decrypt_password(value):
key_cipher, password_cipher = cipher key_cipher, password_cipher = cipher
aes_key = rsa_decrypt_by_session_pkey(key_cipher) aes_key = rsa_decrypt_by_session_pkey(key_cipher)
aes = get_aes_crypto(aes_key, 'ECB') aes = get_aes_crypto(aes_key, 'ECB')
try:
password = aes.decrypt(password_cipher) password = aes.decrypt(password_cipher)
except UnicodeDecodeError as e:
logging.error("Decript password error: {}, {}".format(password_cipher, e))
return value
return password return password