Improve how we obtain the settings path

Author: pitbulk

src/onelogin/saml2/settings.py

@@ -12,7 +12,7 @@
 from datetime import datetime
 import json
 import re
-from os.path import dirname, exists, join, sep
+from os.path import dirname, exists, join, sep, abspath
 from xml.dom.minidom import Document
 
 from onelogin.saml2.constants import OneLogin_Saml2_Constants
@@ -115,7 +115,7 @@ def __load_paths(self, base_path=None):
         Sets the paths of the different folders
         """
         if base_path is None:
-            base_path = dirname(dirname(dirname(__file__)))
+            base_path = dirname(dirname(dirname(abspath(__file__))))
         if not base_path.endswith(sep):
             base_path += sep
         self.__paths = {
@@ -134,7 +134,7 @@ def __update_paths(self, settings):
 
         if 'custom_base_path' in settings:
             base_path = settings['custom_base_path']
-            base_path = join(dirname(__file__), base_path)
+            base_path = join(dirname(abspath(__file__)), base_path)
             self.__load_paths(base_path)
 
     def get_base_path(self):

tests/src/OneLogin/saml2_tests/auth_test.py

@@ -19,10 +19,11 @@
 
 
 class OneLogin_Saml2_Auth_Test(unittest.TestCase):
-    data_path = join(dirname(__file__), '..', '..', '..', 'data')
+    data_path = join(dirname(dirname(dirname(dirname(__file__)))), 'data')
+    settings_path = join(dirname(dirname(dirname(dirname(__file__)))), 'settings')
 
     def loadSettingsJSON(self):
-        filename = join(dirname(__file__), '..', '..', '..', 'settings', 'settings1.json')
+        filename = join(self.settings_path, 'settings1.json')
         if exists(filename):
             stream = open(filename, 'r')
             settings = json.load(stream)

tests/src/OneLogin/saml2_tests/authn_request_test.py

@@ -20,7 +20,7 @@
 
 class OneLogin_Saml2_Authn_Request_Test(unittest.TestCase):
     def loadSettingsJSON(self):
-        filename = join(dirname(__file__), '..', '..', '..', 'settings', 'settings1.json')
+        filename = join(dirname(dirname(dirname(dirname(__file__)))), 'settings', 'settings1.json')
         if exists(filename):
             stream = open(filename, 'r')
             settings = json.load(stream)

tests/src/OneLogin/saml2_tests/logout_request_test.py

@@ -18,10 +18,11 @@
 
 
 class OneLogin_Saml2_Logout_Request_Test(unittest.TestCase):
-    data_path = join(dirname(__file__), '..', '..', '..', 'data')
+    data_path = join(dirname(dirname(dirname(dirname(__file__)))), 'data')
+    settings_path = join(dirname(dirname(dirname(dirname(__file__)))), 'settings')
 
     def loadSettingsJSON(self):
-        filename = join(dirname(__file__), '..', '..', '..', 'settings', 'settings1.json')
+        filename = join(self.settings_path, 'settings1.json')
         if exists(filename):
             stream = open(filename, 'r')
             settings = json.load(stream)

tests/src/OneLogin/saml2_tests/logout_response_test.py

@@ -18,10 +18,11 @@
 
 
 class OneLogin_Saml2_Logout_Response_Test(unittest.TestCase):
-    data_path = join(dirname(__file__), '..', '..', '..', 'data')
+    data_path = join(dirname(dirname(dirname(dirname(__file__)))), 'data')
+    settings_path = join(dirname(dirname(dirname(dirname(__file__)))), 'settings')
 
     def loadSettingsJSON(self):
-        filename = join(dirname(__file__), '..', '..', '..', 'settings', 'settings1.json')
+        filename = join(self.settings_path, 'settings1.json')
         if exists(filename):
             stream = open(filename, 'r')
             settings = json.load(stream)

tests/src/OneLogin/saml2_tests/metadata_test.py

@@ -17,8 +17,10 @@
 
 
 class OneLogin_Saml2_Metadata_Test(unittest.TestCase):
+    settings_path = join(dirname(dirname(dirname(dirname(__file__)))), 'settings')
+
     def loadSettingsJSON(self):
-        filename = join(dirname(__file__), '..', '..', '..', 'settings', 'settings1.json')
+        filename = join(self.settings_path, 'settings1.json')
         if exists(filename):
             stream = open(filename, 'r')
             settings = json.load(stream)

tests/src/OneLogin/saml2_tests/response_test.py

@@ -20,13 +20,13 @@
 
 
 class OneLogin_Saml2_Response_Test(unittest.TestCase):
-    data_path = join(dirname(__file__), '..', '..', '..', 'data')
+    data_path = join(dirname(dirname(dirname(dirname(__file__)))), 'data')
 
     def loadSettingsJSON(self, filename=None):
         if filename:
-            filename = join(dirname(__file__), '..', '..', '..', 'settings', filename)
+            filename = join(dirname(dirname(dirname(dirname(__file__)))), 'settings', filename)
         else:
-            filename = join(dirname(__file__), '..', '..', '..', 'settings', 'settings1.json')
+            filename = join(dirname(dirname(dirname(dirname(__file__)))), 'settings', 'settings1.json')
         if exists(filename):
             stream = open(filename, 'r')
             settings = json.load(stream)

tests/src/OneLogin/saml2_tests/settings_test.py

@@ -15,8 +15,8 @@
 
 
 class OneLogin_Saml2_Settings_Test(unittest.TestCase):
-    data_path = join(dirname(__file__), '..', '..', '..', 'data')
-    settings_path = join(dirname(__file__), '..', '..', '..', 'settings')
+    data_path = join(dirname(dirname(dirname(dirname(__file__)))), 'data')
+    settings_path = join(dirname(dirname(dirname(dirname(__file__)))), 'settings')
 
     def loadSettingsJSON(self):
         filename = join(self.settings_path, 'settings1.json')
@@ -121,7 +121,7 @@ def testLoadSettingsFromFile(self):
         Tests the OneLogin_Saml2_Settings Constructor.
         Case load setting from file
         """
-        custom_base_path = join(dirname(__file__), '..', '..', '..', 'settings')
+        custom_base_path = join(dirname(dirname(dirname(dirname(__file__)))), 'settings')
         settings = OneLogin_Saml2_Settings(custom_base_path=custom_base_path)
         self.assertEqual(len(settings.get_errors()), 0)
 
@@ -131,7 +131,7 @@ def testLoadSettingsFromFile(self):
         except Exception as e:
             self.assertIn('Settings file not found', e.message)
 
-        custom_base_path = join(dirname(__file__), '..', '..', '..', 'data', 'customPath')
+        custom_base_path = join(dirname(dirname(dirname(dirname(__file__)))), 'data', 'customPath')
         settings_3 = OneLogin_Saml2_Settings(custom_base_path=custom_base_path)
         self.assertEqual(len(settings_3.get_errors()), 0)
 

tests/src/OneLogin/saml2_tests/signed_response_test.py

@@ -15,10 +15,11 @@
 
 
 class OneLogin_Saml2_SignedResponse_Test(unittest.TestCase):
-    data_path = join(dirname(__file__), '..', '..', '..', 'data')
+    data_path = join(dirname(dirname(dirname(dirname(__file__)))), 'data')
+    settings_path = join(dirname(dirname(dirname(dirname(__file__)))), 'settings')
 
     def loadSettingsJSON(self):
-        filename = join(dirname(__file__), '..', '..', '..', 'settings', 'settings1.json')
+        filename = join(self.settings_path, 'settings1.json')
         if exists(filename):
             stream = open(filename, 'r')
             settings = json.load(stream)