Merge pull request cli#3772 from astroparam/escape-metacharacters

Nate Smith · web-flow · commit 4d900058175a · 2021-06-02T13:50:58.000-05:00
escape metacharacters in job name
diff --git a/pkg/cmd/run/view/view.go b/pkg/cmd/run/view/view.go
@@ -462,7 +462,7 @@ func promptForJob(cs *iostreams.ColorScheme, jobs []shared.Job) (*shared.Job, er
 }
 
 func logFilenameRegexp(job shared.Job, step shared.Step) *regexp.Regexp {
-	re := fmt.Sprintf(`%s\/%d_.*\.txt`, job.Name, step.Number)
+	re := fmt.Sprintf(`%s\/%d_.*\.txt`, regexp.QuoteMeta(job.Name), step.Number)
 	return regexp.MustCompile(re)
 }
 
diff --git a/pkg/cmd/run/view/view_test.go b/pkg/cmd/run/view/view_test.go
@@ -926,6 +926,17 @@ func Test_attachRunLog(t *testing.T) {
 			},
 			wantMatch: false,
 		},
+		{
+			name: "escape metacharacters in job name",
+			job: shared.Job{
+				Name: "metacharacters .+*?()|[]{}^$ job",
+				Steps: []shared.Step{{
+					Name:   "fob the barz",
+					Number: 0,
+				}},
+			},
+			wantMatch: false,
+		},
 		{
 			name: "mismatching job name",
 			job: shared.Job{

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ func promptForJob(cs iostreams.ColorScheme, jobs []shared.Job) (shared.Job, er`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`func logFilenameRegexp(job shared.Job, step shared.Step) *regexp.Regexp {`
`465`		- re := fmt.Sprintf(`%s\/%d_.*\.txt`, job.Name, step.Number)
	`465`	+ re := fmt.Sprintf(`%s\/%d_.*\.txt`, regexp.QuoteMeta(job.Name), step.Number)
`466`	`466`	`return regexp.MustCompile(re)`
`467`	`467`	`}`
`468`	`468`