feat: show logged in username

Author: marjune163

src/serverHandler/archive.go

@@ -53,7 +53,7 @@ func (h *aliasHandler) visitTreeNode(
 	archiveCallback archiveCallback,
 ) {
 	needAuth, _ := h.needAuth("", urlPath, fsPath)
-	userId, _, err := h.verifyAuth(r, needAuth, urlPath, fsPath)
+	userId, _, err := h.verifyAuth(r, urlPath, fsPath)
 	if needAuth && err != nil {
 		return
 	}

src/serverHandler/auth.go

@@ -33,7 +33,7 @@ func (h *aliasHandler) notifyAuth(w http.ResponseWriter) {
 	w.Header().Set("WWW-Authenticate", "Basic realm=\"files\"")
 }
 
-func (h *aliasHandler) verifyAuth(r *http.Request, needAuth bool, vhostReqPath, reqFsPath string) (authUserId int, authUserName string, err error) {
+func (h *aliasHandler) verifyAuth(r *http.Request, vhostReqPath, reqFsPath string) (authUserId int, authUserName string, err error) {
 	inputUser, inputPass, hasAuthReq := r.BasicAuth()
 
 	if hasAuthReq {
@@ -46,18 +46,12 @@ func (h *aliasHandler) verifyAuth(r *http.Request, needAuth bool, vhostReqPath,
 		if success {
 			return userid, username, nil
 		}
-	}
-
-	if !needAuth {
-		return -1, "", nil
-	}
-
-	if !hasAuthReq {
-		err = errors.New(r.RemoteAddr + " missing auth info")
-	} else {
 		err = errors.New(r.RemoteAddr + " auth failed")
+	} else {
+		err = errors.New(r.RemoteAddr + " missing auth info")
 	}
 
+	authUserId = -1
 	return
 }
 

src/serverHandler/middleware.go

@@ -22,7 +22,7 @@ func (h *aliasHandler) applyMiddlewares(mids []middleware.Middleware, w http.Res
 		AllowAccess: session.allowAccess,
 
 		NeedAuth:     session.needAuth,
-		AuthUserName: session.authUserName,
+		AuthUserName: data.AuthUserName,
 		AuthSuccess:  session.authSuccess,
 
 		CanUpload:  &data.CanUpload,

src/serverHandler/mutate.go

@@ -15,21 +15,21 @@ 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.fs+session.aliasReqPath, data.CanMkdir, data.CanDelete, data.AliasSubItems, r)
+			success = h.saveUploadFiles(data.AuthUserName, h.fs+session.aliasReqPath, data.CanMkdir, data.CanDelete, data.AliasSubItems, r)
 		} else {
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 	case data.IsMkdir:
 		if data.CanMkdir && !h.logError(r.ParseForm()) {
-			success = h.mkdirs(session.authUserName, h.fs+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
+			success = h.mkdirs(data.AuthUserName, h.fs+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
 		} else {
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 	case data.IsDelete:
 		if data.CanDelete && !h.logError(r.ParseForm()) {
-			success = h.deleteItems(session.authUserName, h.fs+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
+			success = h.deleteItems(data.AuthUserName, h.fs+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
 		} else {
 			w.WriteHeader(http.StatusBadRequest)
 			return

src/serverHandler/sessionData.go

@@ -41,11 +41,10 @@ type sessionContext struct {
 
 	allowAccess bool
 
-	needAuth     bool
-	requestAuth  bool
-	authUserId   int
-	authUserName string
-	authSuccess  bool
+	needAuth    bool
+	requestAuth bool
+	authUserId  int
+	authSuccess bool
 
 	redirectAction redirectAction
 	vary           string
@@ -59,6 +58,8 @@ type sessionContext struct {
 }
 
 type responseData struct {
+	AuthUserName string
+
 	IsDownload     bool
 	IsDownloadFile bool
 	IsUpload       bool
@@ -336,13 +337,11 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 	status := http.StatusOK
 
 	needAuth, requestAuth := h.needAuth(rawQuery, vhostReqPath, fsPath)
-	authUserId, authUserName, _authErr := h.verifyAuth(r, needAuth, vhostReqPath, fsPath)
-	authSuccess := _authErr == nil
-	if needAuth && !authSuccess {
-		errs = append(errs, _authErr)
-	}
+	authUserId, authUserName, _authErr := h.verifyAuth(r, vhostReqPath, fsPath)
+	authSuccess := !needAuth || _authErr == nil
 	if !authSuccess {
 		status = http.StatusUnauthorized
+		errs = append(errs, _authErr)
 	}
 
 	headers := h.getHeaders(vhostReqPath, fsPath, authSuccess)
@@ -477,11 +476,10 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 
 		allowAccess: allowAccess,
 
-		needAuth:     needAuth,
-		requestAuth:  requestAuth,
-		authUserId:   authUserId,
-		authUserName: authUserName,
-		authSuccess:  authSuccess,
+		needAuth:    needAuth,
+		requestAuth: requestAuth,
+		authUserId:  authUserId,
+		authSuccess: authSuccess,
 
 		redirectAction: redirectAction,
 		vary:           vary,
@@ -494,6 +492,8 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 		errors: errs,
 	}
 	data = &responseData{
+		AuthUserName: authUserName,
+
 		IsDownload:     isDownload,
 		IsDownloadFile: isDownloadFile,
 		IsUpload:       isUpload,

src/tpl/defaultTheme/frontend/index.html

@@ -22,6 +22,8 @@
 </ol>
 {{if .LoginAvail}}
 <a class="login" href="{{if ne .Status 401}}{{.RootRelPath}}?auth={{.Path}}{{$contextQueryString}}{{end}}">{{.Trans.LoginLabel}}</a>
+{{else if .AuthUserName}}
+<span class="login">[{{.AuthUserName}}]</span>
 {{end}}
 {{if .CanUpload}}
 <div class="upload-status">