Merge 0.9->0.10

[prosody.git] / util / jid.lua

diff --git a/util/jid.lua b/util/jid.lua
index 9128ce4e0a73c8f219331da5114d34539b12f5fd..27afab3e275e2de573e8b18f6211a7fbebfb5476 100644 (file)
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -1,23 +1,33 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 
 
-local match = string.match;
+local match, sub = string.match, string.sub;
 local nodeprep = require "util.encodings".stringprep.nodeprep;
 local nameprep = require "util.encodings".stringprep.nameprep;
 local resourceprep = require "util.encodings".stringprep.resourceprep;
 
+local escapes = {
+       [" "] = "\\20"; ['"'] = "\\22";
+       ["&"] = "\\26"; ["'"] = "\\27";
+       ["/"] = "\\2f"; [":"] = "\\3a";
+       ["<"] = "\\3c"; [">"] = "\\3e";
+       ["@"] = "\\40"; ["\\"] = "\\5c";
+};
+local unescapes = {};
+for k,v in pairs(escapes) do unescapes[v] = k; end
+
 module "jid"
 
 local function _split(jid)
        if not jid then return; end
-       local node, nodepos = match(jid, "^([^@]+)@()");
+       local node, nodepos = match(jid, "^([^@/]+)@()");
        local host, hostpos = match(jid, "^([^@/]+)()", nodepos)
        if node and not host then return nil, nil, nil; end
        local resource = match(jid, "^/(.+)$", hostpos);
@@ -27,16 +37,15 @@ end
 split = _split;
 
 function bare(jid)
-       local node, host = _split(jid);
-       if node and host then
-               return node.."@"..host;
-       end
-       return host;
+       return jid and match(jid, "^[^/]+");
 end
 
 local function _prepped_split(jid)
        local node, host, resource = _split(jid);
        if host then
+               if sub(host, -1, -1) == "." then -- Strip empty root label
+                       host = sub(host, 1, -2);
+               end
                host = nameprep(host);
                if not host then return; end
                if node then
@@ -52,30 +61,22 @@ local function _prepped_split(jid)
 end
 prepped_split = _prepped_split;
 
-function prep(jid)
-       local node, host, resource = _prepped_split(jid);
-       if host then
-               if node then
-                       host = node .. "@" .. host;
-               end
-               if resource then
-                       host = host .. "/" .. resource;
-               end
-       end
-       return host;
-end
-
-function join(node, host, resource)
-       if node and host and resource then
+local function _join(node, host, resource)
+       if not host then return end
+       if node and resource then
                return node.."@"..host.."/"..resource;
-       elseif node and host then
+       elseif node then
                return node.."@"..host;
-       elseif host and resource then
+       elseif resource then
                return host.."/"..resource;
-       elseif host then
-               return host;
        end
-       return nil; -- Invalid JID
+       return host;
+end
+join = _join;
+
+function prep(jid)
+       local node, host, resource = _prepped_split(jid);
+       return _join(node, host, resource);
 end
 
 function compare(jid, acl)
@@ -91,4 +92,7 @@ function compare(jid, acl)
        return false
 end
 
+function escape(s) return s and (s:gsub(".", escapes)); end
+function unescape(s) return s and (s:gsub("\\%x%x", unescapes)); end
+
 return _M;