feat: add --header option to specify custom header

Author: marjune163

README.md

@@ -143,6 +143,9 @@ server [options]
     Mount a file system path to URL path.
     e.g. ":/doc:/usr/share/doc"
 
+--header <name>:<value> ...
+    Set custom HTTP response header.
+
 -U|--global-upload
     Allow upload files for all url paths.
     Use it with care.

README.zh-CN.md

@@ -142,6 +142,9 @@ server [选项]
     将某个文件系统路径挂载到URL路径下。
     例如：“:/doc:/usr/share/doc”。
 
+--header <名称>:<值> ...
+    设置自定义HTTP响应头。
+
 -U|--global-upload
     对所有URL路径开启上传权限。
     请谨慎使用。

src/param/cli.go

@@ -39,6 +39,9 @@ func init() {
 	err = options.AddFlagsValues("aliases", []string{"-a", "--alias"}, "", nil, "set alias path, <sep><url><sep><path>, e.g. :/doc:/usr/share/doc")
 	serverErrHandler.CheckFatal(err)
 
+	err = options.AddFlagValues("globalheaders", "--header", "GHFS_HEADER", []string{}, "custom headers, e.g. <key>:<value>")
+	serverErrHandler.CheckFatal(err)
+
 	err = options.AddFlags("globalupload", []string{"-U", "--global-upload"}, "", "allow upload files for all url paths")
 	serverErrHandler.CheckFatal(err)
 
@@ -252,6 +255,10 @@ func doParseCli() []*Param {
 		dirIndexes, _ := result.GetStrings("dirindexes")
 		param.DirIndexes = normalizeFilenames(dirIndexes)
 
+		// headers
+		globalHeaders, _ := result.GetStrings("globalheaders")
+		param.GlobalHeaders = entriesToHeaders(globalHeaders)
+
 		// certificate
 		key, _ := result.GetString("key")
 		cert, _ := result.GetString("cert")

src/param/main.go

@@ -14,9 +14,10 @@ type Param struct {
 	Root      string
 	EmptyRoot bool
 
-	DefaultSort string
-	DirIndexes  []string
-	Aliases     map[string]string
+	DefaultSort   string
+	DirIndexes    []string
+	Aliases       map[string]string
+	GlobalHeaders [][2]string
 
 	GlobalUpload bool
 	UploadUrls   []string

src/param/objUtil.go

@@ -29,6 +29,20 @@ func EntriesToUsers(entries []string) []*user {
 	return users
 }
 
+func entriesToHeaders(entries []string) [][2]string {
+	headers := make([][2]string, 0, len(entries))
+	for _, entry := range entries {
+		colonIndex := strings.IndexByte(entry, ':')
+		if colonIndex <= 0 || colonIndex == len(entry)-1 {
+			continue
+		}
+		key := entry[:colonIndex]
+		value := entry[colonIndex+1:]
+		headers = append(headers, [2]string{key, value})
+	}
+	return headers
+}
+
 func WildcardToRegexp(wildcards []string, found bool) (*regexp.Regexp, error) {
 	if !found || len(wildcards) == 0 {
 		return nil, nil

src/param/objUtil_test.go

@@ -31,3 +31,22 @@ func TestEntriesToUsers(t *testing.T) {
 		t.Fail()
 	}
 }
+
+func TestEntriesToHeaders(t *testing.T) {
+	entries := []string{
+		"",
+		"key1:",
+		":value2",
+		"key3:value3",
+	}
+	headers := entriesToHeaders(entries)
+	if len(headers) != 1 {
+		t.Fatal("headers count should be 1", headers)
+	}
+	if headers[0][0] != "key3" {
+		t.Error("key should be \"key3\"")
+	}
+	if headers[0][1] != "value3" {
+		t.Error("value should be \"value3\"")
+	}
+}

src/serverHandler/header.go

@@ -0,0 +1,13 @@
+package serverHandler
+
+import "net/http"
+
+func (h *handler) header(w http.ResponseWriter) {
+	if len(h.globalHeaders) == 0 {
+		return
+	}
+	header := w.Header()
+	for _, headerPair := range h.globalHeaders {
+		header.Set(headerPair[0], headerPair[1])
+	}
+}

src/serverHandler/main.go

@@ -20,6 +20,8 @@ type handler struct {
 	dirIndexes []string
 	aliases    aliases
 
+	globalHeaders [][2]string
+
 	globalUpload bool
 	uploadUrls   []string
 	uploadDirs   []string
@@ -86,6 +88,8 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	h.header(w)
+
 	if data.CanCors {
 		h.cors(w, r)
 	}
@@ -151,6 +155,8 @@ func NewHandler(
 		dirIndexes: p.DirIndexes,
 		aliases:    aliases,
 
+		globalHeaders: p.GlobalHeaders,
+
 		globalUpload: p.GlobalUpload,
 		uploadUrls:   p.UploadUrls,
 		uploadDirs:   p.UploadDirs,

test/case/023.custom.header.bash

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+source "$root"/lib.bash
+
+"$ghfs" -l 3003 -r "$fs"/vhost1 --header foo:bar &
+sleep 0.05 # wait server ready
+
+(curl_get_header http://127.0.0.1:3003/ | grep -q -i 'foo:\s*bar') ||
+	fail "Custom header not exists"
+
+(curl_get_header http://127.0.0.1:3003/file1.txt | grep -q -i 'foo:\s*bar') ||
+	fail "Custom header not exists"
+
+kill %1