fix(marketplacesvm) path regex

This commit updates the regex patter for validating the staged directory path string. Signed-off-by: Jonathan Gangi <[email protected]>
konflux-ci · Dec 9, 2024 · ad94ba0 · ad94ba0
1 parent cd12f6a
commit ad94ba0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pubtools-marketplacesvm-wrapper/marketplacesvm_push_wrapper.py b/pubtools-marketplacesvm-wrapper/marketplacesvm_push_wrapper.py
@@ -70,7 +70,7 @@ def parse_args():
 
 
 def get_source_url(stagedirs):
-    regex = re.compile(r"^/[\w++/*]+$")
+    regex = re.compile(r"^/([^/\0]+(/)?)+$")
     for item in stagedirs:
         if not regex.match(item):
             raise ValueError("Not a valid staging directory: %s" % item)

diff --git a/pubtools-marketplacesvm-wrapper/test_marketplacesvm_push_wrapper.py b/pubtools-marketplacesvm-wrapper/test_marketplacesvm_push_wrapper.py
@@ -126,6 +126,7 @@ def test_basic_command_nochannel(mock_run, caplog, mock_mkt_env_vars):
         ["/foo/bar/"],
         ["/a", "/tmp/foo/"],
         ["/a/b/c/d/e/f/g/h/i", "/a1/a2/a3/", "/f"],
+        ["/tmp/afASFu.fas", "/tmp/A.fs_.", "/tmp/fas12414fas"],
     ],
 )
 def test_get_source_url(stageddirs):
@@ -136,7 +137,7 @@ def test_get_source_url(stageddirs):
 
 @pytest.mark.parametrize(
     "stageddirs",
-    [["foo"], ["foo/bar"], [r"/\/\/\/\/\/\/"]],
+    [["foo"], ["foo/bar"], [r"/////////////"]],
 )
 def test_get_source_url_invalid(stageddirs):
     err = "Not a valid staging directory:"