IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-29 12:03:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-ASCII password decryption/encryption under Python 3

Browse Source
This commit is contained in:
Murtuza Zabuawala 2018-04-10 16:50:43 +01:00 committed by Dave Page
parent be2ac25fed
commit d0a640442c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/pgadmin/utils/crypto.py
View File

@ -28,11 +28,11 @@ def encrypt(plaintext, key):
""" """
iv = Random.new().read(AES.block_size) iv = Random.new().read(AES.block_size)
key = pad(key).encode('utf-8') cipher = AES.new(pad(key), AES.MODE_CFB, iv)
cipher = AES.new(key, AES.MODE_CFB, iv)
# If user has entered non ascii password (Python2) # If user has entered non ascii password (Python2)
# we have to encode it first # we have to encode it first
plaintext = plaintext.encode('utf-8') if hasattr(str, 'decode'):
plaintext = plaintext.encode('utf-8')
encrypted = base64.b64encode(iv + cipher.encrypt(plaintext)) encrypted = base64.b64encode(iv + cipher.encrypt(plaintext))
return encrypted return encrypted
@ -51,8 +51,7 @@ def decrypt(ciphertext, key):
ciphertext = base64.b64decode(ciphertext) ciphertext = base64.b64decode(ciphertext)
iv = ciphertext[:AES.block_size] iv = ciphertext[:AES.block_size]
key = pad(key).encode('utf-8') cipher = AES.new(pad(key), AES.MODE_CFB, iv)
cipher = AES.new(key, AES.MODE_CFB, iv)
decrypted = cipher.decrypt(ciphertext[AES.block_size:]) decrypted = cipher.decrypt(ciphertext[AES.block_size:])
return decrypted return decrypted