feat(serverHandler): add auth username into upload log

Author: marjune163

src/serverHandler/log.go

@@ -17,16 +17,20 @@ func (h *handler) logRequest(r *http.Request) {
 	h.logger.LogAccess(payload)
 }
 
-func (h *handler) logUpload(filename, fsPath string, r *http.Request) {
+func (h *handler) logUpload(username, filename, fsPath string, r *http.Request) {
 	if !h.logger.CanLogAccess() {
 		return
 	}
 
 	buffer := bytes.NewBuffer(make([]byte, 0, LOG_BUF_SIZE))
 
 	buffer.WriteString(r.RemoteAddr)
-	buffer.WriteByte(' ')
-	buffer.WriteString("save upload file: ")
+	if len(username) > 0 {
+		buffer.WriteString(" (")
+		buffer.WriteString(username)
+		buffer.WriteByte(')')
+	}
+	buffer.WriteString(" upload: ")
 	buffer.WriteString(filename)
 	buffer.WriteString(" -> ")
 	buffer.WriteString(fsPath)
@@ -42,8 +46,7 @@ func (h *handler) logArchive(filename, relPath string, r *http.Request) {
 	buffer := bytes.NewBuffer(make([]byte, 0, LOG_BUF_SIZE))
 
 	buffer.WriteString(r.RemoteAddr)
-	buffer.WriteByte(' ')
-	buffer.WriteString("archive file: \"")
+	buffer.WriteString(" archive file: \"")
 	buffer.WriteString(filename)
 	buffer.WriteString("\" <- ")
 	buffer.WriteString(relPath)

src/serverHandler/mutate.go

@@ -11,7 +11,7 @@ func (h *handler) mutate(w http.ResponseWriter, r *http.Request, data *responseD
 	switch {
 	case data.IsUpload:
 		if data.CanUpload && r.Method == http.MethodPost {
-			success = h.saveUploadFiles(h.root+data.handlerReqPath, data.CanMkdir, data.CanDelete, data.AliasSubItems, r)
+			success = h.saveUploadFiles(data.AuthUserName, h.root+data.handlerReqPath, data.CanMkdir, data.CanDelete, data.AliasSubItems, r)
 		}
 	case data.IsMkdir:
 		if data.CanMkdir && !h.errHandler.LogError(r.ParseForm()) {

src/serverHandler/upload.go

@@ -53,7 +53,7 @@ func getPartFilePath(part *multipart.Part) string {
 	return params["filename"]
 }
 
-func (h *handler) saveUploadFiles(fsPrefix string, createDir, overwriteExists bool, aliasSubItems []os.FileInfo, r *http.Request) bool {
+func (h *handler) saveUploadFiles(authUserName, fsPrefix string, createDir, overwriteExists bool, aliasSubItems []os.FileInfo, r *http.Request) bool {
 	errs := []error{}
 
 	reader, err := r.MultipartReader()
@@ -162,7 +162,7 @@ func (h *handler) saveUploadFiles(fsPrefix string, createDir, overwriteExists bo
 		}
 
 		fsPath := path.Clean(filePrefix + "/" + fsFilename)
-		go h.logUpload(filename, fsPath, r)
+		go h.logUpload(authUserName, filename, fsPath, r)
 		file, err := os.OpenFile(fsPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
 		if err != nil {
 			errs = append(errs, err)