refactor(serverHandler): embed alias into aliasHandler

- aliasHandler can now use methods from alias
- removed aliasHandler.root, use .alias.fs instead
- removed aliasHandler.aliasPrefix, use .alias.url instead
- add aliases.filterSuccssor() method
- add prefixFilter type

Author: marjune163

src/serverHandler/aliasHandler.go

@@ -14,21 +14,18 @@ import (
 
 var defaultHandler = http.NotFoundHandler()
 
-type pathStrings struct {
-	path    string
-	strings []string
-}
+type prefixFilter func(whole, prefix string) bool
 
 type aliasHandler struct {
-	root         string
+	alias
+
 	emptyRoot    bool
 	autoDirSlash int
 	hsts         bool
 	hstsMaxAge   string
 	toHttps      bool
 	toHttpsPort  string // with prefix ":"
 	defaultSort  string
-	aliasPrefix  string
 
 	users  *user.List
 	theme  theme.Theme
@@ -186,33 +183,25 @@ func newAliasHandler(
 	vhostCtx *vhostContext,
 	currentAlias alias,
 	allAliases aliases,
-) http.Handler {
+) *aliasHandler {
 	emptyRoot := p.EmptyRoot && currentAlias.url == "/"
 
-	aliases := aliases{}
-	for _, alias := range allAliases {
-		if alias.isSuccessorOf(currentAlias.url) {
-			aliases = append(aliases, alias)
-		}
-	}
-
 	h := &aliasHandler{
-		root:         currentAlias.fs,
+		alias:        currentAlias,
 		emptyRoot:    emptyRoot,
 		autoDirSlash: p.AutoDirSlash,
 		hsts:         p.Hsts,
 		hstsMaxAge:   strconv.Itoa(p.HstsMaxAge),
 		toHttps:      p.ToHttps,
 		toHttpsPort:  p.ToHttpsPort,
 		defaultSort:  p.DefaultSort,
-		aliasPrefix:  currentAlias.url,
 
 		users:  vhostCtx.users,
 		theme:  vhostCtx.theme,
 		logger: vhostCtx.logger,
 
 		dirIndexes: p.DirIndexes,
-		aliases:    aliases,
+		aliases:    allAliases.filterSuccessor(currentAlias.url),
 
 		globalAuth: p.GlobalAuth,
 		authUrls:   p.AuthUrls,

src/serverHandler/aliases.go

@@ -17,22 +17,34 @@ func newAliases(entries [][2]string) aliases {
 	return aliases
 }
 
-func (aliases aliases) byUrlPath(urlPath string) (aliasItem alias, ok bool) {
-	for _, alias := range aliases {
+func (list aliases) byUrlPath(urlPath string) (aliasItem alias, ok bool) {
+	for _, alias := range list {
 		if alias.isMatch(urlPath) {
 			return alias, true
 		}
 	}
 	return alias{}, false
 }
 
-func (aliases aliases) Len() int {
-	return len(aliases)
+func (list aliases) filterSuccessor(url string) aliases {
+	var result aliases
+
+	for _, a := range list {
+		if a.isSuccessorOf(url) {
+			result = append(result, a)
+		}
+	}
+
+	return result
+}
+
+func (list aliases) Len() int {
+	return len(list)
 }
 
-func (aliases aliases) Less(i, j int) bool {
-	iLen := len(aliases[i].url)
-	jLen := len(aliases[j].url)
+func (list aliases) Less(i, j int) bool {
+	iLen := len(list[i].url)
+	jLen := len(list[j].url)
 	if iLen != jLen {
 		// longer is prior
 		return iLen > jLen
@@ -41,6 +53,6 @@ func (aliases aliases) Less(i, j int) bool {
 	return i > j
 }
 
-func (aliases aliases) Swap(i, j int) {
-	aliases[i], aliases[j] = aliases[j], aliases[i]
+func (list aliases) Swap(i, j int) {
+	list[i], list[j] = list[j], list[i]
 }

src/serverHandler/archive.go

@@ -158,7 +158,7 @@ func (h *aliasHandler) archive(
 	h.visitTreeNode(
 		r,
 		session.vhostReqPath,
-		path.Clean(h.root+session.aliasReqPath),
+		path.Clean(h.fs+session.aliasReqPath),
 		"",
 		data.Item != nil, // not empty root
 		selections,

src/serverHandler/middleware.go

@@ -15,7 +15,7 @@ func (h *aliasHandler) applyMiddlewares(mids []middleware.Middleware, w http.Res
 		VhostReqPath:  session.vhostReqPath,
 		AliasReqPath:  session.aliasReqPath,
 		AliasFsPath:   session.fsPath,
-		AliasFsRoot:   h.root,
+		AliasFsRoot:   h.fs,
 
 		WantJson: session.wantJson,
 

src/serverHandler/multiplexHandler.go

@@ -5,17 +5,12 @@ import (
 	"net/http"
 )
 
-type aliasWithHandler struct {
-	alias   alias
-	handler http.Handler
-}
-
-type multiplexHandler []aliasWithHandler
+type multiplexHandler []*aliasHandler
 
 func (mux multiplexHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	for _, ah := range mux {
-		if ah.alias.isMatch(r.URL.Path) || ah.alias.isPredecessorOf(r.URL.Path) {
-			ah.handler.ServeHTTP(w, r)
+	for _, h := range mux {
+		if h.isMatch(r.URL.Path) || h.isPredecessorOf(r.URL.Path) {
+			h.ServeHTTP(w, r)
 			return
 		}
 	}
@@ -32,21 +27,15 @@ func newMultiplexHandler(
 	}
 
 	aliases := newAliases(p.Aliases)
-
 	if len(aliases) == 1 {
-		alias, hasRootAlias := aliases.byUrlPath("/")
-		if hasRootAlias {
+		if alias, hasRootAlias := aliases.byUrlPath("/"); hasRootAlias {
 			return newAliasHandler(p, vhostCtx, alias, aliases)
 		}
 	}
 
-	aliasWithHandlers := make([]aliasWithHandler, len(aliases))
+	mux := make(multiplexHandler, len(aliases))
 	for i, alias := range aliases {
-		aliasWithHandlers[i] = aliasWithHandler{
-			alias:   alias,
-			handler: newAliasHandler(p, vhostCtx, alias, aliases),
-		}
+		mux[i] = newAliasHandler(p, vhostCtx, alias, aliases)
 	}
-
-	return multiplexHandler(aliasWithHandlers)
+	return mux
 }

src/serverHandler/mutate.go

@@ -16,15 +16,15 @@ func (h *aliasHandler) mutate(w http.ResponseWriter, r *http.Request, session *s
 	switch {
 	case data.IsUpload:
 		if data.CanUpload {
-			success = h.saveUploadFiles(session.authUserName, h.root+session.aliasReqPath, data.CanMkdir, data.CanDelete, data.AliasSubItems, r)
+			success = h.saveUploadFiles(session.authUserName, h.fs+session.aliasReqPath, data.CanMkdir, data.CanDelete, data.AliasSubItems, r)
 		}
 	case data.IsMkdir:
 		if data.CanMkdir && !h.logError(r.ParseForm()) {
-			success = h.mkdirs(session.authUserName, h.root+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
+			success = h.mkdirs(session.authUserName, h.fs+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
 		}
 	case data.IsDelete:
 		if data.CanDelete && !h.logError(r.ParseForm()) {
-			success = h.deleteItems(session.authUserName, h.root+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
+			success = h.deleteItems(session.authUserName, h.fs+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
 		}
 	}
 

src/serverHandler/sessionData.go

@@ -324,8 +324,8 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 	vhostReqPath := r.URL.Path
 	tailSlash := vhostReqPath[len(vhostReqPath)-1] == '/'
 
-	reqPath := util.CleanUrlPath(vhostReqPath[len(h.aliasPrefix):])
-	fsPath := filepath.Clean(h.root + reqPath)
+	reqPath := util.CleanUrlPath(vhostReqPath[len(h.url):])
+	fsPath := filepath.Clean(h.fs + reqPath)
 
 	rawQuery := r.URL.RawQuery