refactor(serverHandler): simplify vhostContext

mjpclab · May 12, 2024 · caa3ecf · caa3ecf
1 parent faf4fb0
commit caa3ecf
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 52 deletions.
diff --git a/src/serverHandler/aliasHandler.go b/src/serverHandler/aliasHandler.go
@@ -86,8 +86,6 @@ type aliasHandler struct {
 	headersUrls   pathHeadersList
 	headersDirs   pathHeadersList
 
-	vary string
-
 	postMiddlewares []middleware.Middleware
 }
 
@@ -177,7 +175,7 @@ func (h *aliasHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	// final process
 	if session.wantJson {
-		h.json(w, r, data)
+		h.json(w, r, session, data)
 	} else if shouldServeAsContent(session.file, data.Item) {
 		h.content(w, r, session, data)
 	} else {
@@ -272,8 +270,6 @@ func newAliasHandler(
 		hideDirs:  vhostCtx.hideDirs,
 		hideFiles: vhostCtx.hideFiles,
 
-		vary: vhostCtx.vary,
-
 		postMiddlewares: p.PostMiddlewares,
 	}
 	return h

diff --git a/src/serverHandler/json.go b/src/serverHandler/json.go
@@ -72,9 +72,9 @@ func getJsonData(data *responseData) *jsonResponseData {
 	}
 }
 
-func (h *aliasHandler) json(w http.ResponseWriter, r *http.Request, data *responseData) {
+func (h *aliasHandler) json(w http.ResponseWriter, r *http.Request, session *sessionContext, data *responseData) {
 	header := w.Header()
-	header.Set("Vary", h.vary)
+	header.Set("Vary", session.vary)
 	header.Set("X-Content-Type-Options", "nosniff")
 	header.Set("Content-Type", "application/json; charset=utf-8")
 	if lacksHeader(header, "Cache-Control") {

diff --git a/src/serverHandler/sessionData.go b/src/serverHandler/sessionData.go
@@ -411,7 +411,7 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 	}
 
 	restrictAccess, allowAccess := h.isAllowAccess(r, vhostReqPath, fsPath, file, item)
-	vary := h.vary
+	vary := "accept-encoding"
 	if restrictAccess {
 		vary += ", referer, origin"
 	}

diff --git a/src/serverHandler/vhostHandler.go b/src/serverHandler/vhostHandler.go
@@ -11,17 +11,10 @@ import (
 )
 
 type vhostContext struct {
-	users  *user.List
-	theme  theme.Theme
 	logger *serverLog.Logger
+	theme  theme.Theme
 
-	shows     *regexp.Regexp
-	showDirs  *regexp.Regexp
-	showFiles *regexp.Regexp
-	hides     *regexp.Regexp
-	hideDirs  *regexp.Regexp
-	hideFiles *regexp.Regexp
-
+	users           *user.List
 	authUrlsUsers   pathIntsList
 	authDirsUsers   pathIntsList
 	indexUrlsUsers  pathIntsList
@@ -33,13 +26,18 @@ type vhostContext struct {
 	deleteUrlsUsers pathIntsList
 	deleteDirsUsers pathIntsList
 
+	shows     *regexp.Regexp
+	showDirs  *regexp.Regexp
+	showFiles *regexp.Regexp
+	hides     *regexp.Regexp
+	hideDirs  *regexp.Regexp
+	hideFiles *regexp.Regexp
+
 	restrictAccessUrls pathStringsList
 	restrictAccessDirs pathStringsList
 
 	headersUrls pathHeadersList
 	headersDirs pathHeadersList
-
-	vary string
 }
 
 func NewVhostHandler(
@@ -86,41 +84,22 @@ func NewVhostHandler(
 		return nil, errs
 	}
 
-	// auth/index/upload/mkdir/delete urls/dirs users
-	authUrlsUsers := pathUsernamesToPathUids(users, p.AuthUrlsUsers)
-	authDirsUsers := pathUsernamesToPathUids(users, p.AuthDirsUsers)
-	indexUrlsUsers := pathUsernamesToPathUids(users, p.IndexUrlsUsers)
-	indexDirsUsers := pathUsernamesToPathUids(users, p.IndexDirsUsers)
-	uploadUrlsUsers := pathUsernamesToPathUids(users, p.UploadUrlsUsers)
-	uploadDirsUsers := pathUsernamesToPathUids(users, p.UploadDirsUsers)
-	mkdirUrlsUsers := pathUsernamesToPathUids(users, p.MkdirUrlsUsers)
-	mkdirDirsUsers := pathUsernamesToPathUids(users, p.MkdirDirsUsers)
-	deleteUrlsUsers := pathUsernamesToPathUids(users, p.DeleteUrlsUsers)
-	deleteDirsUsers := pathUsernamesToPathUids(users, p.DeleteDirsUsers)
-
-	// restrict access
-	restrictAccessUrls := newRestrictAccesses(p.RestrictAccessUrls)
-	restrictAccessDirs := newRestrictAccesses(p.RestrictAccessDirs)
-
-	// `Vary` header
-	vary := "accept-encoding"
-
 	// alias param
 	vhostCtx := &vhostContext{
 		theme:  theme,
 		logger: logger,
 
 		users:           users,
-		authUrlsUsers:   authUrlsUsers,
-		authDirsUsers:   authDirsUsers,
-		indexUrlsUsers:  indexUrlsUsers,
-		indexDirsUsers:  indexDirsUsers,
-		uploadUrlsUsers: uploadUrlsUsers,
-		uploadDirsUsers: uploadDirsUsers,
-		mkdirUrlsUsers:  mkdirUrlsUsers,
-		mkdirDirsUsers:  mkdirDirsUsers,
-		deleteUrlsUsers: deleteUrlsUsers,
-		deleteDirsUsers: deleteDirsUsers,
+		authUrlsUsers:   pathUsernamesToPathUids(users, p.AuthUrlsUsers),
+		authDirsUsers:   pathUsernamesToPathUids(users, p.AuthDirsUsers),
+		indexUrlsUsers:  pathUsernamesToPathUids(users, p.IndexUrlsUsers),
+		indexDirsUsers:  pathUsernamesToPathUids(users, p.IndexDirsUsers),
+		uploadUrlsUsers: pathUsernamesToPathUids(users, p.UploadUrlsUsers),
+		uploadDirsUsers: pathUsernamesToPathUids(users, p.UploadDirsUsers),
+		mkdirUrlsUsers:  pathUsernamesToPathUids(users, p.MkdirUrlsUsers),
+		mkdirDirsUsers:  pathUsernamesToPathUids(users, p.MkdirDirsUsers),
+		deleteUrlsUsers: pathUsernamesToPathUids(users, p.DeleteUrlsUsers),
+		deleteDirsUsers: pathUsernamesToPathUids(users, p.DeleteDirsUsers),
 
 		shows:     shows,
 		showDirs:  showDirs,
@@ -129,13 +108,11 @@ func NewVhostHandler(
 		hideDirs:  hideDirs,
 		hideFiles: hideFiles,
 
-		restrictAccessUrls: restrictAccessUrls,
-		restrictAccessDirs: restrictAccessDirs,
+		restrictAccessUrls: newRestrictAccesses(p.RestrictAccessUrls),
+		restrictAccessDirs: newRestrictAccesses(p.RestrictAccessDirs),
 
 		headersUrls: newPathHeaders(p.HeadersUrls),
 		headersDirs: newPathHeaders(p.HeadersDirs),
-
-		vary: vary,
 	}
 
 	handler = newMultiplexHandler(p, vhostCtx)