Skip to content

Handle WebSocket header behind HTTPS proxies #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cwervo wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −2
Open

Handle WebSocket header behind HTTPS proxies #260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions builtin-programs/web/web.folk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ proc readFile {filename contentTypeVar} {
set response [read $fd]; close $fd; return $response
}

proc headerGet {headers name args} {
foreach {k v} $headers {
if {[string equal -nocase $k $name]} { return $v }
}

if {[llength $args] > 0} { return [lindex $args 0] }
error "missing HTTP header $name"
}

proc handlePage {path httpStatusVar contentTypeVar} {
upvar $contentTypeVar contentType
switch -exact -- $path {
Expand Down Expand Up @@ -256,7 +265,7 @@ proc handleRead {chan addr} {
set contentType "text/plain; charset=utf-8"
puts -nonewline $chan "$httpStatus\r\nConnection: close\r\nContent-Type: $contentType\r\n\r\n"

set body [$chan read [dict get $headers Content-Length]]
set body [$chan read [headerGet $headers Content-Length]]
# puts " ($body)"
try {
puts -nonewline $chan [eval $body]
Expand All @@ -268,7 +277,14 @@ proc handleRead {chan addr} {

} elseif {[info exists path] && $path eq "/ws"} {
puts "web: Request for /ws ($headers)"
WsConnection upgrade $chan [dict get $headers Sec-WebSocket-Key] \
set clientKey [headerGet $headers Sec-WebSocket-Key ""]
if {$clientKey eq ""} {
puts -nonewline $chan "HTTP/1.1 400 Bad Request\r\nConnection: close\r\nContent-Type: text/plain; charset=utf-8\r\n\r\nMissing Sec-WebSocket-Key\r\n"
close $chan
return
}

WsConnection upgrade $chan $clientKey \
[list Retract! websocket $chan is connected]
Assert! websocket $chan is connected

Expand Down