IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix non-ASCII password decryption/encryption under Python 3"

Browse Source 
This reverts commit d0a640442c.

Seems to anger Python 2.7
This commit is contained in:
Dave Page 2018-04-10 17:12:14 +01:00
parent d0a640442c
commit 163cadc279
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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