Merge pull request #53 from ecmwf/develop

preparing release
ecmwf · Nov 15, 2024 · 0b465c7 · 0b465c7
2 parents 5ed47d1 + 809d847
commit 0b465c7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/anemoi/utils/config.py b/src/anemoi/utils/config.py
@@ -207,7 +207,7 @@ def load_any_dict_format(path) -> dict:
                 return tomllib.load(f)
     except (json.JSONDecodeError, yaml.YAMLError, tomllib.TOMLDecodeError) as e:
         LOG.warning(f"Failed to parse config file {path}", exc_info=e)
-        return ValueError(f"Failed to parse config file {path} [{e}]")
+        raise ValueError(f"Failed to parse config file {path} [{e}]")
 
     return open(path).read()
 

diff --git a/src/anemoi/utils/remote/ssh.py b/src/anemoi/utils/remote/ssh.py
@@ -44,6 +44,9 @@ def _parse_target(self, target):
             hostnames = hostname.split("+")
             hostname = hostnames[random.randint(0, len(hostnames) - 1)]
 
+        if ".." in path.split("/"):
+            raise Exception("Path contains suspicious '..' : {target}")
+
         return hostname, path
 
     def get_temporary_target(self, target, pattern):

diff --git a/tests/test_remote.py b/tests/test_remote.py
@@ -151,7 +151,7 @@ def test_transfer_local_to_s3_to_local(path):
 
 
 @pytest.mark.skipif(IN_CI, reason="Test requires ssh access to localhost")
-@pytest.mark.parametrize("path", ["directory", "directory/", "file"])
+@pytest.mark.parametrize("path", ["directory", "file"])
 @pytest.mark.parametrize("temporary_target", [True, False])
 def test_transfer_local_to_ssh(path, temporary_target):
     local = LOCAL_TEST_DATA + "/" + path