Minor fixes

Author: Inbal Tako

securenative/config/configuration_manager.py

@@ -2,7 +2,7 @@
 from configparser import ConfigParser
 
 from securenative.config.securenative_options import SecureNativeOptions
-from securenative.exceptions.securenative_config_exception import SecureNativeConfigException
+from securenative.logger import Logger
 
 
 class ConfigurationManager(object):
@@ -15,7 +15,7 @@ def read_resource_file(cls, resource_path):
         try:
             cls.config.read(resource_path)
         except Exception as e:
-            raise SecureNativeConfigException("Invalid config file; %s", e)
+            Logger.debug("Invalid config file; {}, using default options".format(e))
 
         properties = {}
         for key, value in cls.config.defaults().items():

securenative/securenative.py

@@ -76,9 +76,8 @@ def verify(self, event_options):
     def _flush(cls):
         cls._securenative = None
 
-    @classmethod
-    def from_http_request(cls, request):
-        return SecureNativeContext.from_http_request(request, SecureNative._options)
+    def from_http_request(self, request):
+        return SecureNativeContext.from_http_request(request, self._options)
 
     def verify_request_payload(self, request):
         request_signature = request.header[SignatureUtils.SignatureHeader]

securenative/utils/request_utils.py

@@ -16,9 +16,10 @@ def get_client_ip_from_request(request, options):
                 try:
                     if request.environ.get(header) is not None:
                         return request.environ.get(header)
-                except AttributeError:
                     if request.headers[header] is not None:
                         return request.headers[header]
+                except Exception:
+                    continue
 
         try:
             x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')