refactor: produce status in response data

Author: marjune163

src/serverHandler/aliasHandler.go

@@ -145,12 +145,12 @@ func (h *aliasHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		h.needAuth(w, r)
 	}
 	if !data.AuthSuccess {
-		h.authFailed(w)
+		h.authFailed(w, data)
 		return
 	}
 
 	if !data.AllowAccess {
-		restrictAccess(w)
+		restrictAccess(w, data)
 		return
 	}
 

src/serverHandler/auth.go

@@ -25,6 +25,6 @@ func (h *aliasHandler) verifyAuth(r *http.Request) (username string, success boo
 	return
 }
 
-func (h *aliasHandler) authFailed(w http.ResponseWriter) {
-	w.WriteHeader(http.StatusUnauthorized)
+func (h *aliasHandler) authFailed(w http.ResponseWriter, data *responseData) {
+	w.WriteHeader(data.Status)
 }

src/serverHandler/responseData.go

@@ -302,6 +302,8 @@ func (h *aliasHandler) getResponseData(r *http.Request) (data *responseData, fsP
 	reqPath := util.CleanUrlPath(rawReqPath[len(h.aliasPrefix):])
 	reqFsPath, _ := util.NormalizeFsPath(h.root + reqPath)
 
+	status := http.StatusOK
+
 	needAuth := h.getNeedAuth(rawReqPath, reqFsPath)
 	authUserName := ""
 	authSuccess := true
@@ -311,6 +313,9 @@ func (h *aliasHandler) getResponseData(r *http.Request) (data *responseData, fsP
 		if _authErr != nil {
 			errs = append(errs, _authErr)
 		}
+		if !authSuccess {
+			status = http.StatusUnauthorized
+		}
 	}
 
 	headers := h.getHeaders(rawReqPath, reqFsPath, authSuccess)
@@ -336,7 +341,6 @@ func (h *aliasHandler) getResponseData(r *http.Request) (data *responseData, fsP
 	}
 	wantJson := strings.HasPrefix(rawQuery, "json") || strings.Contains(rawQuery, "&json")
 
-	status := http.StatusOK
 	isRoot := rawReqPath == "/"
 
 	currDirRelPath := getCurrDirRelPath(rawReqPath, prefixReqPath)
@@ -371,6 +375,9 @@ func (h *aliasHandler) getResponseData(r *http.Request) (data *responseData, fsP
 	}
 
 	allowAccess := h.isAllowAccess(r, rawReqPath, reqFsPath, file, item)
+	if !allowAccess {
+		status = http.StatusForbidden
+	}
 
 	itemName := getItemName(item, r)
 

src/serverHandler/restrictAccess.go

@@ -78,7 +78,6 @@ func (h *aliasHandler) isAllowAccess(r *http.Request, reqUrlPath, reqFsPath stri
 	return false
 }
 
-func restrictAccess(w http.ResponseWriter) {
-	w.WriteHeader(http.StatusForbidden)
-	w.Write([]byte("403 Forbidden"))
+func restrictAccess(w http.ResponseWriter, data *responseData) {
+	w.WriteHeader(data.Status)
 }