fix(param): trim whitespace around header name/value

Author: marjune163

src/param/main.go

@@ -72,7 +72,7 @@ type Param struct {
 	RestrictAccessDirs [][]string
 
 	GlobalHeaders [][2]string // [][name, value]
-	// [][path, (name, value)...]
+	// [][path, name1, value1, ..., nameN, valueN]
 	HeadersUrls [][]string
 	HeadersDirs [][]string
 
@@ -210,10 +210,15 @@ func (param *Param) Normalize() (errs []error) {
 	errs = append(errs, es...)
 
 	// headers
+	TrimKVs(param.GlobalHeaders)
+
 	param.HeadersUrls, es = normalizeAllPathValues(param.HeadersUrls, false, util.NormalizeUrlPath, normalizeHeaders)
 	errs = append(errs, es...)
+	TrimValuesAfterKey(param.HeadersUrls)
+
 	param.HeadersDirs, es = normalizeAllPathValues(param.HeadersDirs, false, filepath.Abs, normalizeHeaders)
 	errs = append(errs, es...)
+	TrimValuesAfterKey(param.HeadersDirs)
 
 	// hsts & https
 	if param.Hsts {

src/param/util.go

@@ -135,6 +135,20 @@ func NormalizeFsPaths(inputs []string) []string {
 	return outputs
 }
 
+// TrimValuesAfterKey
+// only trim values in [][key, value, value, ...]
+func TrimValuesAfterKey(inputs [][]string) {
+	for i := range inputs {
+		util.InPlaceTrim(inputs[i][1:])
+	}
+}
+
+func TrimKVs(inputs [][2]string) {
+	for i := range inputs {
+		util.InPlaceTrim(inputs[i][:])
+	}
+}
+
 func NormalizeRedirectCode(code int) int {
 	if code <= 300 || code > 399 {
 		return 301

src/util/str.go

@@ -1,6 +1,7 @@
 package util
 
 import (
+	"strings"
 	"unicode"
 	"unicode/utf8"
 )
@@ -29,6 +30,12 @@ eachValue:
 	return inputs[:endIndex]
 }
 
+func InPlaceTrim(inputs []string) {
+	for i := range inputs {
+		inputs[i] = strings.TrimSpace(inputs[i])
+	}
+}
+
 func EscapeControllingRune(str string) []byte {
 	runeBytes := make([]byte, 4)
 	buf := make([]byte, 0, len(str))

src/util/str_test.go

@@ -22,6 +22,15 @@ func TestInPlaceDedup(t *testing.T) {
 	}
 }
 
+func TestInPlaceTrim(t *testing.T) {
+	inputs := []string{"a", "b", "  c", "d  ", "\te f \n"}
+	InPlaceTrim(inputs)
+
+	if !reflect.DeepEqual(inputs, []string{"a", "b", "c", "d", "e f"}) {
+		t.Error(inputs)
+	}
+}
+
 func TestReplaceControllingRune(t *testing.T) {
 	var str string
 	buf := make([]byte, 0, 64)

test/case/032.custom.header.bash

@@ -5,8 +5,8 @@ source "$root"/lib.bash
 "$ghfs" -l 3003 -r "$fs"/vhost1 -a :shortcut/vhost2:"$fs"/vhost2/ \
 	--global-header foo:bar \
 	--global-header 'set-cookie:name1=value1' \
-	--global-header 'set-cookie:name2=value2' \
-	--header '|hello|X-Hello-Name|X-Hello-Value' \
+	--global-header '  set-cookie  : 		name2=value2 		' \
+	--header '|hello|  X-Hello-Name  |  X-Hello-Value  ' \
 	--header '|/shortcut|X-Sc-Name|X-Sc-Value' \
 	--header-dir ":$fs/vhost1/world:X-World-Name:X-World-Value" \
 	--header-dir ":$fs/vhost2:X-Vh2-Name:X-Vh2-Value" \