From f61d0a68d559e71e1a21520e51c6c9f60895e7c6 Mon Sep 17 00:00:00 2001 From: Alex <33497058+bexsoft@users.noreply.github.com> Date: Fri, 16 Dec 2022 13:32:52 -0600 Subject: [PATCH] Implements CONSOLE_DEV_MODE env var (#2517) Signed-off-by: Benjamin Perez --- restapi/config.go | 4 ++++ restapi/consts.go | 1 + restapi/ws_handle.go | 10 ++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/restapi/config.go b/restapi/config.go index d7478c381..794ce9a3f 100644 --- a/restapi/config.go +++ b/restapi/config.go @@ -272,3 +272,7 @@ func getMaxConcurrentDownloadsLimit() int64 { return cu } + +func getConsoleDevMode() bool { + return strings.ToLower(env.Get(ConsoleDevMode, "off")) == "on" +} diff --git a/restapi/consts.go b/restapi/consts.go index 0dee3300b..9d0dc2b81 100644 --- a/restapi/consts.go +++ b/restapi/consts.go @@ -53,6 +53,7 @@ const ( ConsoleLogQueryAuthToken = "CONSOLE_LOG_QUERY_AUTH_TOKEN" ConsoleMaxConcurrentUploads = "CONSOLE_MAX_CONCURRENT_UPLOADS" ConsoleMaxConcurrentDownloads = "CONSOLE_MAX_CONCURRENT_DOWNLOADS" + ConsoleDevMode = "CONSOLE_DEV_MODE" LogSearchQueryAuthToken = "LOGSEARCH_QUERY_AUTH_TOKEN" SlashSeparator = "/" ) diff --git a/restapi/ws_handle.go b/restapi/ws_handle.go index aee407325..9ceefbc92 100644 --- a/restapi/ws_handle.go +++ b/restapi/ws_handle.go @@ -148,10 +148,12 @@ func serveWS(w http.ResponseWriter, req *http.Request) { return } - // Un-comment for development so websockets work on port 5005 - /*upgrader.CheckOrigin = func(r *http.Request) bool { - return true - }*/ + // Development mode validation + if getConsoleDevMode() { + upgrader.CheckOrigin = func(r *http.Request) bool { + return true + } + } // upgrades the HTTP server connection to the WebSocket protocol. conn, err := upgrader.Upgrade(w, req, nil)