openstack
/
heat
Code Issues Proposed changes

Merge "Fix intermittent error in test_decrypt_dict_invalid_key"

This commit is contained in:
Zuul 2019-07-29 04:26:41 +00:00 committed by Gerrit Code Review
parent 3d4d8a7e22 d50ded7395
commit 78b3ed5458
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/common/crypt.py
View File

@ -125,7 +125,12 @@ def decrypted_dict(data, encryption_key=None):
return return_data
for prop_name, prop_value in data.items():
method, value = prop_value
decrypted_value = decrypt(method, value, encryption_key)
try:
decrypted_value = decrypt(method, value, encryption_key)
except UnicodeDecodeError:
# The dict contained valid JSON on the way in, so if what comes
# out is garbage then the key was incorrect.
raise exception.InvalidEncryptionKey()
prop_string = jsonutils.loads(decrypted_value)
return_data[prop_name] = prop_string
return return_data