lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 12:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix mask and close

Browse Source
This commit is contained in:
zixun
2019-07-21 16:32:58 +08:00
committed by 云风
parent 81a7c44a05
commit 4341106364
1 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lualib/http/websocket.lua
View File

@@ -180,9 +180,10 @@ local function read_frame(self)
local s = self.read(2) local s = self.read(2)
local v1, v2 = string.unpack("I1I1", s) local v1, v2 = string.unpack("I1I1", s)
local fin = (v1 & 0x80) ~= 0 local fin = (v1 & 0x80) ~= 0
local rsv1 = (v1 & 0x40) ~= 0 -- unused flag
local rsv2 = (v1 & 0x20) ~= 0 -- local rsv1 = (v1 & 0x40) ~= 0
local rsv3 = (v1 & 0x10) ~= 0 -- local rsv2 = (v1 & 0x20) ~= 0
-- local rsv3 = (v1 & 0x10) ~= 0
local op = v1 & 0x0f local op = v1 & 0x0f
local mask = (v2 & 0x80) ~= 0 local mask = (v2 & 0x80) ~= 0
local payload_len = (v2 & 0x7f) local payload_len = (v2 & 0x7f)
@@ -194,27 +195,10 @@ local function read_frame(self)
payload_len = string.unpack(">I8", s) payload_len = string.unpack(">I8", s)
end end
-- print("fin, rsv1, rsv2, rsv3, op, mask, payload_len", -- print(string.format("fin:%s, op:%s, mask:%s, payload_len:%s", fin, op_code[op], mask, payload_len))
-- fin, rsv1, rsv2, rsv3, op, mask, payload_len) local masking_key = mask and self.read(4) or false
local masking_key
if mask then
s = self.read(4)
local k1, k2, k3, k4 = string.unpack("I1I1I1I1", s)
masking_key = {k1, k2, k3, k4}
end
local payload_data = payload_len>0 and self.read(payload_len) or "" local payload_data = payload_len>0 and self.read(payload_len) or ""
if masking_key then payload_data = masking_key and crypt.xor_str(payload_data, masking_key) or payload_data
local t = {}
local len = #payload_data
for i=1, len do
local c = string.byte(payload_data, i)
local m = masking_key[(i-1) % 4 + 1]
local v = c ~ m
t[i] = string.char(v)
end
payload_data = table.concat(t)
end
return fin, assert(op_code[op]), payload_data return fin, assert(op_code[op]), payload_data
end end
@@ -238,7 +222,7 @@ local function resolve_accept(self)
local code, reason local code, reason
local payload_len = #payload_data local payload_len = #payload_data
if payload_len > 2 then if payload_len > 2 then
local fmt = string.format(">I2s[%d]", payload_len - 2) local fmt = string.format(">I2c%d", payload_len - 2)
code, reason = string.unpack(fmt, payload_data) code, reason = string.unpack(fmt, payload_data)
end end
try_handle(self, "close", code, reason) try_handle(self, "close", code, reason)
@@ -455,7 +439,11 @@ function M.close(id, code ,reason)
pcall(function () pcall(function ()
reason = reason or "" reason = reason or ""
local payload_data = code and string.pack(">I2s", code, reason) or nil local payload_data
if code then
local fmt =string.format(">I2c%d", #reason)
payload_data = string.pack(fmt, code, reason)
end
write_frame(ws_obj, "close", payload_data) write_frame(ws_obj, "close", payload_data)
end) end)
_close_websocket(ws_obj) _close_websocket(ws_obj)