mod_s2s: Keep the dns answer object around a while so plugins can look at it

[prosody.git] / util / jid.lua

diff --git a/util/jid.lua b/util/jid.lua
index ba9730fa3c57d3a85eb3aa8b22d19199ea256d4f..4c4371d805361006d87b842f3ebd55f646709eca 100644 (file)
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -13,11 +13,21 @@ 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);
@@ -78,4 +88,20 @@ function join(node, host, resource)
        return nil; -- Invalid JID
 end
 
+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
+
+function escape(s) return s and (s:gsub(".", escapes)); end
+function unescape(s) return s and (s:gsub("\\%x%x", unescapes)); end
+
 return _M;