Added log to show which URL is blocked by CORS. (mattermost#26347)

--------- Co-authored-by: Mattermost Build <[email protected]>
Aryakoste · Apr 6, 2024 · a040618 · a040618
1 parent 71e26b8
commit a040618
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/server/channels/api4/websocket.go b/server/channels/api4/websocket.go
@@ -32,7 +32,10 @@ func connectWebSocket(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	ws, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
-		c.Err = model.NewAppError("connect", "api.web_socket.connect.upgrade.app_error", nil, err.Error(), http.StatusBadRequest)
+		params := map[string]any{
+			"BlockedOrigin": r.Header.Get("Origin"),
+		}
+		c.Err = model.NewAppError("connect", "api.web_socket.connect.upgrade.app_error", params, err.Error(), http.StatusBadRequest)
 		return
 	}
 

diff --git a/server/channels/api4/websocket_test.go b/server/channels/api4/websocket_test.go
@@ -465,5 +465,5 @@ func TestWebSocketUpgrade(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, resp.StatusCode, http.StatusBadRequest)
 	require.NoError(t, th.TestLogger.Flush())
-	testlib.AssertLog(t, buffer, mlog.LvlDebug.Name, "Failed to upgrade websocket connection.")
+	testlib.AssertLog(t, buffer, mlog.LvlDebug.Name, "URL Blocked because of CORS. Url: ")
 }
diff --git a/server/i18n/en.json b/server/i18n/en.json
@@ -4552,7 +4552,7 @@
   },
   {
     "id": "api.web_socket.connect.upgrade.app_error",
-    "translation": "Failed to upgrade websocket connection."
+    "translation": "URL Blocked because of CORS. Url: {{.BlockedOrigin}}"
   },
   {
     "id": "api.web_socket_router.bad_action.app_error",