[Release] 4.8.6

Author: Akkadius

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.

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>
 
 
 

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
 	}

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

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"