mirrors/rdpgw
2
0
Fork 0
mirror of https://github.com/bolkedebruin/rdpgw.git synced 2026-02-10 18:07:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix protocol fallback

Browse Source
This commit is contained in:
Darkar25 2026-02-05 20:31:51 +07:00 committed by GitHub
parent 3b96fa26fe
commit 5562a55318
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/rdpgw/protocol/gateway.go
View File

@ -78,24 +78,23 @@ func (g *Gateway) HandleGatewayProtocol(w http.ResponseWriter, r *http.Request)
ctx = context.WithValue(ctx, CtxTunnel, t)
if r.Method == MethodRDGOUT {
if r.Header.Get("Connection") != "upgrade" && r.Header.Get("Upgrade") != "websocket" {
g.handleLegacyProtocol(w, r.WithContext(ctx), t)
return
}
r.Method = "GET" // force
conn, err := upgrader.Upgrade(w, r, nil)
if err != nil {
log.Printf("Cannot upgrade falling back to old protocol: %t", err)
return
}
defer conn.Close()
if r.Header.Get("Connection") == "upgrade" && r.Header.Get("Upgrade") == "websocket" {
r.Method = "GET" // force
err = g.setSendReceiveBuffers(conn.UnderlyingConn())
if err != nil {
log.Printf("Cannot set send/receive buffers: %t", err)
conn, err := upgrader.Upgrade(w, r, nil)
if err == nil {
defer conn.Close()
err = g.setSendReceiveBuffers(conn.UnderlyingConn())
if err != nil {
log.Printf("Cannot set send/receive buffers: %v", err)
}
g.handleWebsocketProtocol(ctx, conn, t)
return
}
log.Printf("Cannot upgrade falling back to old protocol: %v", err)
}
g.handleWebsocketProtocol(ctx, conn, t)
g.handleLegacyProtocol(w, r.WithContext(ctx), t)
} else if r.Method == MethodRDGIN {
g.handleLegacyProtocol(w, r.WithContext(ctx), t)
}