SN-1938 Validate user id

Author: Inbal Tako

securenative/config/configuration_builder.py

@@ -1,7 +1,7 @@
 import os
 from configparser import ConfigParser
 
-from securenative.config.configuration_builder import ConfigurationBuilder
+from securenative.config.securenative_options import SecureNativeOptions
 from securenative.exceptions.securenative_config_exception import SecureNativeConfigException
 
 
@@ -32,10 +32,6 @@ def _get_resource_path(cls, env_name):
 
         return os.environ.get(cls.DEFAULT_CONFIG_FILE)
 
-    @staticmethod
-    def config_builder():
-        return ConfigurationBuilder.default_config_builder()
-
     @classmethod
     def _get_env_or_default(cls, properties, key, default):
         if os.environ.get(key):
@@ -46,21 +42,25 @@ def _get_env_or_default(cls, properties, key, default):
 
     @classmethod
     def load_config(cls, resource_path):
-        options = ConfigurationBuilder().get_default_securenative_options()
+        options = SecureNativeOptions()
 
         if not resource_path:
             resource_path = os.environ.get(cls.CUSTOM_CONFIG_FILE_ENV_NAME)
 
         properties = cls.read_resource_file(resource_path)
 
-        return ConfigurationBuilder(). \
-            with_api_key(cls._get_env_or_default(properties, "SECURENATIVE_API_KEY", options.api_key)). \
-            with_api_url(cls._get_env_or_default(properties, "SECURENATIVE_API_URL", options.api_url)). \
-            with_interval(cls._get_env_or_default(properties, "SECURENATIVE_INTERVAL", options.interval)). \
-            with_max_events(cls._get_env_or_default(properties, "SECURENATIVE_MAX_EVENTS", options.max_events)). \
-            with_timeout(cls._get_env_or_default(properties, "SECURENATIVE_TIMEOUT", options.timeout)). \
-            with_auto_send(cls._get_env_or_default(properties, "SECURENATIVE_AUTO_SEND", options.auto_send)). \
-            with_disable(cls._get_env_or_default(properties, "SECURENATIVE_DISABLE", options.disable)). \
-            with_log_level(cls._get_env_or_default(properties, "SECURENATIVE_LOG_LEVEL", options.log_level)). \
-            with_fail_over_strategy(cls._get_env_or_default(
-                properties, "SECURENATIVE_FAILOVER_STRATEGY", options.fail_over_strategy))
+        return SecureNativeOptions(api_key=cls._get_env_or_default(properties, "SECURENATIVE_API_KEY", options.api_key),
+                                   api_url=cls._get_env_or_default(properties, "SECURENATIVE_API_URL", options.api_url),
+                                   interval=cls._get_env_or_default(properties, "SECURENATIVE_INTERVAL",
+                                                                    options.interval),
+                                   max_events=cls._get_env_or_default(properties, "SECURENATIVE_MAX_EVENTS",
+                                                                      options.max_events),
+                                   timeout=cls._get_env_or_default(properties, "SECURENATIVE_TIMEOUT", options.timeout),
+                                   auto_send=cls._get_env_or_default(properties, "SECURENATIVE_AUTO_SEND",
+                                                                     options.auto_send),
+                                   disable=cls._get_env_or_default(properties, "SECURENATIVE_DISABLE", options.disable),
+                                   log_level=cls._get_env_or_default(properties, "SECURENATIVE_LOG_LEVEL",
+                                                                     options.log_level),
+                                   fail_over_strategy=cls._get_env_or_default(properties,
+                                                                              "SECURENATIVE_FAILOVER_STRATEGY",
+                                                                              options.fail_over_strategy))

securenative/config/configuration_manager.py

@@ -6,6 +6,13 @@ class SecureNativeOptions(object):
     def __init__(self, api_key=None, api_url="https://api.securenative.com/collector/api/v1", interval=1000,
                  max_events=1000, timeout=1500, auto_send=True, disable=False, log_level="CRITICAL",
                  fail_over_strategy=FailOverStrategy.FAIL_OPEN.value):
+
+        if fail_over_strategy != FailOverStrategy.FAIL_OPEN.value and \
+                fail_over_strategy != FailOverStrategy.FAIL_CLOSED.value:
+            self.fail_over_strategy = FailOverStrategy.FAIL_OPEN.value
+        else:
+            self.fail_over_strategy = fail_over_strategy
+
         self.api_key = api_key
         self.api_url = api_url
         self.interval = interval
@@ -14,4 +21,3 @@ def __init__(self, api_key=None, api_url="https://api.securenative.com/collector
         self.auto_send = auto_send
         self.disable = disable
         self.log_level = log_level
-        self.fail_over_strategy = fail_over_strategy

securenative/config/securenative_options.py

@@ -1,6 +1,6 @@
 from securenative.api_manager import ApiManager
-from securenative.config.configuration_builder import ConfigurationBuilder
 from securenative.config.configuration_manager import ConfigurationManager
+from securenative.config.securenative_options import SecureNativeOptions
 from securenative.event_manager import EventManager
 from securenative.exceptions.securenative_config_exception import SecureNativeConfigException
 from securenative.exceptions.securenative_sdk_Illegal_state_exception import SecureNativeSDKIllegalStateException
@@ -44,8 +44,7 @@ def init_with_api_key(cls, api_key):
             raise SecureNativeConfigException("You must pass your SecureNative api key")
 
         if cls._securenative is None:
-            builder = ConfigurationBuilder().default_config_builder()
-            options = builder.with_api_key(api_key)
+            options = SecureNativeOptions(api_key=api_key)
             cls._securenative = SecureNative(options)
             return cls._securenative
         else: