Merge pull request #35 from securenative/dev

Fix crypto on windows

Author: inbaltako

VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

requirements.txt

@@ -1,5 +1,5 @@
-requests~=2.23.0
-pycrypto~=2.6.1
-responses==0.10.14
+requests~=2.24.0
+pycryptodome==3.9.8
+responses==0.10.15
 requests-mock==1.8.0
 pytest==5.4.3

securenative/utils/encryption_utils.py

@@ -17,9 +17,9 @@ def encrypt(cls, text, cipher_key):
         try:
             key = cipher_key[:cls.KEY_SIZE]
             iv = Random.new().read(AES.block_size)
-            cipher = AES.new(key, AES.MODE_CBC, iv)
+            cipher = AES.new(key.encode("utf8"), AES.MODE_CBC, iv)
             raw = str(cls._pad(text))
-            return hexlify(iv + cipher.encrypt(raw))
+            return hexlify(iv + cipher.encrypt(raw.encode("utf8")))
         except Exception as e:
             Logger.error("Could not encrypt text {}; {}".format(text, e))
             return None
@@ -31,7 +31,7 @@ def decrypt(cls, encrypted, cipher_key):
             content = unhexlify(encrypted)
             iv = content[:cls.BLOCK_SIZE]
             cipher_text = content[cls.BLOCK_SIZE:]
-            aes = AES.new(key, AES.MODE_CBC, iv)
+            aes = AES.new(key.encode("utf8"), 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"))

securenative/utils/version_utils.py

@@ -2,4 +2,4 @@ class VersionUtils(object):
 
     @staticmethod
     def get_version():
-        return "0.2.3"
+        return "0.2.4"

tests/configuration_manager_test.py

@@ -1,5 +1,6 @@
 import configparser
 import os
+import platform
 import unittest
 
 from securenative.config.configuration_manager import ConfigurationManager
@@ -27,6 +28,7 @@ def create_ini_file(self, conf):
         with open(self.config_file_path, "w") as configfile:
             config.write(configfile)
 
+    @unittest.skipIf(platform.system() == "Windows" or platform.system() == "windows", "test not supported on windows")
     def test_parse_config_file_correctly(self):
         try:
             os.remove(self.config_file_path)
@@ -72,6 +74,7 @@ def test_parse_config_file_correctly(self):
         self.assertEqual(options.max_events, "100")
         self.assertEqual(options.timeout, "1500")
 
+    @unittest.skipIf(platform.system() == "Windows" or platform.system() == "windows", "test not supported on windows")
     def test_ignore_unknown_config_in_properties_file(self):
         try:
             os.remove(self.config_file_path)
@@ -100,6 +103,7 @@ def test_ignore_unknown_config_in_properties_file(self):
         self.assertIsNotNone(options)
         self.assertEqual(options.timeout, "1500")
 
+    @unittest.skipIf(platform.system() == "Windows" or platform.system() == "windows", "test not supported on windows")
     def test_handle_invalid_config_file(self):
         try:
             os.remove(self.config_file_path)
@@ -124,6 +128,7 @@ def test_handle_invalid_config_file(self):
 
         self.assertIsNotNone(options)
 
+    @unittest.skipIf(platform.system() == "Windows" or platform.system() == "windows", "test not supported on windows")
     def ignore_invalid_config_file_entries(self):
         try:
             os.remove(self.config_file_path)
@@ -154,6 +159,7 @@ def ignore_invalid_config_file_entries(self):
         self.assertIsNotNone(options)
         self.assertEqual(options.fail_over_strategy, FailOverStrategy.FAIL_OPEN)
 
+    @unittest.skipIf(platform.system() == "Windows" or platform.system() == "windows", "test not supported on windows")
     def test_load_default_config(self):
         try:
             os.remove(self.config_file_path)
@@ -184,6 +190,7 @@ def test_load_default_config(self):
         self.assertEqual(options.log_level, "CRITICAL")
         self.assertEqual(options.fail_over_strategy, FailOverStrategy.FAIL_OPEN.value)
 
+    @unittest.skipIf(platform.system() == "Windows" or platform.system() == "windows", "test not supported on windows")
     def test_get_config_from_env_variables(self):
         try:
             os.remove(self.config_file_path)
@@ -223,6 +230,7 @@ def test_get_config_from_env_variables(self):
         self.assertEqual(options.log_level, "Debug")
         self.assertEqual(options.fail_over_strategy, FailOverStrategy.FAIL_CLOSED.value)
 
+    @unittest.skipIf(platform.system() == "Windows" or platform.system() == "windows", "test not supported on windows")
     def test_default_values_for_invalid_enum_config_props(self):
         try:
             os.remove(self.config_file_path)