osbot-utils 1.30.0__py3-none-any.whl → 1.31.0__py3-none-any.whl

osbot_utils/utils/Env.py

@@ -6,14 +6,28 @@ from osbot_utils.utils.Files    import all_parent_folders, file_exists
 from osbot_utils.utils.Misc     import list_set
 from osbot_utils.utils.Str      import strip_quotes
 
-def env__home_root():                           # todo: this should be refatored to be env__home__is__root
+
+def env__home():
+    return get_env('HOME', '')
+
+def env__home__is__root():
     return os.getenv('HOME') == '/root'
 
-def env__terminal_xterm():                      # todo: this should be refatored to be env__terminal__is__xterm
+def env__old_pwd():
+    return get_env('OLDPWD', '')
+
+def env__pwd():
+    return get_env('PWD', '')
+
+def env__old_pwd__remove(value):
+    return value.replace(env__old_pwd(), '')
+
+def env__terminal__is__xterm():
     return os.getenv('TERM') == 'xterm'
 
-def env__not_terminal_xterm():
-    return not env__terminal_xterm()
+def env__terminal__is_not__xterm():
+    return not env__terminal__is__xterm()
+
 
 def platform_darwin():
     return platform == 'darwin'
@@ -21,6 +35,10 @@ def platform_darwin():
 def env_value(var_name):
     return env_vars().get(var_name, None)
 
+def env_var_set(var_name):
+    value = os.getenv(var_name)
+    return value is not None and value != ''
+
 def env_vars_list():
     return list_set(env_vars())
 
@@ -109,6 +127,6 @@ def unload_dotenv(dotenv_path=None):
                 env_unload_from_file(env_path)                      # Process it
                 break                                               # Stop after unloading the first .env file
 
-
-env_load = load_dotenv
-get_env  = os.getenv
+is_env_var_set = env_var_set
+env_load       = load_dotenv
+get_env        = os.getenv

osbot_utils/utils/Files.py

@@ -340,6 +340,8 @@ class Files:
     def parent_folder_combine(file, path):
         return Files.path_combine(os.path.dirname(file),path)
 
+
+
     @staticmethod
     def pickle_save_to_file(object_to_save, path=None):
         path = path or temp_file(extension=".pickle")
@@ -491,12 +493,26 @@ def folders_names_in_folder(target):
     folders = folders_in_folder(target)
     return folders_names(folders)
 
+def path_combine_safe(base_path, file_location, raise_exception=False):                                  # handle possible directory transversal attacks
+    full_path            = os.path.join(base_path, file_location)                                       # Combine and normalize paths
+    normalised_base_path = os.path.normpath(base_path)
+    normalised_full_path = os.path.normpath(full_path)
+
+    if os.path.commonpath([normalised_base_path, normalised_full_path]) == normalised_base_path:        # Check for directory traversal
+        return normalised_full_path
+    if raise_exception:
+        raise ValueError("Invalid file location: directory traversal attempt detected.")
+    return None
+
 def parent_folder_create(target):
     return folder_create(parent_folder(target))
 
 def parent_folder_exists(target):
     return folder_exists(parent_folder(target))
 
+def parent_folder_name(target):
+    return folder_name(parent_folder(target))
+
 def parent_folder_not_exists(target):
     return parent_folder_exists(target) is False
 

osbot_utils/utils/Http.py

@@ -22,6 +22,13 @@ def current_host_online(url_to_use=URL_CHECK_HOST_ONLINE):
 def dns_ip_address(host):
     return socket.gethostbyname(host)
 
+def is_url_online(target):
+    try:
+        http_request(target, method='HEAD')
+        return True
+    except:
+        return False
+
 def is_port_open(host, port, timeout=0.5):
     return port_is_open(host=host, port=port, timeout=timeout)
 

osbot_utils/version

@@ -1 +1 @@
-v1.30.0
+v1.31.0

{osbot_utils-1.30.0.dist-info → osbot_utils-1.31.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.30.0
+Version: 1.31.0
 Summary: OWASP Security Bot - Utils
 Home-page: https://github.com/owasp-sbot/OSBot-Utils
 License: MIT
@@ -22,7 +22,7 @@ Description-Content-Type: text/markdown
 
 Powerful Python util methods and classes that simplify common apis and tasks.
 
-![Current Release](https://img.shields.io/badge/release-v1.30.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.31.0-blue)
 [![codecov](https://codecov.io/gh/owasp-sbot/OSBot-Utils/graph/badge.svg?token=GNVW0COX1N)](https://codecov.io/gh/owasp-sbot/OSBot-Utils)
 
 

{osbot_utils-1.30.0.dist-info → osbot_utils-1.31.0.dist-info}/RECORD

@@ -265,11 +265,11 @@ osbot_utils/utils/Assert.py,sha256=u9XLgYn91QvNWZGyPi29SjPJSXRHlm9andIn3NJEVog,1
 osbot_utils/utils/Call_Stack.py,sha256=MAq_0vMxnbeLfCe9qQz7GwJYaOuXpt3qtQwN6wiXsU0,6595
 osbot_utils/utils/Csv.py,sha256=oHLVpjRJqrLMz9lubMCNEoThXWju5rNTprcwHc1zq2c,1012
 osbot_utils/utils/Dev.py,sha256=HibpQutYy_iG8gGV8g1GztxNN4l29E4Bi7UZaVL6-L8,1203
-osbot_utils/utils/Env.py,sha256=Pbel6npitij9zag6SsWdPVH2j1BTZjxnwOR1vLiIyMo,5248
+osbot_utils/utils/Env.py,sha256=243O6ENzaRjHXp8DIHUuv4Wfk-zHTE18KZr0cU8uWyo,5474
 osbot_utils/utils/Exceptions.py,sha256=KyOUHkXQ_6jDTq04Xm261dbEZuRidtsM4dgzNwSG8-8,389
-osbot_utils/utils/Files.py,sha256=bZFvjyC4TAmFH6RSp3Xvj_xBxfybCT2cE7x2qNTQmeE,20834
+osbot_utils/utils/Files.py,sha256=RHbxq8AVdGT9S-OrxEWhNEOhbIrHDRU1UbGB1O05Ga8,21615
 osbot_utils/utils/Functions.py,sha256=0E6alPJ0fJpBiJgFOWooCOi265wSRyxxXAJ5CELBnso,3498
-osbot_utils/utils/Http.py,sha256=Z8V149M2HDrKBoXkDD5EXgqTGx6vQoUqXugXK__wcuw,4572
+osbot_utils/utils/Http.py,sha256=WlXEfgT_NaiDVD7vCDUxy_nOm5Qf8x_L0A3zd8B5tX8,4706
 osbot_utils/utils/Int.py,sha256=PmlUdU4lSwf4gJdmTVdqclulkEp7KPCVUDO6AcISMF4,116
 osbot_utils/utils/Json.py,sha256=UNaBazuH1R40fsHjpjuK8kmAANmUHoK9Q0PUeYmgPeY,6254
 osbot_utils/utils/Json_Cache.py,sha256=mLPkkDZN-3ZVJiDvV1KBJXILtKkTZ4OepzOsDoBPhWg,2006
@@ -286,8 +286,8 @@ osbot_utils/utils/Toml.py,sha256=dqiegndCJF7V1YT1Tc-b0-Bl6QWyL5q30urmQwMXfMQ,140
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=t9txUxJzLBEHot6WJwF0iTTUQ1Gf_V2pVwsWzAqw_NU,12163
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=rySeFYh2TX0iwzR0MwppiJ1yllnTK1JQxMRPUGe8DS0,8
-osbot_utils-1.30.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.30.0.dist-info/METADATA,sha256=XspSKWOcbtP6-hGL3r9N7NmMZn7n91lK68mf8vPxetI,1266
-osbot_utils-1.30.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-osbot_utils-1.30.0.dist-info/RECORD,,
+osbot_utils/version,sha256=xqw0vpyVEQS2xRHlm1kwNututCAIDLAR7pKKQAdsSZo,8
+osbot_utils-1.31.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.31.0.dist-info/METADATA,sha256=QLHGRLf7-AaRW446YXqvjj86DdwwGuZgC-TeaEgwPTI,1266
+osbot_utils-1.31.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+osbot_utils-1.31.0.dist-info/RECORD,,