commit bd5a4020099f419c5a54a7c2d8de0b6f1b90b9cc
author tierno <alfonso.tiernosepulveda@telefonica.com> Wed Jan 30 09:48:38 2019 +0000
committer tierno <alfonso.tiernosepulveda@telefonica.com> Mon Feb 18 13:17:22 2019 +0000
tree 0de8bbd0ab997b8eaee0c04c3f94c6b6102709af
parent a011781b5b422a023bc0b7c4955cf438a1f05839

Capture UnicodeDecodeError if decrypting with wrong key

Change-Id: If4904c0eeac396eee7082d19784e440991131297
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

osm_common/dbbase.py

diff --git a/osm_common/dbbase.py b/osm_common/dbbase.py
index d199dde..09eddbc 100644
--- a/osm_common/dbbase.py
+++ b/osm_common/dbbase.py
@@ -236,7 +236,11 @@
             encrypted_msg = b64decode(value)
             cipher = AES.new(secret_key)
             decrypted_msg = cipher.decrypt(encrypted_msg)
-            unpadded_private_msg = decrypted_msg.decode().rstrip('\0')
+            try:
+                unpadded_private_msg = decrypted_msg.decode().rstrip('\0')
+            except UnicodeDecodeError:
+                raise DbException("Cannot decrypt information. Are you using same COMMONKEY in all OSM components?",
+                                  http_code=HTTPStatus.INTERNAL_SERVER_ERROR)
             return unpadded_private_msg