feat(serverHandler): add in-middleware

Author: marjune163

src/middleware/context.go

@@ -2,7 +2,7 @@ package middleware
 
 import (
 	"mjpclab.dev/ghfs/src/serverLog"
-	"os"
+	"mjpclab.dev/ghfs/src/user"
 )
 
 type Context struct {
@@ -12,19 +12,22 @@ type Context struct {
 	AliasFsPath   string
 	AliasFsRoot   string
 
-	NeedAuth     bool
-	AuthUserName string
-	AuthSuccess  bool
+	WantJson bool
 
 	RestrictAccess bool
 	AllowAccess    bool
 
-	WantJson bool
+	NeedAuth     bool
+	AuthUserName string
+	AuthSuccess  bool
 
-	Status int
+	CanUpload  *bool
+	CanMkdir   *bool
+	CanDelete  *bool
+	CanArchive *bool
 
-	Item     os.FileInfo
-	SubItems []os.FileInfo
+	Status *int
 
+	Users  *user.List
 	Logger *serverLog.Logger
 }

src/param/main.go

@@ -88,6 +88,7 @@ type Param struct {
 	ErrorLog  string
 
 	PreMiddlewares  []middleware.Middleware
+	InMiddlewares   []middleware.Middleware
 	PostMiddlewares []middleware.Middleware
 }
 

src/serverHandler/aliasHandler.go

@@ -30,7 +30,7 @@ type aliasHandler struct {
 	defaultSort   string
 	aliasPrefix   string
 
-	users  user.List
+	users  *user.List
 	theme  theme.Theme
 	logger *serverLog.Logger
 
@@ -79,6 +79,7 @@ type aliasHandler struct {
 
 	vary string
 
+	inMiddlewares   []middleware.Middleware
 	postMiddlewares []middleware.Middleware
 }
 
@@ -109,8 +110,12 @@ func (h *aliasHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		defer file.Close()
 	}
 
+	if h.applyMiddlewares(h.inMiddlewares, w, r, data, fsPath) {
+		return
+	}
+
 	if !data.AllowAccess {
-		if !h.postMiddleware(w, r, data, fsPath) {
+		if !h.applyMiddlewares(h.postMiddlewares, w, r, data, fsPath) {
 			h.accessRestricted(w, data.Status)
 		}
 		return
@@ -158,7 +163,7 @@ func (h *aliasHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	if h.postMiddleware(w, r, data, fsPath) {
+	if h.applyMiddlewares(h.postMiddlewares, w, r, data, fsPath) {
 		return
 	}
 
@@ -248,6 +253,7 @@ func newAliasHandler(
 
 		vary: vhostCtx.vary,
 
+		inMiddlewares:   p.InMiddlewares,
 		postMiddlewares: p.PostMiddlewares,
 	}
 	return h

src/serverHandler/middleware.go

@@ -5,9 +5,9 @@ import (
 	"net/http"
 )
 
-func (h *aliasHandler) postMiddleware(w http.ResponseWriter, r *http.Request, data *responseData, fsPath string) (processed bool) {
-	if len(h.postMiddlewares) == 0 {
-		return false
+func (h *aliasHandler) applyMiddlewares(mids []middleware.Middleware, w http.ResponseWriter, r *http.Request, data *responseData, fsPath string) (processed bool) {
+	if len(mids) == 0 {
+		return
 	}
 
 	context := &middleware.Context{
@@ -17,25 +17,28 @@ func (h *aliasHandler) postMiddleware(w http.ResponseWriter, r *http.Request, da
 		AliasFsPath:   fsPath,
 		AliasFsRoot:   h.root,
 
-		NeedAuth:     data.NeedAuth,
-		AuthUserName: data.AuthUserName,
-		AuthSuccess:  data.AuthSuccess,
+		WantJson: data.wantJson,
 
 		RestrictAccess: data.RestrictAccess,
 		AllowAccess:    data.AllowAccess,
 
-		WantJson: data.wantJson,
+		NeedAuth:     data.NeedAuth,
+		AuthUserName: data.AuthUserName,
+		AuthSuccess:  data.AuthSuccess,
 
-		Status: data.Status,
+		CanUpload:  &data.CanUpload,
+		CanMkdir:   &data.CanMkdir,
+		CanDelete:  &data.CanDelete,
+		CanArchive: &data.CanArchive,
 
-		Item:     data.Item,
-		SubItems: data.SubItems,
+		Status: &data.Status,
 
+		Users:  h.users,
 		Logger: h.logger,
 	}
 
-	for i := range h.postMiddlewares {
-		result := h.postMiddlewares[i](w, r, context)
+	for i := range mids {
+		result := mids[i](w, r, context)
 		if result == middleware.Outputted {
 			return true
 		} else if result == middleware.SkipRests {

src/serverHandler/vhostHandler.go

@@ -11,7 +11,7 @@ import (
 )
 
 type vhostContext struct {
-	users  user.List
+	users  *user.List
 	theme  theme.Theme
 	logger *serverLog.Logger
 
@@ -89,7 +89,7 @@ func NewVhostHandler(
 
 	// alias param
 	vhostCtx := &vhostContext{
-		users:  *users,
+		users:  users,
 		theme:  theme,
 		logger: logger,
 

src/user/list.go

@@ -14,7 +14,7 @@ func (list *List) Len() int {
 	return len(list.users)
 }
 
-func (list *List) findIndex(username string) int {
+func (list *List) FindIndex(username string) int {
 	for i := range list.users {
 		if list.namesEqualFunc(list.users[i].getName(), username) {
 			return i
@@ -25,7 +25,7 @@ func (list *List) findIndex(username string) int {
 
 func (list *List) addUser(user user) error {
 	username := user.getName()
-	index := list.findIndex(username)
+	index := list.FindIndex(username)
 	if index < 0 {
 		list.users = append(list.users, user)
 		return nil
@@ -87,7 +87,7 @@ func (list *List) AddSha512(username, password string) error {
 }
 
 func (list *List) Auth(username, password string) bool {
-	index := list.findIndex(username)
+	index := list.FindIndex(username)
 	if index < 0 {
 		return false
 	}