fix check proxy auth

sonroyaalmerol · Nov 18, 2024 · d856f17 · d856f17
1 parent dee20d1
commit d856f17
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 15 deletions.
diff --git a/internal/proxy/controllers/agents/agents.go b/internal/proxy/controllers/agents/agents.go
@@ -23,7 +23,8 @@ func AgentLogHandler(storeInstance *store.Store) func(http.ResponseWriter, *http
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		syslogger, err := syslog.InitializeLogger()

diff --git a/internal/proxy/controllers/exclusions/exclusions.go b/internal/proxy/controllers/exclusions/exclusions.go
@@ -19,7 +19,8 @@ func D2DExclusionHandler(storeInstance *store.Store) func(http.ResponseWriter, *
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		if r.Method == http.MethodGet {
@@ -58,7 +59,8 @@ func ExtJsExclusionHandler(storeInstance *store.Store) func(http.ResponseWriter,
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		w.Header().Set("Content-Type", "application/json")
@@ -97,7 +99,8 @@ func ExtJsExclusionSingleHandler(storeInstance *store.Store) func(http.ResponseW
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		w.Header().Set("Content-Type", "application/json")

diff --git a/internal/proxy/controllers/jobs/jobs.go b/internal/proxy/controllers/jobs/jobs.go
@@ -21,7 +21,8 @@ func D2DJobHandler(storeInstance *store.Store) func(http.ResponseWriter, *http.R
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		allJobs, err := storeInstance.GetAllJobs()
@@ -57,7 +58,8 @@ func ExtJsJobRunHandler(storeInstance *store.Store) func(http.ResponseWriter, *h
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		job, err := storeInstance.GetJob(pathVar["job"])
@@ -92,7 +94,8 @@ func ExtJsJobHandler(storeInstance *store.Store) func(http.ResponseWriter, *http
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		w.Header().Set("Content-Type", "application/json")
@@ -136,7 +139,8 @@ func ExtJsJobSingleHandler(storeInstance *store.Store) func(http.ResponseWriter,
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		w.Header().Set("Content-Type", "application/json")

diff --git a/internal/proxy/controllers/partial_files/partial_files.go b/internal/proxy/controllers/partial_files/partial_files.go
@@ -19,7 +19,8 @@ func D2DPartialFileHandler(storeInstance *store.Store) func(http.ResponseWriter,
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		if r.Method == http.MethodGet {
@@ -58,7 +59,8 @@ func ExtJsPartialFileHandler(storeInstance *store.Store) func(http.ResponseWrite
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		w.Header().Set("Content-Type", "application/json")
@@ -96,7 +98,8 @@ func ExtJsPartialFileSingleHandler(storeInstance *store.Store) func(http.Respons
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		w.Header().Set("Content-Type", "application/json")

diff --git a/internal/proxy/controllers/targets/targets.go b/internal/proxy/controllers/targets/targets.go
@@ -26,10 +26,12 @@ func D2DTargetHandler(storeInstance *store.Store) func(http.ResponseWriter, *htt
 	return func(w http.ResponseWriter, r *http.Request, pathVar map[string]string) {
 		if r.Method != http.MethodGet && r.Method != http.MethodPost {
 			http.Error(w, "Invalid HTTP method", http.StatusBadRequest)
+			return
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		if r.Method == http.MethodGet {
@@ -109,7 +111,8 @@ func D2DTargetAgentHandler(storeInstance *store.Store) func(http.ResponseWriter,
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		var reqParsed NewAgentHostnameRequest
@@ -164,7 +167,8 @@ func ExtJsTargetHandler(storeInstance *store.Store) func(http.ResponseWriter, *h
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		w.Header().Set("Content-Type", "application/json")
@@ -207,7 +211,8 @@ func ExtJsTargetSingleHandler(storeInstance *store.Store) func(http.ResponseWrit
 		}
 
 		if err := storeInstance.CheckProxyAuth(r); err != nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			http.Error(w, "authentication failed - no authentication credentials provided", http.StatusUnauthorized)
+			return
 		}
 
 		w.Header().Set("Content-Type", "application/json")

diff --git a/internal/store/auth.go b/internal/store/auth.go
@@ -96,5 +96,9 @@ func (storeInstance *Store) CheckProxyAuth(r *http.Request) error {
 		resp.Body.Close()
 	}()
 
+	if resp.StatusCode > 299 || resp.StatusCode < 200 {
+		return fmt.Errorf("CheckProxyAuth: invalid auth -> %w", err)
+	}
+
 	return nil
 }