fix: make shell feature can work behind web proxy

wikihost-opensource · Jan 19, 2024 · a8f8e09 · a8f8e09
1 parent f2d6632
commit a8f8e09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/backend/als/controller/shell/shell.go b/backend/als/controller/shell/shell.go
@@ -2,6 +2,8 @@ package shell
 
 import (
 	"context"
+	"fmt"
+	"net/http"
 	"os"
 	"os/exec"
 	"strconv"
@@ -19,8 +21,10 @@ var upgrader = websocket.Upgrader{
 }
 
 func HandleNewShell(c *gin.Context) {
+	upgrader.CheckOrigin = func(r *http.Request) bool { return true }
 	conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
+		fmt.Println(err)
 		return
 	}
 	defer conn.Close()

diff --git a/ui/src/components/Utilities/Shell.vue b/ui/src/components/Utilities/Shell.vue
@@ -39,7 +39,7 @@ onMounted(() => {
   const url = new URL(location.href)
   const protocol = url.protocol == 'http:' ? 'ws:' : 'wss:'
   websocket = new WebSocket(
-    protocol + '//' + url.host + '/session/' + useAppStore().sessionId + '/shell'
+    protocol + '//' + url.host + url.pathname + 'session/' + useAppStore().sessionId + '/shell'
   )
   websocket.binaryType = 'arraybuffer'
   websocket.addEventListener('message', (event) => {