mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.websocket: Fix handling of 'protocol' argument

Browse source
This commit is contained in:
Kim Alvefur 2014-09-11 00:55:51 +02:00
parent 6769313ce9
commit a685dfb89e
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
net/websocket.lua
View file

@ -190,17 +190,20 @@ local function connect(url, ex, listeners)
-- Either a single protocol string or an array of protocol strings.
local protocol = ex.protocol;
if type(protocol) == "string" then
protocol = { protocol };
end
for _, v in ipairs(protocol) do
protocol[v] = true;
protocol = { protocol, [protocol] = true };
elseif type(protocol) == "table" and protocol[1] then
for _, v in ipairs(protocol) do
protocol[v] = true;
end
else
protocol = nil;
end
local headers = {
["Upgrade"] = "websocket";
["Connection"] = "Upgrade";
["Sec-WebSocket-Key"] = key;
["Sec-WebSocket-Protocol"] = t_concat(protocol, ", ");
["Sec-WebSocket-Protocol"] = protocol and t_concat(protocol, ", ");
["Sec-WebSocket-Version"] = "13";
["Sec-WebSocket-Extensions"] = ex.extensions;
}
@ -238,7 +241,7 @@ local function connect(url, ex, listeners)
or r.headers["connection"]:lower() ~= "upgrade"
or r.headers["upgrade"] ~= "websocket"
or r.headers["sec-websocket-accept"] ~= base64.encode(sha1(key .. "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"))
or not protocol[r.headers["sec-websocket-protocol"]]
or (protocol and not protocol[r.headers["sec-websocket-protocol"]])
then
s.readyState = 3;
log("warn", "WebSocket connection to %s failed: %s", url, tostring(b));