MB-31788: Fix the return message when no creds are specified in HTTP …

…request Change-Id: I4bc802648135a9520bc9535364bf0a3e4e2505c3
couchbase · Jan 15, 2021 · f5ed7ac · f5ed7ac
1 parent f32cba0
commit f5ed7ac
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 15 deletions.
diff --git a/secondary/indexer/stats_manager.go b/secondary/indexer/stats_manager.go
@@ -2514,8 +2514,12 @@ func (s *statsManager) handleStatsReq(w http.ResponseWriter, r *http.Request) {
 		}
 	}()
 
-	_, valid, _ := common.IsAuthValid(r)
-	if !valid {
+	_, valid, err := common.IsAuthValid(r)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte(err.Error() + "\n"))
+		return
+	} else if !valid {
 		w.WriteHeader(401)
 		w.Write([]byte("401 Unauthorized"))
 		return
@@ -2590,8 +2594,12 @@ func (s *statsManager) handleStatsReq(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s *statsManager) handleMetrics(w http.ResponseWriter, r *http.Request) {
-	_, valid, _ := common.IsAuthValid(r)
-	if !valid {
+	_, valid, err := common.IsAuthValid(r)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte(err.Error() + "\n"))
+		return
+	} else if !valid {
 		w.WriteHeader(401)
 		w.Write([]byte("401 Unauthorized"))
 		return
@@ -2613,8 +2621,12 @@ func (s *statsManager) handleMetrics(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s *statsManager) handleMetricsHigh(w http.ResponseWriter, r *http.Request) {
-	_, valid, _ := common.IsAuthValid(r)
-	if !valid {
+	_, valid, err := common.IsAuthValid(r)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte(err.Error() + "\n"))
+		return
+	} else if !valid {
 		w.WriteHeader(401)
 		w.Write([]byte("401 Unauthorized"))
 		return
@@ -2637,8 +2649,12 @@ func (s *statsManager) handleMetricsHigh(w http.ResponseWriter, r *http.Request)
 }
 
 func (s *statsManager) handleMemStatsReq(w http.ResponseWriter, r *http.Request) {
-	_, valid, _ := common.IsAuthValid(r)
-	if !valid {
+	_, valid, err := common.IsAuthValid(r)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte(err.Error() + "\n"))
+		return
+	} else if !valid {
 		w.WriteHeader(401)
 		w.Write([]byte("401 Unauthorized"))
 		return
@@ -2699,8 +2715,12 @@ func (s *statsManager) getStorageStats(spec *statsSpec) string {
 }
 
 func (s *statsManager) handleStorageStatsReq(w http.ResponseWriter, r *http.Request) {
-	_, valid, _ := common.IsAuthValid(r)
-	if !valid {
+	_, valid, err := common.IsAuthValid(r)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte(err.Error() + "\n"))
+		return
+	} else if !valid {
 		w.WriteHeader(401)
 		w.Write([]byte("401 Unauthorized"))
 		return
@@ -2752,8 +2772,12 @@ func (s *statsManager) handleStorageStatsReq(w http.ResponseWriter, r *http.Requ
 }
 
 func (s *statsManager) handleStorageMMStatsReq(w http.ResponseWriter, r *http.Request) {
-	_, valid, _ := common.IsAuthValid(r)
-	if !valid {
+	_, valid, err := common.IsAuthValid(r)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte(err.Error() + "\n"))
+		return
+	} else if !valid {
 		w.WriteHeader(401)
 		w.Write([]byte("401 Unauthorized"))
 		return
@@ -2771,8 +2795,12 @@ func (s *statsManager) handleStorageMMStatsReq(w http.ResponseWriter, r *http.Re
 }
 
 func (s *statsManager) handleStatsResetReq(w http.ResponseWriter, r *http.Request) {
-	_, valid, _ := common.IsAuthValid(r)
-	if !valid {
+	_, valid, err := common.IsAuthValid(r)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte(err.Error() + "\n"))
+		return
+	} else if !valid {
 		w.WriteHeader(401)
 		w.Write([]byte("401 Unauthorized"))
 		return

diff --git a/secondary/manager/request_handler.go b/secondary/manager/request_handler.go
@@ -1966,7 +1966,8 @@ func doAuth(r *http.Request, w http.ResponseWriter) (cbauth.Creds, bool) {
 
 	creds, valid, err := common.IsAuthValid(r)
 	if err != nil {
-		sendIndexResponseWithError(http.StatusInternalServerError, w, err.Error())
+		w.WriteHeader(http.StatusBadRequest)
+		w.Write([]byte(err.Error() + "\n"))
 		return nil, false
 	} else if valid == false {
 		w.WriteHeader(401)