From a6c2dfecf463eecac7963b78b9e9d8178d1cd643 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Sun, 16 Jun 2024 00:40:57 -0500
Subject: [PATCH] [Release] 4.8.6

---
 CHANGELOG.md                                    | 4 ++++
 frontend/src/views/admin/layout/AdminHeader.vue | 5 +++--
 internal/websocket/handler.go                   | 2 +-
 internal/websocket/websocket_controller.go      | 8 --------
 package.json                                    | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9efe1580..8c49e39a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [4.8.6] 6/16/2024
+
+**Spire Admin** Fix issue under unauthenticated local installations where websocket connections would get caught in an authorization loop, spamming the console. Unauthenticated Spire installations will now work properly.
+
 ## [4.8.5] 6/15/2024
 
 * **Spire Admin** Add **Server Process Management** to the permissions page.
diff --git a/frontend/src/views/admin/layout/AdminHeader.vue b/frontend/src/views/admin/layout/AdminHeader.vue
index baf599d1..b83fac16 100644
--- a/frontend/src/views/admin/layout/AdminHeader.vue
+++ b/frontend/src/views/admin/layout/AdminHeader.vue
@@ -4,10 +4,12 @@
 
       <div class="row align-items-center">
         <div class="mr-3 pr-5">
-          <h6 class="header-pretitle">
+          <h6 class="header-pretitle d-inline-block mr-3">
             {{ pageName }}
           </h6>
 
+          <small style="color: red" v-if="stopMessage !== ''">{{ stopMessage }}</small>
+
           <h1
             class="header-title"
             :title="stats.server_name"
@@ -31,7 +33,6 @@
 
           </h1>
 
-          <small style="color: red" v-if="stopMessage !== ''">{{ stopMessage }}</small>
 
 
 
diff --git a/internal/websocket/handler.go b/internal/websocket/handler.go
index 1ad6bcaa..3745e1c0 100644
--- a/internal/websocket/handler.go
+++ b/internal/websocket/handler.go
@@ -109,7 +109,7 @@ func (h *Handler) HandleExecServerBin(ws *websocket.Conn, msg string) error {
 }
 
 func (h *Handler) HandleUnauthorized(ws *websocket.Conn) error {
-	err := websocket.Message.Send(ws, "Unauthorized")
+	err := websocket.Message.Send(ws, "{\"error\": \"Unauthorized\"}")
 	if err != nil {
 		return err
 	}
diff --git a/internal/websocket/websocket_controller.go b/internal/websocket/websocket_controller.go
index 0ca5c8a7..ba1d668f 100644
--- a/internal/websocket/websocket_controller.go
+++ b/internal/websocket/websocket_controller.go
@@ -3,7 +3,6 @@ package websocket
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/Akkadius/spire/internal/http/request"
 	"github.com/Akkadius/spire/internal/http/routes"
 	"github.com/Akkadius/spire/internal/logger"
 	"github.com/Akkadius/spire/internal/pathmgmt"
@@ -44,14 +43,7 @@ type SpireWebsocketMessage struct {
 }
 
 func (a *Controller) websocketHandler(c echo.Context) error {
-	user := request.GetUser(c)
 	websocket.Handler(func(ws *websocket.Conn) {
-		// if no user authorized, kill connection
-		if user.ID == 0 {
-			_ = a.handler.HandleUnauthorized(ws)
-			_ = ws.Close()
-		}
-
 		defer ws.Close()
 		for {
 			// Register client
diff --git a/package.json b/package.json
index dcbed85c..bedb0636 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spire",
-  "version": "4.8.5",
+  "version": "4.8.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/Akkadius/spire.git"