diff options
| author | Kim Alvefur <zash@zash.se> | 2022-12-12 07:10:54 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2022-12-12 07:10:54 +0100 |
| commit | 080d7974bf0c1da8a1c0578d67c3172facc9d719 (patch) | |
| tree | 838d6904e47ab8681928b37701ff4f1c6e89184a /util/jid.lua | |
| parent | baff85a52c5fda705e8b3699410c770f015d89ab (diff) | |
| parent | c916ce76ee89dca32e7e653dff1ade4732462efc (diff) | |
| download | prosody-080d7974bf0c1da8a1c0578d67c3172facc9d719.tar.gz prosody-080d7974bf0c1da8a1c0578d67c3172facc9d719.zip | |
Merge 0.12->trunk
Diffstat (limited to 'util/jid.lua')
| -rw-r--r-- | util/jid.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/jid.lua b/util/jid.lua index 694a6b1f..55567ea2 100644 --- a/util/jid.lua +++ b/util/jid.lua @@ -35,8 +35,7 @@ local function split(jid) if jid == nil then return; end local node, nodepos = match(jid, "^([^@/]+)@()"); local host, hostpos = match(jid, "^([^@/]+)()", nodepos); - if node ~= nil and host == nil then return nil, nil, nil; end - local resource = match(jid, "^/(.+)$", hostpos); + local resource = host and match(jid, "^/(.+)$", hostpos); if (host == nil) or ((resource == nil) and #jid >= hostpos) then return nil, nil, nil; end return node, host, resource; end @@ -91,9 +90,9 @@ local function compare(jid, acl) -- TODO compare to table of rules? local jid_node, jid_host, jid_resource = split(jid); local acl_node, acl_host, acl_resource = split(acl); - if ((acl_node ~= nil and acl_node == jid_node) or acl_node == nil) and - ((acl_host ~= nil and acl_host == jid_host) or acl_host == nil) and - ((acl_resource ~= nil and acl_resource == jid_resource) or acl_resource == nil) then + if (acl_node == nil or acl_node == jid_node) and + (acl_host == nil or acl_host == jid_host) and + (acl_resource == nil or acl_resource == jid_resource) then return true end return false @@ -111,6 +110,7 @@ local function resource(jid) return (select(3, split(jid))); end +-- TODO Forbid \20 at start and end of escaped output per XEP-0106 v1.1 local function escape(s) return s and (s:gsub("\\%x%x", backslash_escapes):gsub("[\"&'/:<>@ ]", escapes)); end local function unescape(s) return s and (s:gsub("\\%x%x", unescapes)); end |