maride/gotty
1
0
Fork 0
mirror of https://github.com/sorenisanerd/gotty.git synced 2025-04-03 09:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving args to querystring

Browse Source
This commit is contained in:
Mike Bentzen 2022-08-12 23:00:46 +10:00
parent bfed9b4320
commit 2013f7ea1b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/main.ts
View File

@ -13,8 +13,8 @@ if (elem !== null) {
term = new OurXterm(elem); term = new OurXterm(elem);
const httpsEnabled = window.location.protocol == "https:"; const httpsEnabled = window.location.protocol == "https:";
const url = (httpsEnabled ? 'wss://' : 'ws://') + window.location.host + window.location.pathname + 'ws';
const args = window.location.search; const args = window.location.search;
const url = (httpsEnabled ? 'wss://' : 'ws://') + window.location.host + window.location.pathname + 'ws' + args;
const factory = new ConnectionFactory(url, protocols); const factory = new ConnectionFactory(url, protocols);
const wt = new WebTTY(term, factory, args, gotty_auth_token); const wt = new WebTTY(term, factory, args, gotty_auth_token);
const closer = wt.open(); const closer = wt.open();

8
server/handlers.go
View File

@ -72,7 +72,7 @@ func (server *Server) generateHandleWS(ctx context.Context, cancel context.Cance
} }
defer conn.Close() defer conn.Close()
err = server.processWSConn(ctx, conn) err = server.processWSConn(ctx, conn, r.URL.RawQuery)
switch err { switch err {
case ctx.Err(): case ctx.Err():
@ -87,7 +87,7 @@ func (server *Server) generateHandleWS(ctx context.Context, cancel context.Cance
} }
} }
func (server *Server) processWSConn(ctx context.Context, conn *websocket.Conn) error { func (server *Server) processWSConn(ctx context.Context, conn *websocket.Conn, rawquery string) error {
typ, initLine, err := conn.ReadMessage() typ, initLine, err := conn.ReadMessage()
if err != nil { if err != nil {
return errors.Wrapf(err, "failed to authenticate websocket connection") return errors.Wrapf(err, "failed to authenticate websocket connection")
@ -106,8 +106,8 @@ func (server *Server) processWSConn(ctx context.Context, conn *websocket.Conn) e
} }
queryPath := "?" queryPath := "?"
if server.options.PermitArguments && init.Arguments != "" { if server.options.PermitArguments && rawquery != "" {
queryPath = init.Arguments queryPath += rawquery
} }
query, err := url.Parse(queryPath) query, err := url.Parse(queryPath)