feat(serverHandler): add auth username into mutate log

Author: marjune163

src/serverHandler/delete.go

@@ -2,10 +2,11 @@ package serverHandler
 
 import (
 	"errors"
+	"net/http"
 	"os"
 )
 
-func (h *handler) deleteItems(fsPrefix string, files []string, aliasSubItems []os.FileInfo) bool {
+func (h *handler) deleteItems(authUserName, fsPrefix string, files []string, aliasSubItems []os.FileInfo, r *http.Request) bool {
 	errs := []error{}
 
 	for _, inputFilename := range files {
@@ -22,7 +23,9 @@ func (h *handler) deleteItems(fsPrefix string, files []string, aliasSubItems []o
 		if containsItem(aliasSubItems, filename) {
 			continue
 		}
-		err := os.RemoveAll(fsPrefix + "/" + filename)
+		fsPath := fsPrefix + "/" + filename
+		h.logMutate(authUserName, "delete", fsPath, r)
+		err := os.RemoveAll(fsPath)
 		if err != nil {
 			errs = append(errs, err)
 		}

src/serverHandler/log.go

@@ -17,6 +17,27 @@ func (h *handler) logRequest(r *http.Request) {
 	h.logger.LogAccess(payload)
 }
 
+func (h *handler) logMutate(username, action, detail string, r *http.Request) {
+	if !h.logger.CanLogAccess() {
+		return
+	}
+
+	buffer := bytes.NewBuffer(make([]byte, 0, LOG_BUF_SIZE))
+
+	buffer.WriteString(r.RemoteAddr)
+	if len(username) > 0 {
+		buffer.WriteString(" (")
+		buffer.WriteString(username)
+		buffer.WriteByte(')')
+	}
+	buffer.WriteByte(' ')
+	buffer.WriteString(action)
+	buffer.WriteString(": ")
+	buffer.WriteString(detail)
+
+	h.logger.LogAccess(buffer.Bytes())
+}
+
 func (h *handler) logUpload(username, filename, fsPath string, r *http.Request) {
 	if !h.logger.CanLogAccess() {
 		return

src/serverHandler/mkdir.go

@@ -2,11 +2,12 @@ package serverHandler
 
 import (
 	"errors"
+	"net/http"
 	"os"
 	"strings"
 )
 
-func (h *handler) mkdirs(fsPrefix string, files []string, aliasSubItems []os.FileInfo) bool {
+func (h *handler) mkdirs(authUserName, fsPrefix string, files []string, aliasSubItems []os.FileInfo, r *http.Request) bool {
 	errs := []error{}
 
 	for _, inputFilename := range files {
@@ -29,7 +30,9 @@ func (h *handler) mkdirs(fsPrefix string, files []string, aliasSubItems []os.Fil
 			errs = append(errs, errors.New("mkdir: ignore path shadowed by alias "+filename))
 			continue
 		}
-		err := os.MkdirAll(fsPrefix+"/"+filename, 0755)
+		fsPath := fsPrefix + "/" + filename
+		h.logMutate(authUserName, "mkdir", fsPath, r)
+		err := os.MkdirAll(fsPath, 0755)
 		if err != nil {
 			errs = append(errs, err)
 		}

src/serverHandler/mutate.go

@@ -15,11 +15,11 @@ func (h *handler) mutate(w http.ResponseWriter, r *http.Request, data *responseD
 		}
 	case data.IsMkdir:
 		if data.CanMkdir && !h.errHandler.LogError(r.ParseForm()) {
-			success = h.mkdirs(h.root+data.handlerReqPath, r.Form["name"], data.AliasSubItems)
+			success = h.mkdirs(data.AuthUserName, h.root+data.handlerReqPath, r.Form["name"], data.AliasSubItems, r)
 		}
 	case data.IsDelete:
 		if data.CanDelete && !h.errHandler.LogError(r.ParseForm()) {
-			success = h.deleteItems(h.root+data.handlerReqPath, r.Form["name"], data.AliasSubItems)
+			success = h.deleteItems(data.AuthUserName, h.root+data.handlerReqPath, r.Form["name"], data.AliasSubItems, r)
 		}
 	}