handle spaces between keys in SRC_HEADERS

sourcegraph · Jun 29, 2022 · c9070ac · c9070ac
1 parent bd18114
commit c9070ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cmd/src/headers.go b/cmd/src/headers.go
@@ -42,7 +42,10 @@ func parseAdditionalHeadersFromEnviron(environ []string) map[string]string {
 					continue
 				}
 
-				additionalHeaders[strings.ToLower(p[0])] = strings.Trim(p[1], " ")
+				key := strings.Trim(strings.ToLower(p[0]), " ")
+				value := strings.Trim(p[1], " ")
+
+				additionalHeaders[key] = value
 			}
 			continue
 		}

diff --git a/cmd/src/headers_test.go b/cmd/src/headers_test.go
@@ -21,7 +21,7 @@ func TestParseAdditionalHeaders(t *testing.T) {
 		{environ: []string{"SRC_HEADERS=foo:bar\nbar:baz\nAUTHORIZATION:Bearer somerandomstring"}, headers: map[string]string{"foo": "bar", "bar": "baz", "authorization": "Bearer somerandomstring"}},
 		{environ: []string{"SRC_HEADERS=foo:bar\nbar:baz\nfoo-bar:baz-bar"}, headers: map[string]string{"foo": "bar", "bar": "baz", "foo-bar": "baz-bar"}},
 		{environ: []string{"SRC_HEADERS=\"foo:bar\nbar:baz\nfoo-bar:baz-bar\""}, headers: map[string]string{"foo": "bar", "bar": "baz", "foo-bar": "baz-bar"}},
-		{environ: []string{"SRC_HEADERS=foo:bar\nbar:baz\nfoo-bar:baz-bar", "SRC_HEADER_A=foo"}, headers: map[string]string{"foo": "bar", "bar": "baz", "foo-bar": "baz-bar", "a": "foo"}},
+		{environ: []string{"SRC_HEADERS=foo:bar\nbar:baz\n foo-bar    :   baz-bar\nb: bar", "SRC_HEADER_A=foo"}, headers: map[string]string{"foo": "bar", "bar": "baz", "foo-bar": "baz-bar", "b": "bar", "a": "foo"}},
 		{environ: []string{"SRC_HEADERS", "SRC_HEADER_A=foo"}, headers: map[string]string{"a": "foo"}},
 	}