forked from LBRYCommunity/lbry-sdk
fix decrypting invalid bytes with valid padding
This commit is contained in:
parent
9371122bed
commit
6647dd8f08
2 changed files with 6 additions and 0 deletions
|
@ -33,6 +33,8 @@ def aes_decrypt(secret: str, value: str) -> typing.Tuple[str, bytes]:
|
|||
unpadder = PKCS7(AES.block_size).unpadder()
|
||||
result = unpadder.update(decryptor.update(data)) + unpadder.finalize()
|
||||
return result.decode(), init_vector
|
||||
except UnicodeDecodeError:
|
||||
raise InvalidPasswordError()
|
||||
except ValueError as e:
|
||||
if e.args[0] == 'Invalid padding bytes.':
|
||||
raise InvalidPasswordError()
|
||||
|
|
|
@ -39,6 +39,10 @@ class TestAESEncryptDecrypt(TestCase):
|
|||
with self.assertRaises(InvalidPasswordError):
|
||||
aes_decrypt('notbubblegum', aes_encrypt('bubblegum', self.message))
|
||||
|
||||
def test_edge_case_invalid_password_valid_padding_invalid_unicode(self):
|
||||
with self.assertRaises(InvalidPasswordError):
|
||||
aes_decrypt('notbubblegum', 'gy3/mNq3FWB/xAXirOQnlAqQLuvhLGXZaeGBUIg1w6yY4PDLDT7BU83XOfBsJoluWU5zEU4+upOFH35HDqyV8EMQhcKSufN9WkT1izEbFtweBUTK8nTSkV7NBppE1Jaz')
|
||||
|
||||
def test_better_encrypt_decrypt(self):
|
||||
self.assertEqual(
|
||||
b'valuable value',
|
||||
|
|
Loading…
Reference in a new issue