Merge 0.10->trunk

[prosody.git] / util / jid.lua

diff --git a/util/jid.lua b/util/jid.lua
index 52fd0f44cd5d24b96ccdc9a2b36f7083328fbb73..76155ac70f81d7118693ab6f8bfe8d7116196b20 100644 (file)
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -1,34 +1,33 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
--- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- 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;
 
-module "jid"
+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
+
+local _ENV = nil;
 
-function split(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);
@@ -36,7 +35,7 @@ function split(jid)
        return node, host, resource;
 end
 
-function bare(jid)
+local function bare(jid)
        local node, host = split(jid);
        if node and host then
                return node.."@"..host;
@@ -44,9 +43,12 @@ function bare(jid)
        return host;
 end
 
-function prepped_split(jid)
+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
@@ -61,17 +63,46 @@ function prepped_split(jid)
        end
 end
 
-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
+local function join(node, host, resource)
+       if not host then return end
+       if node and resource then
+               return node.."@"..host.."/"..resource;
+       elseif node then
+               return node.."@"..host;
+       elseif resource then
+               return host.."/"..resource;
        end
        return host;
 end
 
-return _M;
+local function prep(jid)
+       local node, host, resource = prepped_split(jid);
+       return join(node, host, resource);
+end
+
+local function compare(jid, acl)
+       -- compare jid to single acl rule
+       -- 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
+               return true
+       end
+       return false
+end
+
+local function escape(s) return s and (s:gsub(".", escapes)); end
+local function unescape(s) return s and (s:gsub("\\%x%x", unescapes)); end
+
+return {
+       split = split;
+       bare = bare;
+       prepped_split = prepped_split;
+       join = join;
+       prep = prep;
+       compare = compare;
+       escape = escape;
+       unescape = unescape;
+};