Fix decrypt and iso date format

Author: Inbal Tako

securenative/utils/date_utils.py

@@ -6,5 +6,5 @@ class DateUtils(object):
     @staticmethod
     def to_timestamp(date):
         if not date:
-            return datetime.now().strftime("%Y-%d-%dT%H:%M:%S.%fZ")
-        return datetime.strptime(date, "%Y-%m-%dT%H:%M:%S.%f%z")
+            return datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3] + 'Z'
+        return datetime.strptime(date, '%Y-%m-%dT%H:%M:%S.%f'[:-3] + 'Z')

securenative/utils/encryption_utils.py

@@ -1,5 +1,6 @@
-from binascii import unhexlify, hexlify
 import json
+from binascii import unhexlify, hexlify
+from json import JSONDecodeError
 
 from Crypto import Random
 from Crypto.Cipher import AES
@@ -27,8 +28,11 @@ def decrypt(cls, encrypted, cipher_key):
         cipher_text = content[cls.BLOCK_SIZE:]
         aes = AES.new(key, AES.MODE_CBC, iv)
         rv = aes.decrypt(cipher_text).decode("utf-8").strip()
-        secret = json.loads(rv)
-        return ClientToken(secret.get("cid"), secret.get("vid"), secret.get("fp"))
+        try:
+            secret = json.loads(rv)
+            return ClientToken(secret.get("cid"), secret.get("vid"), secret.get("fp"))
+        except JSONDecodeError:
+            return rv
 
     @classmethod
     def _pad(cls, s):

tests/encryption_utils_test.py

@@ -7,9 +7,9 @@ class EncryptionUtilsTest(unittest.TestCase):
 
     def setUp(self):
         self.SECRET_KEY = "B00C42DAD33EAC6F6572DA756EA4915349C0A4F6"
-        self.PAYLOAD = "{\"cid\":\"198a41ff-a10f-4cda-a2f3-a9ca80c0703b\"," \
-                       "\"vi\":\"148a42ff-b40f-4cda-a2f3-a8ca80c0703b\"," \
-                       "\"fp\":\"6d8cabd95987f8318b1fe01593d5c2a5.24700f9f1986800ab4fcc880530dd0ed\"}";
+        self.PAYLOAD = "{\"cid\":\"198a41ff-a10f-4cda-a2f3-a9ca80c0703b\",\"vi\":\"148a42ff-b40f-4cda-a2f3-a8ca80c0703b\",\"fp\":\"6d8cabd95987f8318b1fe01593d5c2a5.24700f9f1986800ab4fcc880530dd0ed\"}"
+        self.CID = "198a41ff-a10f-4cda-a2f3-a9ca80c0703b"
+        self.FP = "6d8cabd95987f8318b1fe01593d5c2a5.24700f9f1986800ab4fcc880530dd0ed"
 
     def test_decrypt(self):
         result = EncryptionUtils.encrypt(self.PAYLOAD, self.SECRET_KEY)
@@ -18,33 +18,32 @@ def test_decrypt(self):
         self.assertGreater(len(self.PAYLOAD), len(result))
 
     def test_encrypt(self):
-        encrypted_payload = "5208ae703cc2fa0851347f55d3b76d3fd6035ee081d71a401e8bc92ebdc25d42440f62310bda60628537744ac03f200d78da9e61f1019ce02087b7ce6c976e7b2d8ad6aa978c532cea8f3e744cc6a5cafedc4ae6cd1b08a4ef75d6e37aa3c0c76954d16d57750be2980c2c91ac7ef0bbd0722abd59bf6be22493ea9b9759c3ff4d17f17ab670b0b6fc320e6de982313f1c4e74c0897f9f5a32d58e3e53050ae8fdbebba9009d0d1250fe34dcde1ebb42acbc22834a02f53889076140f0eb8db1 "
+        encrypted_payload = "5208ae703cc2fa0851347f55d3b76d3fd6035ee081d71a401e8bc92ebdc25d42440f62310bda60628537744ac03f200d78da9e61f1019ce02087b7ce6c976e7b2d8ad6aa978c532cea8f3e744cc6a5cafedc4ae6cd1b08a4ef75d6e37aa3c0c76954d16d57750be2980c2c91ac7ef0bbd0722abd59bf6be22493ea9b9759c3ff4d17f17ab670b0b6fc320e6de982313f1c4e74c0897f9f5a32d58e3e53050ae8fdbebba9009d0d1250fe34dcde1ebb42acbc22834a02f53889076140f0eb8db1"
         result = EncryptionUtils.decrypt(encrypted_payload, self.SECRET_KEY)
 
-        self.assertEqual(result, self.PAYLOAD)
+        self.assertEqual(result.cid, self.CID)
+        self.assertEqual(result.fp, self.FP)
 
     def test_encrypt_decrypt(self):
         enc_res = EncryptionUtils.encrypt(self.PAYLOAD, self.SECRET_KEY)
         dec_res = EncryptionUtils.decrypt(enc_res, self.SECRET_KEY)
 
-        self.assertEqual(dec_res, self.PAYLOAD)
+        self.assertIsNotNone(dec_res)
+        self.assertIsNotNone(enc_res)
 
     def test_encrypt_with_invalid_key_length(self):
-        secret_key = "BAD_KEY"
-        result = EncryptionUtils.encrypt(self.PAYLOAD, secret_key)
-
-        self.assertEqual(len(result), 0)
+        with self.assertRaises(ValueError):
+            secret_key = "BAD_KEY"
+            EncryptionUtils.encrypt(self.PAYLOAD, secret_key)
 
     def test_decrypt_with_invalid_key_length(self):
-        secret_key = "BAD_KEY"
-        encrypted_payload = "5208ae703cc2fa0851347f55d3b76d3fd6035ee081d71a401e8bc92ebdc25d42440f62310bda60628537744ac03f200d78da9e61f1019ce02087b7ce6c976e7b2d8ad6aa978c532cea8f3e744cc6a5cafedc4ae6cd1b08a4ef75d6e37aa3c0c76954d16d57750be2980c2c91ac7ef0bbd0722abd59bf6be22493ea9b9759c3ff4d17f17ab670b0b6fc320e6de982313f1c4e74c0897f9f5a32d58e3e53050ae8fdbebba9009d0d1250fe34dcde1ebb42acbc22834a02f53889076140f0eb8db1"
-        EncryptionUtils.decrypt(encrypted_payload, secret_key)
-
-        self.assertRaises(ValueError)
+        with self.assertRaises(ValueError):
+            secret_key = "BAD_KEY"
+            encrypted_payload = "5208ae703cc2fa0851347f55d3b76d3fd6035ee081d71a401e8bc92ebdc25d42440f62310bda60628537744ac03f200d78da9e61f1019ce02087b7ce6c976e7b2d8ad6aa978c532cea8f3e744cc6a5cafedc4ae6cd1b08a4ef75d6e37aa3c0c76954d16d57750be2980c2c91ac7ef0bbd0722abd59bf6be22493ea9b9759c3ff4d17f17ab670b0b6fc320e6de982313f1c4e74c0897f9f5a32d58e3e53050ae8fdbebba9009d0d1250fe34dcde1ebb42acbc22834a02f53889076140f0eb8db1"
+            EncryptionUtils.decrypt(encrypted_payload, secret_key)
 
     def test_encrypt_decrypt_with_key_too_long(self):
-        secret_key = "B00C42DAD33EAC6F6572DA756EA4915349C0A4F6B00C42DAD33EAC6F6572DA756EA4915349C0A4F6";
-        enc_res = EncryptionUtils.encrypt(self.PAYLOAD, secret_key)
-        EncryptionUtils.decrypt(enc_res, secret_key)
-
-        self.assertRaises(ValueError)
+        with self.assertRaises(ValueError):
+            secret_key = "B00C42DAD33EAC6F6572DA756EA4915349C0A4F6B00C42DAD33EAC6F6572DA756EA4915349C0A4F6";
+            enc_res = EncryptionUtils.encrypt(self.PAYLOAD, secret_key)
+            EncryptionUtils.decrypt(enc_res, secret_key)

tests/signature_utils_test.py

@@ -10,7 +10,7 @@ def test_verify_request_payload(self):
         payload = "{\"id\":\"4a9157ffbd18cfbd73a57298\",\"type\":\"security-action\",\"flow\":{\"id\":\"62298c73a9bb433fbd1f75984a9157fd\",\"name\":\"Block user that violates geo velocity\"},\"userId\":\"73a9bb433fbd1f75984a9157\",\"userTraits\":{\"name\":\"John Doe\",\"email\":\"john.doe@gmail.com\"},\"request\":{\"ip\":\"10.0.0.0\",\"fp\":\"9bb433fb984a9157d1f7598\"},\"action\":\"block\",\"properties\":{\"type\":\"customer\"},\"timestamp\":\"2020-02-23T22:28:55.387Z\"}"
         secret_key = "B00C42DAD33EAC6F6572DA756EA4915349C0A4F6"
 
-        result = SignatureUtils.is_valid_signature(signature, payload, secret_key)
+        result = SignatureUtils.is_valid_signature(secret_key, payload, signature)
         self.assertTrue(result)
 
     def test_verify_request_empty_signature(self):