Changeset

--- a/net/httpserver.lua	Sun Jun 28 11:49:25 2009 -0500
+++ b/net/httpserver.lua	Mon Jun 29 14:10:11 2009 +0100
@@ -52,7 +52,7 @@
 		end
 	else
 		-- Response we have is just a string (the body)
-		log("debug", "Sending response to %s: %s", request.id, response);
+		log("debug", "Sending response to %s: %s", request.id or "<none>", response or "<none>");
 		
 		resp = { "HTTP/1.0 200 OK\r\n" };
 		t_insert(resp, "Connection: close\r\n");

--- a/plugins/mod_console.lua	Sun Jun 28 11:49:25 2009 -0500
+++ b/plugins/mod_console.lua	Mon Jun 29 14:10:11 2009 +0100
@@ -162,7 +162,7 @@
 
 def_env.module = {};
 
-local function get_hosts_set(hosts)
+local function get_hosts_set(hosts, module)
 	if type(hosts) == "table" then
 		if hosts[1] then
 			return set.new(hosts);
@@ -172,8 +172,9 @@
 	elseif type(hosts) == "string" then
 		return set.new { hosts };
 	elseif hosts == nil then
+		local mm = require "modulemanager";
 		return set.new(array.collect(keys(prosody.hosts)))
-			/ function (host) return prosody.hosts[host].type == "local"; end;
+			/ function (host) return prosody.hosts[host].type == "local" or module and mm.is_loaded(host, module); end;
 	end
 end
 
@@ -203,7 +204,7 @@
 function def_env.module:unload(name, hosts)
 	local mm = require "modulemanager";
 
-	hosts = get_hosts_set(hosts);
+	hosts = get_hosts_set(hosts, name);
 	
 	-- Unload the module for each host
 	local ok, err, count = true, nil, 0;
@@ -225,7 +226,7 @@
 function def_env.module:reload(name, hosts)
 	local mm = require "modulemanager";
 
-	hosts = get_hosts_set(hosts);
+	hosts = get_hosts_set(hosts, name);
 	
 	-- Reload the module for each host
 	local ok, err, count = true, nil, 0;

--- a/plugins/mod_pep.lua	Sun Jun 28 11:49:25 2009 -0500
+++ b/plugins/mod_pep.lua	Mon Jun 29 14:10:11 2009 +0100
@@ -7,10 +7,15 @@
 local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
 local pairs, ipairs = pairs, ipairs;
 local next = next;
+local type = type;
 local load_roster = require "core.rostermanager".load_roster;
+local sha1 = require "util.hashes".sha1;
+local base64 = require "util.encodings".base64.encode;
 
+local NULL = {};
 local data = {};
 local recipients = {};
+local hash_map = {};
 
 module:add_identity("pubsub", "pep");
 module:add_feature("http://jabber.org/protocol/pubsub#publish");
@@ -28,26 +33,56 @@
 	-- store for the future
 	local user_data = data[bare];
 	if disable then
-		if user_data then user_data[node] = nil; end
-		if not next(user_data) then data[bare] = nil; end
+		if user_data then
+			user_data[node] = nil;
+			if not next(user_data) then data[bare] = nil; end
+		end
 	else
 		if not user_data then user_data = {}; data[bare] = user_data; end
 		user_data[node] = stanza;
 	end
 	
-	-- broadcast to resources
-	stanza.attr.to = bare;
-	core_route_stanza(session, stanza);
-
-	-- broadcast to contacts
-	for jid, item in pairs(session.roster) do
-		if jid and jid ~= "pending" and (item.subscription == 'from' or item.subscription == 'both') then
-			stanza.attr.to = jid;
-			core_route_stanza(session, stanza);
+	-- broadcast
+	for recipient, notify in pairs(recipients[bare] or NULL) do
+		if notify[node] then
+			stanza.attr.to = recipient;
+			core_post_stanza(session, stanza);
+		end
+	end
+end
+local function publish_all(user, recipient, session)
+	local d = data[user];
+	local notify = recipients[user] and recipients[user][recipient];
+	if d and notify then
+		for node, message in pairs(notify) do
+			if d[node] then
+				message.attr.to = recipient;
+				session.send(message);
+			end
 		end
 	end
 end
 
+local function get_caps_hash_from_presence(stanza, current)
+	local t = stanza.attr.type;
+	if not t then
+		for _, child in pairs(stanza.tags) do
+			if child.name == "c" and child.attr.xmlns == "http://jabber.org/protocol/caps" then
+				local attr = child.attr;
+				if attr.hash then -- new caps
+					if attr.hash == 'sha-1' and attr.node and attr.ver then return attr.ver, attr.node.."#"..attr.ver; end
+				else -- legacy caps
+					if attr.node and attr.ver then return attr.node.."#"..attr.ver.."#"..(attr.ext or ""), attr.node.."#"..attr.ver; end
+				end
+				return; -- bad caps format
+			end
+		end
+	elseif t == "unavailable" or t == "error" then
+		return;
+	end
+	return current; -- no caps, could mean caps optimization, so return current
+end
+
 module:hook("presence/bare", function(event)
 	-- inbound presence to bare JID recieved
 	local origin, stanza = event.origin, event.stanza;
@@ -56,18 +91,23 @@
 	local bare = jid_bare(stanza.attr.from);
 	local item = load_roster(jid_split(user))[bare];
 	if not stanza.attr.to or (item and (item.subscription == 'from' or item.subscription == 'both')) then
-		local t = stanza.attr.type;
 		local recipient = stanza.attr.from;
-		if t == "unavailable" or t == "error" then
+		local current = recipients[user] and recipients[user][recipient];
+		local hash = get_caps_hash_from_presence(stanza, current);
+		if current == hash then return; end
+		if not hash then
 			if recipients[user] then recipients[user][recipient] = nil; end
-		elseif not t then
+		else
 			recipients[user] = recipients[user] or {};
-			if not recipients[user][recipient] then
-				recipients[user][recipient] = true;
-				for node, message in pairs(data[user] or {}) do
-					message.attr.to = stanza.attr.from;
-					origin.send(message);
-				end
+			if hash_map[hash] then
+				recipients[user][recipient] = hash_map[hash];
+				publish_all(user, recipient);
+			else
+				recipients[user][recipient] = hash;
+				origin.send(
+					st.stanza("iq", {from=stanza.attr.to, to=stanza.attr.from, id="disco", type="get"})
+						:query("http://jabber.org/protocol/disco#info")
+				);
 			end
 		end
 	end
@@ -85,9 +125,81 @@
 				if payload then -- <item>
 					publish(session, node, payload);
 					return true;
-				end -- TODO else error
-			end -- TODO else error
+				end
+			end
 		end
 	end
 end);
 
+local function calculate_hash(disco_info)
+	local identities, features, extensions = {}, {}, {};
+	for _, tag in pairs(disco_info) do
+		if tag.name == "identity" then
+			table.insert(identities, (tag.attr.category or "").."\0"..(tag.attr.type or "").."\0"..(tag.attr["xml:lang"] or "").."\0"..(tag.attr.name or ""));
+		elseif tag.name == "feature" then
+			table.insert(features, tag.attr.var or "");
+		elseif tag.name == "x" and tag.attr.xmlns == "jabber:x:data" then
+			local form = {};
+			local FORM_TYPE;
+			for _, field in pairs(tag.tags) do
+				if field.name == "field" and field.attr.var then
+					local values = {};
+					for _, val in pairs(field.tags) do
+						val = #val.tags == 0 and table.concat(val); -- FIXME use get_text?
+						if val then table.insert(values, val); end
+					end
+					table.sort(values);
+					if field.attr.var == "FORM_TYPE" then
+						FORM_TYPE = values[1];
+					elseif #values > 0 then
+						table.insert(form, field.attr.var.."\0"..table.concat(values, "<"));
+					else
+						table.insert(form, field.attr.var);
+					end
+				end
+			end
+			table.sort(form);
+			form = table.concat(form, "<");
+			if FORM_TYPE then form = FORM_TYPE.."\0"..form; end
+			table.insert(extensions, form);
+		end
+	end
+	table.sort(identities);
+	table.sort(features);
+	table.sort(extensions);
+	if #identities > 0 then identities = table.concat(identities, "<"):gsub("%z", "/").."<"; else identities = ""; end
+	if #features > 0 then features = table.concat(features, "<").."<"; else features = ""; end
+	if #extensions > 0 then extensions = table.concat(extensions, "<"):gsub("%z", "<").."<"; else extensions = ""; end
+	local S = identities..features..extensions;
+	local ver = base64(sha1(S));
+	return ver, S;
+end
+
+module:hook("iq/bare/disco", function(event)
+	local session, stanza = event.origin, event.stanza;
+	if stanza.attr.type == "result" then
+		local disco = stanza.tags[1];
+		if disco and disco.name == "query" and disco.attr.xmlns == "http://jabber.org/protocol/disco#info" then
+			-- Process disco response
+			local user = stanza.attr.to or (session.username..'@'..session.host);
+			local contact = stanza.attr.from;
+			local current = recipients[user] and recipients[user][contact];
+			if type(current) ~= "string" then return; end -- check if waiting for recipient's response
+			local ver = current;
+			if not string.find(current, "#") then
+				ver = calculate_hash(disco.tags); -- calculate hash
+			end
+			local notify = {};
+			for _, feature in pairs(disco.tags) do
+				if feature.name == "feature" and feature.attr.var then
+					local nfeature = feature.attr.var:match("^(.*)+notify$");
+					if nfeature then notify[nfeature] = true; end
+				end
+			end
+			hash_map[ver] = notify; -- update hash map
+			recipients[user][contact] = notify; -- set recipient's data to calculated data
+			-- send messages to recipient
+			publish_all(user, contact, session);
+		end
+	end
+end);

--- a/util/muc.lua	Sun Jun 28 11:49:25 2009 -0500
+++ b/util/muc.lua	Mon Jun 29 14:10:11 2009 +0100
@@ -165,7 +165,7 @@
 
 local function room_get_disco_info(self, stanza) end
 local function room_get_disco_items(self, stanza) end
-local function room_set_subject(room, current_nick, room, subject)
+local function room_set_subject(room, current_nick, subject)
 	-- TODO check nick's authority
 	if subject == "" then subject = nil; end
 	room._data['subject'] = subject;
@@ -315,7 +315,7 @@
 		local current_nick = self._jid_nick[stanza.attr.from];
 		if current_nick then
 			stanza.attr.to = current_nick;
-			room_handle_to_occupant(origin, stanza);
+			room_handle_to_occupant(self, origin, stanza);
 			stanza.attr.to = to;
 		elseif type ~= "error" and type ~= "result" then
 			origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));

--- a/util/pluginloader.lua	Sun Jun 28 11:49:25 2009 -0500
+++ b/util/pluginloader.lua	Mon Jun 29 14:10:11 2009 +0100
@@ -27,7 +27,7 @@
 function load_code(plugin, resource)
 	local content, err = load_resource(plugin, resource);
 	if not content then return content, err; end
-	return loadstring(content, err);
+	return loadstring(content, "@"..err);
 end
 
 return _M;

--- a/util/stanza.lua	Sun Jun 28 11:49:25 2009 -0500
+++ b/util/stanza.lua	Mon Jun 29 14:10:11 2009 +0100
@@ -24,6 +24,7 @@
 local unpack        =        unpack;
 local s_gsub        =   string.gsub;
 local s_char        =   string.char;
+local s_find        =   string.find;
 local os            =            os;
 
 local do_pretty_printing = not os.getenv("WINDIR");
@@ -122,27 +123,33 @@
 	return function(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
 end)();
 local function _dostring(t, buf, self, xml_escape)
-	local nsid, ns, attrk = 0;
-	t_insert(buf, "<"..t.name);
+	local nsid = 0;
+	local name = t.name
+	t_insert(buf, "<"..name);
 	for k, v in pairs(t.attr) do
-		ns, attrk = s_match(k, "^([^|]+)|(.+)$");
-		if ns then
+		if s_find(k, "|", 1, true) then
+			local ns, attrk = s_match(k, "^([^|]+)|(.+)$");
 			nsid = nsid + 1;
 			t_insert(buf, " xmlns:ns"..nsid.."='"..xml_escape(ns).."' ".."ns"..nsid..":"..attrk.."='"..xml_escape(v).."'");
 		else
 			t_insert(buf, " "..k.."='"..xml_escape(v).."'");
 		end
 	end
-	t_insert(buf, ">");
-	for n=1,#t do
-		local child = t[n];
-		if child.name then
-			self(child, buf, self, xml_escape);
-		else
-			t_insert(buf, xml_escape(child));
+	local len = #t;
+	if len == 0 then
+		t_insert(buf, "/>");
+	else
+		t_insert(buf, ">");
+		for n=1,len do
+			local child = t[n];
+			if child.name then
+				self(child, buf, self, xml_escape);
+			else
+				t_insert(buf, xml_escape(child));
+			end
 		end
+		t_insert(buf, "</"..name..">");
 	end
-	t_insert(buf, "</"..t.name..">");
 end
 function stanza_mt.__tostring(t)
 	local buf = {};