Fix regex for GITHUB_ENV parsing (#893)

* fix: correct env pattern regex GitHub Actions allows for envvars to contain Signed-off-by: hackercat <[email protected]> * format: format and typo fix Signed-off-by: hackercat <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
nektos · Nov 19, 2021 · 96cf907 · 96cf907
1 parent 4ae71b5
commit 96cf907
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/pkg/container/docker_run.go b/pkg/container/docker_run.go
@@ -369,7 +369,10 @@ var singleLineEnvPattern, mulitiLineEnvPattern *regexp.Regexp
 
 func (cr *containerReference) extractEnv(srcPath string, env *map[string]string) common.Executor {
 	if singleLineEnvPattern == nil {
-		singleLineEnvPattern = regexp.MustCompile("^([^=]+)=([^=]+)$")
+		// Single line pattern matches:
+		// SOME_VAR=data=moredata
+		// SOME_VAR=datamoredata
+		singleLineEnvPattern = regexp.MustCompile(`^([^=]*)\=(.*)$`)
 		mulitiLineEnvPattern = regexp.MustCompile(`^([^<]+)<<(\w+)$`)
 	}
 

diff --git a/pkg/runner/testdata/env-and-path/push.yaml b/pkg/runner/testdata/env-and-path/push.yaml
@@ -43,7 +43,16 @@ jobs:
       - name: "Check single line env"
         run: |
           if [[ "${KEY}" != "value" ]]; then
-            echo "${KEY} dosen't == 'value'"
+            echo "${KEY} doesn't == 'value'"
+            exit 1
+          fi
+      - name: "Write single line env with more than one 'equals' signs to $GITHUB_ENV"
+        run: |
+          echo "KEY=value=anothervalue" >> $GITHUB_ENV
+      - name: "Check single line env"
+        run: |
+          if [[ "${KEY}" != "value=anothervalue" ]]; then
+            echo "${KEY} doesn't == 'value=anothervalue'"
             exit 1
           fi
       - name: "Write multiline env to $GITHUB_ENV"
@@ -54,8 +63,6 @@ jobs:
       - name: "Check multiline line env"
         run: |
           if [[ "${KEY2}" != "value2" ]]; then
-            echo "${KEY2} dosen't == 'value'"
+            echo "${KEY2} doesn't == 'value'"
             exit 1
           fi
-
-