util.pluginloader: Return full file path from internal file loader on success, not...

[prosody.git] / util / jid.lua

diff --git a/util/jid.lua b/util/jid.lua
index 68449aa1c72bd934f42967b5dd444c7d64269b58..069817c6167c46d0fffbe2a4e98bb71f604474b2 100644 (file)
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -1,6 +1,6 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- 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.
@@ -15,26 +15,27 @@ local resourceprep = require "util.encodings".stringprep.resourceprep;
 
 module "jid"
 
-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);
        if (not host) or ((not resource) and #jid >= hostpos) then return nil, nil, nil; end
        return node, host, resource;
 end
+split = _split;
 
 function bare(jid)
-       local node, host = split(jid);
+       local node, host = _split(jid);
        if node and host then
                return node.."@"..host;
        end
        return host;
 end
 
-function prepped_split(jid)
-       local node, host, resource = split(jid);
+local function _prepped_split(jid)
+       local node, host, resource = _split(jid);
        if host then
                host = nameprep(host);
                if not host then return; end
@@ -49,9 +50,10 @@ function prepped_split(jid)
                return node, host, resource;
        end
 end
+prepped_split = _prepped_split;
 
 function prep(jid)
-       local node, host, resource = prepped_split(jid);
+       local node, host, resource = _prepped_split(jid);
        if host then
                if node then
                        host = node .. "@" .. host;
@@ -63,4 +65,30 @@ function prep(jid)
        return host;
 end
 
+function join(node, host, resource)
+       if node and host and resource then
+               return node.."@"..host.."/"..resource;
+       elseif node and host then
+               return node.."@"..host;
+       elseif host and resource then
+               return host.."/"..resource;
+       elseif host then
+               return host;
+       end
+       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
+
 return _M;