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

util.stanza: Don't automatically generate ids for iq stanzas

Browse source 
Users of this API should provide their own id attribute that meets their
uniqueness requirements.

The current implementation leaks information (i.e. how many iq stanzas
have been sent by the server to other JIDs). Providing any strong
guarantees of randomness here would need to pull in additional
dependencies that we don't want in this simple library.
This commit is contained in:
Matthew Wild 2018-09-13 16:35:48 +01:00
parent c3ba0cd3c5
commit 27d8902b8e
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
spec/util_stanza_spec.lua
View file

@ -84,9 +84,20 @@ describe("util.stanza", function()
end);
describe("#iq()", function()
it("should work", function()
local i = st.iq();
assert.are.equal(i.name, "iq");
it("should create an iq stanza", function()
local i = st.iq({ id = "foo" });
assert.are.equal("iq", i.name);
assert.are.equal("foo", i.attr.id);
end);
it("should reject stanzas with no id", function ()
assert.has.error_match(function ()
local i = st.iq();
end, "id attribute");
assert.has.error_match(function ()
local i = st.iq({ foo = "bar" });
end, "id attribute");
end);
end);

13
util/stanza.lua
View file

@ -347,12 +347,6 @@ function stanza_mt.get_error(stanza)
return error_type, condition or "undefined-condition", text;
end
local id = 0;
local function new_id()
id = id + 1;
return "lx"..id;
end
local function preserialize(stanza)
local s = { name = stanza.name, attr = stanza.attr };
for _, child in ipairs(stanza) do
@ -430,8 +424,10 @@ local function message(attr, body)
end
end
local function iq(attr)
if attr and not attr.id then attr.id = new_id(); end
return new_stanza("iq", attr or { id = new_id() });
if not (attr and attr.id) then
error("iq stanzas require an id attribute");
end
return new_stanza("iq", attr);
end
local function reply(orig)
@ -502,7 +498,6 @@ return {
stanza_mt = stanza_mt;
stanza = new_stanza;
is_stanza = is_stanza;
new_id = new_id;
preserialize = preserialize;
deserialize = deserialize;
clone = clone;