Merge pull request PanDAWMS#292 from tmaeno/master

protection against long job params
fbarreir · Feb 1, 2024 · c219ce0 · c219ce0
2 parents 71e2d4d + c9f20f3
commit c219ce0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/pandaserver/taskbuffer/JobSpec.py b/pandaserver/taskbuffer/JobSpec.py
@@ -620,9 +620,10 @@ def addMultiStepExec(self, steps):
     # extract multi step exec
     def extractMultiStepExec(self):
         try:
-            ppStr = re.search("(.*)<MULTI_STEP_EXEC>(.+)</MULTI_STEP_EXEC>", self.jobParameters)
-            if ppStr is not None:
-                return ppStr.group(1), json.loads(ppStr.group(2))
+            if "<MULTI_STEP_EXEC>" in self.jobParameters and "</MULTI_STEP_EXEC>" in self.jobParameters:
+                pp_1, pp_2 = self.jobParameters.split("<MULTI_STEP_EXEC>")
+                pp_2 = pp_2.split("</MULTI_STEP_EXEC>")[0]
+                return pp_1, json.loads(pp_2)
         except Exception:
             pass
         return self.jobParameters, None