X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fjid.lua;h=9128ce4e0a73c8f219331da5114d34539b12f5fd;hb=d89f50109f97ff133c2ee9270e54851d7939aa69;hp=09d7ef0018c9a833e3cf5970292e7b886b47d421;hpb=a4d1701bd5e08cce7b221200394776a3171ddcac;p=prosody.git

diff --git a/util/jid.lua b/util/jid.lua
index 09d7ef00..9128ce4e 100644
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -1,6 +1,6 @@
--- Prosody IM v0.3
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 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,7 +15,7 @@ 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 host, hostpos = match(jid, "^([^@/]+)()", nodepos)
@@ -24,17 +24,18 @@ function split(jid)
 	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;