Merge pull request #22578 from guerler/fixes.005

[26.0] Fixes looks_like_flattened_repeat_key helper

Author: mvdbeek

lib/galaxy/tools/parameters/wrapped.py

@@ -201,6 +201,8 @@ def process_key(incoming_key: str, incoming_value: Any, d: dict[str, Any]):
     else:
         # Section / Conditional
         input_name = key_parts[0]
+        if not input_name or input_name.isdigit():
+            raise RequestParameterInvalidException(f"Parameter '{incoming_key}' has an invalid key structure.")
         subdict = d.get(input_name, {})
         if not isinstance(subdict, dict):
             raise RequestParameterInvalidException(f"Parameter '{incoming_key}' received conflicting value.")

lib/galaxy/util/permutations.py

@@ -159,7 +159,8 @@ def is_in_state(state_dict, key, nested):
 
 
 def looks_like_flattened_repeat_key(key: str) -> bool:
-    return key.rsplit("_", 1)[-1].isdigit()
+    parts = key.rsplit("_", 1)
+    return len(parts) == 2 and parts[1].isdigit()
 
 
 def split_flattened_repeat_key(key: str) -> Tuple[str, int]:

test/unit/app/tools/test_parameter_parsing.py

@@ -2,6 +2,9 @@
     Any,
 )
 
+import pytest
+
+from galaxy.exceptions import RequestParameterInvalidException
 from galaxy.tools.parameters.wrapped import (
     nested_key_to_path,
     process_key,
@@ -58,6 +61,11 @@ def test_process_key_2(self):
         }
         assert nested_dict == expected_dict
 
+    def test_process_key_rejects_all_digit_segment(self):
+        nested_dict: dict[str, Any] = {}
+        with pytest.raises(RequestParameterInvalidException):
+            process_key("files|0|filetype", "fastq", nested_dict)
+
 
 class TestParameterParsing(BaseParameterTestCase):
     """Test the parsing of XML for most parameter types - in many