Merge branch 'master' into fix_app_name

SAP · Oct 25, 2024 · 0edd6ab · 0edd6ab
2 parents 966bbf9 + 8b4109b
commit 0edd6ab
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/test/groovy/TestsPublishResultsTest.groovy b/test/groovy/TestsPublishResultsTest.groovy
@@ -1,3 +1,4 @@
+import com.sap.piper.BashUtils
 import org.junit.After
 import org.junit.Before
 import org.junit.Ignore
@@ -9,8 +10,12 @@ import org.junit.rules.ExpectedException
 import util.BasePiperTest
 import util.JenkinsReadYamlRule
 import util.JenkinsStepRule
+
+import static org.hamcrest.Matchers.not
 import static org.junit.Assert.assertEquals
+import static org.junit.Assert.assertThat
 import static org.junit.Assert.assertTrue
+import static org.hamcrest.Matchers.containsString
 
 import com.sap.piper.Utils
 
@@ -230,4 +235,16 @@ class TestsPublishResultsTest extends BasePiperTest {
 
         stepRule.step.testsPublishResults(script: nullScript, failOnError: true)
     }
+
+    @Test
+    void testPublishUnitTestsWithUpdateResultsDoesNotAllowCommandExecution() throws Exception {
+        def injectString = "' -exec touch {} ; rm -rf / # –"
+        helper.registerAllowedMethod('sh', [String], { String cmd ->
+            assertThat(cmd, containsString(BashUtils.quoteAndEscape(injectString)))
+        })
+
+        stepRule.step.testsPublishResults(script: nullScript, junit: [pattern: injectString, archive: true, active: true, updateResults: true])
+
+
+    }
 }
diff --git a/vars/testsPublishResults.groovy b/vars/testsPublishResults.groovy
@@ -1,4 +1,5 @@
 import static com.sap.piper.Prerequisites.checkScript
+import static com.sap.piper.BashUtils.quoteAndEscape as q
 
 import com.sap.piper.GenerateDocumentation
 import com.sap.piper.ConfigurationHelper
@@ -193,7 +194,7 @@ void touchFiles(pattern){
     echo "[${STEP_NAME}] update test results"
     def patternArray = pattern.split(',')
     for(def i = 0; i < patternArray.length; i++){
-        sh "find . -wholename '${patternArray[i].trim()}' -exec touch {} \\;"
+        sh "find . -wholename ${q(patternArray[i].trim())} -exec touch {} \\;"
     }
 }