feat(serverHandler): use unique Vary header for page and content

As content is also use gzip compress now, also add Vary header
for serving content and json.

Author: marjune163

src/serverHandler/aliasHandler.go

@@ -40,8 +40,7 @@ type aliasParam struct {
 	headersUrls []pathHeaders
 	headersDirs []pathHeaders
 
-	pageVary    string
-	contentVary string
+	vary string
 }
 
 type aliasHandler struct {
@@ -102,8 +101,7 @@ type aliasHandler struct {
 	corsUrls   []string
 	corsDirs   []string
 
-	pageVary    string
-	contentVary string
+	vary string
 
 	postMiddlewares []middleware.Middleware
 
@@ -280,8 +278,7 @@ func newAliasHandler(
 
 		fileServer: fileServer,
 
-		pageVary:    ap.pageVary,
-		contentVary: ap.contentVary,
+		vary: ap.vary,
 
 		postMiddlewares: p.PostMiddlewares,
 	}

src/serverHandler/content.go

@@ -15,10 +15,8 @@ var serveContent = func(h *aliasHandler, w http.ResponseWriter, r *http.Request,
 
 func (h *aliasHandler) content(w http.ResponseWriter, r *http.Request, data *responseData) {
 	header := w.Header()
+	header.Set("Vary", h.vary)
 	header.Set("X-Content-Type-Options", "nosniff")
-	if len(h.contentVary) > 0 {
-		header.Set("Vary", h.contentVary)
-	}
 	if data.IsDownload {
 		header.Set("Content-Disposition", "attachment; filename*=UTF-8''"+url.PathEscape(data.ItemName))
 	}

src/serverHandler/json.go

@@ -77,6 +77,7 @@ func getJsonData(data *responseData) *jsonResponseData {
 
 func (h *aliasHandler) json(w http.ResponseWriter, r *http.Request, data *responseData) {
 	header := w.Header()
+	header.Set("Vary", h.vary)
 	header.Set("Content-Type", "application/json; charset=utf-8")
 	if lacksHeader(header, "Cache-Control") {
 		header.Set("Cache-Control", "public, max-age=0")

src/serverHandler/page.go

@@ -64,14 +64,12 @@ func updateTranslation(r *http.Request, data *responseData) {
 
 func (h *aliasHandler) page(w http.ResponseWriter, r *http.Request, data *responseData) {
 	header := w.Header()
+	header.Set("Vary", h.vary)
 	header.Set("X-Content-Type-Options", "nosniff")
 	header.Set("Content-Type", "text/html; charset=utf-8")
 	if lacksHeader(header, "Cache-Control") {
 		header.Set("Cache-Control", "public, max-age=0")
 	}
-	if len(h.pageVary) > 0 {
-		header.Set("Vary", h.pageVary)
-	}
 
 	updateTranslation(r, data)
 

src/serverHandler/vhostHandler.go

@@ -7,7 +7,6 @@ import (
 	"mjpclab.dev/ghfs/src/tpl/theme"
 	"mjpclab.dev/ghfs/src/user"
 	"net/http"
-	"strings"
 )
 
 func NewVhostHandler(
@@ -60,15 +59,10 @@ func NewVhostHandler(
 	restrictAccess := hasRestrictAccess(p.GlobalRestrictAccess, restrictAccessUrls, restrictAccessDirs)
 
 	// `Vary` header
-	pageVarys := make([]string, 0, 3)
-	contentVarys := make([]string, 0, 2)
-	pageVarys = append(pageVarys, "accept-encoding")
+	vary := "accept-encoding"
 	if restrictAccess {
-		pageVarys = append(pageVarys, "referer", "origin")
-		contentVarys = append(contentVarys, "referer", "origin")
+		vary += ", referer, origin"
 	}
-	pageVary := strings.Join(pageVarys, ", ")
-	contentVary := strings.Join(contentVarys, ", ")
 
 	// alias param
 	ap := &aliasParam{
@@ -90,8 +84,7 @@ func NewVhostHandler(
 		headersUrls: newPathHeaders(p.HeadersUrls),
 		headersDirs: newPathHeaders(p.HeadersDirs),
 
-		pageVary:    pageVary,
-		contentVary: contentVary,
+		vary: vary,
 	}
 
 	muxHandler := newMultiplexHandler(p, ap)