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

net.websocket.frames: Use C string XOR implementation

Browse source
This commit is contained in:
Kim Alvefur 2020-10-14 19:41:42 +02:00
parent fb1808b185
commit 00bad1a9fe
2 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

30
net/websocket/frames.lua
View file

@ -13,12 +13,11 @@ local bit = assert(softreq"bit" or softreq"bit32",
"No bit module found. See https://prosody.im/doc/depends#bitop");
local band = bit.band;
local bor = bit.bor;
local bxor = bit.bxor;
local lshift = bit.lshift;
local rshift = bit.rshift;
local unpack = table.unpack or unpack; -- luacheck: ignore 113
local sbit = require "util.strbitop";
local sxor = sbit.sxor;
local t_concat = table.concat;
local s_char= string.char;
local s_pack = string.pack; -- luacheck: ignore 143
local s_unpack = string.unpack; -- luacheck: ignore 143
@ -107,7 +106,7 @@ local function parse_frame_header(frame)
end
if result.MASK then
result.key = { frame:byte(length_bytes+3, length_bytes+6) };
result.key = frame:sub(length_bytes+3, length_bytes+6);
end
return result, header_length;
@ -116,19 +115,7 @@ end
-- XORs the string `str` with the array of bytes `key`
-- TODO: optimize
local function apply_mask(str, key, from, to)
from = from or 1
if from < 0 then from = #str + from + 1 end -- negative indices
to = to or #str
if to < 0 then to = #str + to + 1 end -- negative indices
local key_len = #key
local counter = 0;
local data = {};
for i = from, to do
local key_index = counter%key_len + 1;
counter = counter + 1;
data[counter] = s_char(bxor(key[key_index], str:byte(i)));
end
return t_concat(data);
return sxor(str:sub(from or 1, to or -1), key);
end
local function parse_frame_body(frame, header, pos)
@ -175,15 +162,12 @@ local function build_frame(desc)
local key = ""
if desc.MASK then
local key_a = desc.key
if key_a then
key = s_char(unpack(key_a, 1, 4));
else
key = desc.key
if not key then
key = random_bytes(4);
key_a = {key:byte(1,4)};
end
b2 = bor(b2, 0x80);
data = apply_mask(data, key_a);
data = apply_mask(data, key);
end
return s_char(b1, b2) .. length_extra .. key .. data

2
spec/net_websocket_frames_spec.lua
View file

@ -36,7 +36,7 @@ describe("net.websocket.frames", function ()
["opcode"] = 0;
["length"] = 5;
["data"] = "hello";
["key"] = { 32, 0, 32, 0, };
["key"] = " \0 \0";
["FIN"] = true;
["MASK"] = true;
["RSV1"] = false;