X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fjid.lua;h=ccc8309c3a23a411315c6aa6bb332d5c84c1b429;hb=7cde004ab530110577c5107636bc010576f29df1;hp=b35ddc82c54bd305995533ed9b8d820ec80c39db;hpb=83eac2c0e8ebd98cfc7bf297b6526df27231ec9f;p=prosody.git

diff --git a/util/jid.lua b/util/jid.lua
index b35ddc82..ccc8309c 100644
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -1,28 +1,68 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 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 tostring = tostring;
-local print = print
+local nodeprep = require "util.encodings".stringprep.nodeprep;
+local nameprep = require "util.encodings".stringprep.nameprep;
+local resourceprep = require "util.encodings".stringprep.resourceprep;
+
 module "jid"
 
-function split(jid)
+local function _split(jid)
 	if not jid then return; end
-	-- TODO verify JID, and return; if invalid
-	local node, nodelen = match(jid, "^([^@]+)@()");
-	local host, hostlen = match(jid, "^([^@/]+)()", nodelen)
+	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, "^/(.+)$", hostlen);
-	if (not host) or ((not resource) and #jid >= hostlen) 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;
-	elseif host then
-		return host;
 	end
-	return nil;
+	return host;
+end
+
+local function _prepped_split(jid)
+	local node, host, resource = _split(jid);
+	if host then
+		host = nameprep(host);
+		if not host then return; end
+		if node then
+			node = nodeprep(node);
+			if not node then return; end
+		end
+		if resource then
+			resource = resourceprep(resource);
+			if not resource then return; end
+		end
+		return node, host, resource;
+	end
+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
 
 return _M;