feat(serverHandler): filter matched path of headers for current alias

Author: marjune163

src/serverHandler/aliasHandler.go

@@ -49,8 +49,8 @@ type aliasHandler struct {
 	restrictAccessDirs   pathStringsList
 
 	globalHeaders [][2]string
-	headersUrls   []pathHeaders
-	headersDirs   []pathHeaders
+	headersUrls   pathHeadersList
+	headersDirs   pathHeadersList
 
 	globalUpload bool
 	uploadUrls   []string
@@ -189,6 +189,10 @@ func newAliasHandler(
 	globalRestrictAccess = vhostCtx.restrictAccessDirs.mergePrefixMatched(globalRestrictAccess, util.HasFsPrefixDir, currentAlias.fs)
 	globalRestrictAccess = util.InPlaceDedup(globalRestrictAccess)
 
+	globalHeaders := p.GlobalHeaders
+	globalHeaders = vhostCtx.headersUrls.mergePrefixMatched(globalHeaders, util.HasUrlPrefixDir, currentAlias.url)
+	globalHeaders = vhostCtx.headersDirs.mergePrefixMatched(globalHeaders, util.HasFsPrefixDir, currentAlias.fs)
+
 	h := &aliasHandler{
 		alias:        currentAlias,
 		emptyRoot:    emptyRoot,
@@ -214,9 +218,9 @@ func newAliasHandler(
 		restrictAccessUrls:   vhostCtx.restrictAccessUrls.filterSuccessor(util.HasUrlPrefixDir, currentAlias.url),
 		restrictAccessDirs:   vhostCtx.restrictAccessDirs.filterSuccessor(util.HasFsPrefixDir, currentAlias.fs),
 
-		globalHeaders: p.GlobalHeaders,
-		headersUrls:   vhostCtx.headersUrls,
-		headersDirs:   vhostCtx.headersDirs,
+		globalHeaders: globalHeaders,
+		headersUrls:   vhostCtx.headersUrls.filterSuccessor(util.HasUrlPrefixDir, currentAlias.url),
+		headersDirs:   vhostCtx.headersDirs.filterSuccessor(util.HasFsPrefixDir, currentAlias.fs),
 
 		globalUpload: p.GlobalUpload,
 		uploadUrls:   p.UploadUrls,

src/serverHandler/header.go

@@ -5,15 +5,10 @@ import (
 	"net/http"
 )
 
-type pathHeaders struct {
-	path    string
-	headers [][2]string
-}
-
-func newPathHeaders(pathHeadersList [][]string) []pathHeaders {
-	results := make([]pathHeaders, 0, len(pathHeadersList))
+func newPathHeaders(pathHeadersEntries [][]string) pathHeadersList {
+	results := make(pathHeadersList, 0, len(pathHeadersEntries))
 
-	for _, pathHeadersSeq := range pathHeadersList {
+	for _, pathHeadersSeq := range pathHeadersEntries {
 		if len(pathHeadersSeq) <= 1 { // no headers
 			continue
 		}

src/serverHandler/pathValues.go

@@ -51,3 +51,51 @@ func (list pathStringsList) filterSuccessor(matchPrefix prefixFilter, refPath st
 		return result
 	}
 }
+
+// pathHeaders
+
+type pathHeaders struct {
+	path    string
+	headers [][2]string
+}
+
+type pathHeadersList []pathHeaders
+
+func (list pathHeadersList) mergePrefixMatched(mergeWith [][2]string, matchPrefix prefixFilter, refPath string) [][2]string {
+	var result [][2]string
+	if mergeWith != nil {
+		result = make([][2]string, len(mergeWith))
+		copy(result, mergeWith)
+	}
+
+	for i := range list {
+		if matchPrefix(refPath, list[i].path) {
+			if result == nil {
+				result = [][2]string{}
+			}
+			result = append(result, list[i].headers...)
+		}
+	}
+
+	if mergeWith != nil && len(mergeWith) == len(result) {
+		return mergeWith
+	} else {
+		return result
+	}
+}
+
+func (list pathHeadersList) filterSuccessor(matchPrefix prefixFilter, refPath string) pathHeadersList {
+	var result pathHeadersList
+
+	for _, v := range list {
+		if len(v.path) > len(refPath) && matchPrefix(v.path, refPath) {
+			result = append(result, v)
+		}
+	}
+
+	if len(list) == len(result) {
+		return list
+	} else {
+		return result
+	}
+}

src/serverHandler/pathValues_test.go

@@ -32,3 +32,31 @@ func TestPathStrings(t *testing.T) {
 		t.Error(successors)
 	}
 }
+
+func TestPathHeaders(t *testing.T) {
+	ps := pathHeadersList{
+		{"/a", [][2]string{{"a", "a-value"}}},
+		{"/a/b", [][2]string{{"ab", "ab-value"}}},
+		{"/a/b/c", [][2]string{{"abc", "abc-value"}}},
+		{"/foo/bar", [][2]string{{"foobar", "foobar-value"}}},
+	}
+
+	mergeWith := [][2]string{{"Access-Control-Allow-Origin", "*"}, {"Access-Control-Allow-Headers", "*"}}
+	merged := ps.mergePrefixMatched(mergeWith, util.HasUrlPrefixDir, "/a/b")
+	if len(mergeWith) != 2 {
+		t.Error()
+	}
+	if len(merged) != 4 || merged[2][0] != "a" || merged[3][0] != "ab" {
+		t.Error(merged)
+	}
+
+	merged = ps.mergePrefixMatched(nil, util.HasUrlPrefixDir, "/lorem/ipsum")
+	if merged != nil {
+		t.Error(merged)
+	}
+
+	successors := ps.filterSuccessor(util.HasUrlPrefixDir, "/a/b")
+	if len(successors) != 1 || successors[0].path != "/a/b/c" {
+		t.Error(successors)
+	}
+}

src/serverHandler/vhostHandler.go

@@ -25,8 +25,8 @@ type vhostContext struct {
 	restrictAccessUrls pathStringsList
 	restrictAccessDirs pathStringsList
 
-	headersUrls []pathHeaders
-	headersDirs []pathHeaders
+	headersUrls pathHeadersList
+	headersDirs pathHeadersList
 
 	vary string
 }