From e8878d795e00a30c3c280e1d81de5d85596cac64 Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <me@jonaskaninda.com>
Date: Thu, 14 Nov 2024 22:22:47 +0100
Subject: [PATCH] chore: disable error interceptor on websocket

---
 internal/middleware/error-interceptor.go | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/internal/middleware/error-interceptor.go b/internal/middleware/error-interceptor.go
index 9c25127..36e2a5b 100644
--- a/internal/middleware/error-interceptor.go
+++ b/internal/middleware/error-interceptor.go
@@ -43,14 +43,17 @@ func (rec *responseRecorder) Write(data []byte) (int, error) {
 // ErrorInterceptor Middleware intercepts backend errors
 func (intercept InterceptErrors) ErrorInterceptor(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// Check if the connection is a WebSocket
+		if isWebSocketRequest(r) {
+			next.ServeHTTP(w, r)
+			return
+		}
 		rec := newResponseRecorder(w)
 		next.ServeHTTP(rec, r)
-		w.Header().Set("Proxied-By", "Goma Gateway")
-		w.Header().Del("Server") //Delete server name
 		if canIntercept(rec.statusCode, intercept.Errors) {
-			logger.Debug("An error occurred in the backend, %d", rec.statusCode)
-			logger.Error("Backend error: %d", rec.statusCode)
+			logger.Error("Request to %s resulted in error with status code %d\n", r.URL.Path, rec.statusCode)
 			RespondWithError(w, rec.statusCode, http.StatusText(rec.statusCode))
+			return
 		} else {
 			// No error: write buffered response to client
 			w.WriteHeader(rec.statusCode)
@@ -63,6 +66,9 @@ func (intercept InterceptErrors) ErrorInterceptor(next http.Handler) http.Handle
 
 	})
 }
+func isWebSocketRequest(r *http.Request) bool {
+	return r.Header.Get("Upgrade") == "websocket" && r.Header.Get("Connection") == "Upgrade"
+}
 func canIntercept(code int, errors []int) bool {
 	return slices.Contains(errors, code)
 }