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

Improve jid.split() and jid.bare() to pass new test cases with invalid JIDs

Browse source
This commit is contained in:
Matthew Wild 2008-11-21 05:02:53 +00:00
parent c36a8743fe
commit 48e7f5ea64
2 changed files with 35 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/test_util_jid.lua
View file

@ -11,4 +11,24 @@ function split(split)
test("server", nil, "server", nil ); test("server", nil, "server", nil );
test("server/resource", nil, "server", "resource" ); test("server/resource", nil, "server", "resource" );
test(nil, nil, nil , nil ); test(nil, nil, nil , nil );
test("node@/server", nil, nil, nil , nil );
end
function bare(bare)
assert_equal(bare("user@host"), "user@host", "bare JID remains bare");
assert_equal(bare("host"), "host", "Host JID remains host");
assert_equal(bare("host/resource"), "host", "Host JID with resource becomes host");
assert_equal(bare("user@host/resource"), "user@host", "user@host JID with resource becomes user@host");
assert_equal(bare("user@/resource"), nil, "invalid JID is nil");
assert_equal(bare("@/resource"), nil, "invalid JID is nil");
assert_equal(bare("@/"), nil, "invalid JID is nil");
assert_equal(bare("/"), nil, "invalid JID is nil");
assert_equal(bare(""), nil, "invalid JID is nil");
assert_equal(bare("@"), nil, "invalid JID is nil");
assert_equal(bare("user@"), nil, "invalid JID is nil");
assert_equal(bare("user@@"), nil, "invalid JID is nil");
assert_equal(bare("user@@host"), nil, "invalid JID is nil");
assert_equal(bare("user@@host/resource"), nil, "invalid JID is nil");
assert_equal(bare("user@host/"), nil, "invalid JID is nil");
end end

22
util/jid.lua
View file

@ -1,20 +1,28 @@
local match = string.match; local match = string.match;
local tostring = tostring;
local print = print
module "jid" module "jid"
function split(jid) function split(jid)
if not jid then return; end if not jid then return; end
-- TODO verify JID, and return; if invalid -- TODO verify JID, and return; if invalid
local node = match(jid, "^([^@]+)@"); local node, nodelen = match(jid, "^([^@]+)@()");
local server = (node and match(jid, ".-@([^@/]+)")) or match(jid, "^([^@/]+)"); local host, hostlen = match(jid, "^([^@/]+)()", nodelen)
local resource = match(jid, "/(.+)$"); if node and not host then return nil, nil, nil; end
return node, server, resource; local resource = match(jid, "^/(.+)$", hostlen);
if (not host) or ((not resource) and #jid >= hostlen) then return nil, nil, nil; end
return node, host, resource;
end end
function bare(jid) function bare(jid)
local node, host = split(jid); local node, host = split(jid);
return node.."@"..host; if node and host then
return node.."@"..host;
elseif host then
return host;
end
return nil;
end end
return _M; return _M;