From 6ea2c47577027a1821aedd45428b4d24ebde82f6 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Wed, 23 Jan 2013 22:41:18 +0100
Subject: mod_pubsub: Advertise autocreate_on_publish correctly.

---
 plugins/mod_pubsub.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 40b119cc..f0aa4e4f 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -210,9 +210,9 @@ module:hook("iq/host/http://jabber.org/protocol/pubsub:pubsub", handle_pubsub_iq
 local disco_info;
 
 local feature_map = {
-	create = { "create-nodes", autocreate_on_publish and "instant-nodes", "item-ids" };
+	create = { "create-nodes", "instant-nodes", "item-ids" };
 	retract = { "delete-items", "retract-items" };
-	publish = { "publish" };
+	publish = { "publish", autocreate_on_publish and "auto-create" };
 	get_items = { "retrieve-items" };
 	add_subscription = { "subscribe" };
 	get_subscriptions = { "retrieve-subscriptions" };
-- 
cgit v1.2.3


From 40709658994b6603968042c9dfebff7363f6ea71 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 24 Jan 2013 00:58:03 +0100
Subject: mod_pubsub, util.pubsub: Implement the purge action

---
 plugins/mod_pubsub.lua | 25 +++++++++++++++++++++++++
 util/pubsub.lua        | 10 +++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index f0aa4e4f..687e38f1 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -178,6 +178,10 @@ function handlers.set_retract(origin, stanza, retract)
 	notify = (notify == "1") or (notify == "true");
 	local item = retract:get_child("item");
 	local id = item and item.attr.id
+	if not (node and id) then
+		origin.send(st.error_reply(stanza, "modify", "bad-request"));
+		return true;
+	end
 	local reply, notifier;
 	if notify then
 		notifier = st.stanza("retract", { id = id });
@@ -191,6 +195,26 @@ function handlers.set_retract(origin, stanza, retract)
 	return origin.send(reply);
 end
 
+function handlers.set_purge(origin, stanza, purge)
+	local node, notify = purge.attr.node, purge.attr.notify;
+	notify = (notify == "1") or (notify == "true");
+	local reply, notifier;
+	if not node then
+		origin.send(st.error_reply(stanza, "modify", "bad-request"));
+		return true;
+	end
+	if notify then
+		notifier = st.stanza("purge");
+	end
+	local ok, ret = service:purge(node, stanza.attr.from, notifier);
+	if ok then
+		reply = st.reply(stanza);
+	else
+		reply = pubsub_error_reply(stanza, ret);
+	end
+	return origin.send(reply);
+end
+
 function simple_broadcast(node, jids, item)
 	item = st.clone(item);
 	item.attr.xmlns = nil; -- Clear the pubsub namespace
@@ -212,6 +236,7 @@ local disco_info;
 local feature_map = {
 	create = { "create-nodes", "instant-nodes", "item-ids" };
 	retract = { "delete-items", "retract-items" };
+	purge = { "purge-nodes" };
 	publish = { "publish", autocreate_on_publish and "auto-create" };
 	get_items = { "retrieve-items" };
 	add_subscription = { "subscribe" };
diff --git a/util/pubsub.lua b/util/pubsub.lua
index 8ff458e7..17795cf1 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -259,13 +259,21 @@ function service:retract(node, actor, id, retract)
 	if (not node_obj) or (not node_obj.data[id]) then
 		return false, "item-not-found";
 	end
-	node_obj.data[id] = nil;
+	if id then
+		node_obj.data[id] = nil;
+	else
+		node_obj.data = {}; -- Purge
+	end
 	if retract then
 		self.config.broadcaster(node, node_obj.subscribers, retract);
 	end
 	return true
 end
 
+function service:purge(node, actor, purge)
+	return self:retract(node, actor, nil, purge);
+end
+
 function service:get_items(node, actor, id)
 	-- Access checking
 	if not self:may(node, actor, "get_items") then
-- 
cgit v1.2.3


From 4517552d8ba7d8c57794e2c74c7d73c64cbeb960 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 24 Jan 2013 00:58:17 +0100
Subject: s2smanager: Generate session names used for logging the same way
 everywhere

---
 core/s2smanager.lua       | 2 +-
 core/sessionmanager.lua   | 2 +-
 plugins/mod_component.lua | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 4c018713..6049e12e 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -35,7 +35,7 @@ function new_incoming(conn)
 		getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end;
 	end
 	open_sessions = open_sessions + 1;
-	session.log = logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$"));
+	session.log = logger_init("s2sin"..tostring(session):match("[a-f0-9]+$"));
 	incoming_s2s[session] = true;
 	return session;
 end
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index d505492e..05b2d64b 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -54,7 +54,7 @@ function new_session(conn)
 		end
 	end
 	session.ip = conn:ip();
-	local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
+	local conn_name = "c2s"..tostring(session):match("[a-f0-9]+$");
 	session.log = logger.init(conn_name);
 		
 	return session;
diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index 16084a78..74b02843 100644
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -260,7 +260,7 @@ function listener.onconnect(conn)
 	local session = { type = "component_unauthed", conn = conn, send = function (data) return _send(conn, tostring(data)); end };
 
 	-- Logging functions --
-	local conn_name = "jcp"..tostring(conn):match("[a-f0-9]+$");
+	local conn_name = "jcp"..tostring(session):match("[a-f0-9]+$");
 	session.log = logger.init(conn_name);
 	session.close = session_close;
 	
-- 
cgit v1.2.3


From 255bd1e311f7dfe1dd48651666d677ed0161d272 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 24 Jan 2013 00:59:32 +0100
Subject: mod_s2s: Don't try to close sessions that were destroyed before
 timeout

---
 plugins/mod_s2s/mod_s2s.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index ad628a9b..15c89ced 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -429,6 +429,8 @@ local function initialize_session(session)
 	add_task(connect_timeout, function ()
 		if session.type == "s2sin" or session.type == "s2sout" then
 			return; -- Ok, we're connected
+		elseif session.type == "s2s_destroyed" then
+			return; -- Session already destroyed
 		end
 		-- Not connected, need to close session and clean up
 		(session.log or log)("debug", "Destroying incomplete session %s->%s due to inactivity",
-- 
cgit v1.2.3


From 6132cbab483a3521b4efddf87862ddc68f7f9784 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 24 Jan 2013 16:36:48 +0100
Subject: mod_pubsub: Ignore subscription options for now, fixes traceback due
 to missing form

---
 plugins/mod_pubsub.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 687e38f1..c840c7c2 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -111,10 +111,13 @@ end
 
 function handlers.set_subscribe(origin, stanza, subscribe)
 	local node, jid = subscribe.attr.node, subscribe.attr.jid;
+	--[[
 	local options_tag, options = stanza.tags[1]:get_child("options"), nil;
 	if options_tag then
 		options = options_form:data(options_tag.tags[1]);
 	end
+	--]]
+	local options_tag, options; -- FIXME
 	local ok, ret = service:add_subscription(node, stanza.attr.from, jid, options);
 	local reply;
 	if ok then
-- 
cgit v1.2.3


From f766f157e715eb12d4c5a460127681c80331feb9 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 24 Jan 2013 21:48:45 +0100
Subject: ejabberd2prosody.lua: Replace util.logger with a dummy before
 requiring util.serialization

---
 tools/ejabberd2prosody.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua
index 656f0824..ee9e7821 100755
--- a/tools/ejabberd2prosody.lua
+++ b/tools/ejabberd2prosody.lua
@@ -19,9 +19,9 @@ local erlparse = require "erlparse";
 
 prosody = {};
 
+package.loaded["util.logger"] = {init = function() return function() end; end}
 local serialize = require "util.serialization".serialize;
 local st = require "util.stanza";
-package.loaded["util.logger"] = {init = function() return function() end; end}
 local dm = require "util.datamanager"
 dm.set_data_path("data");
 
-- 
cgit v1.2.3


From f092adcb3c0f8ac58ae1d7462c0101efa968621c Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 25 Jan 2013 00:36:17 +0100
Subject: ejabberd2prosody.lua: Don't make assumptions about file name.

---
 tools/ejabberd2prosody.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua
index ee9e7821..c11e41d9 100755
--- a/tools/ejabberd2prosody.lua
+++ b/tools/ejabberd2prosody.lua
@@ -11,8 +11,8 @@
 
 package.path = package.path ..";../?.lua";
 
-if arg[0]:match("^./") then
-	package.path = package.path .. ";"..arg[0]:gsub("/ejabberd2prosody.lua$", "/?.lua");
+if arg[0]:match("[/\\]") then
+	package.path = package.path .. ";"..arg[0]:gsub("[^/\\]*$", "?.lua");
 end
 
 local erlparse = require "erlparse";
-- 
cgit v1.2.3


From 0767f241531940a9a66eb4be285ee26cd44b57a0 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sat, 26 Jan 2013 03:39:18 +0500
Subject: util.xmppstream: Include error stanza in error message if no error
 handler is available.

---
 util/xmppstream.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index f1793b4f..4909678c 100644
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -45,7 +45,7 @@ function new_sax_handlers(session, stream_callbacks)
 	
 	local cb_streamopened = stream_callbacks.streamopened;
 	local cb_streamclosed = stream_callbacks.streamclosed;
-	local cb_error = stream_callbacks.error or function(session, e) error("XML stream error: "..tostring(e)); end;
+	local cb_error = stream_callbacks.error or function(session, e, stanza) error("XML stream error: "..tostring(e)..(stanza and ": "..tostring(stanza) or ""),2); end;
 	local cb_handlestanza = stream_callbacks.handlestanza;
 	
 	local stream_ns = stream_callbacks.stream_ns or xmlns_streams;
-- 
cgit v1.2.3


From 4196cca0e08cb9c3404f8b10db51714d1abc0286 Mon Sep 17 00:00:00 2001
From: Florian Zeitz <florob@babelmonkeys.de>
Date: Fri, 25 Jan 2013 01:32:14 +0100
Subject: mod_pubsub, util.pubsub: Don't send purge notifications in an
 <items/> element

---
 plugins/mod_pubsub.lua | 21 +++++++++++----------
 util/pubsub.lua        | 27 ++++++++++++++++++---------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index c840c7c2..56fabaec 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -6,6 +6,7 @@ local uuid_generate = require "util.uuid".generate;
 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
 local xmlns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
+local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";
 
 local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", false);
 local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false);
@@ -201,15 +202,12 @@ end
 function handlers.set_purge(origin, stanza, purge)
 	local node, notify = purge.attr.node, purge.attr.notify;
 	notify = (notify == "1") or (notify == "true");
-	local reply, notifier;
+	local reply;
 	if not node then
 		origin.send(st.error_reply(stanza, "modify", "bad-request"));
 		return true;
 	end
-	if notify then
-		notifier = st.stanza("purge");
-	end
-	local ok, ret = service:purge(node, stanza.attr.from, notifier);
+	local ok, ret = service:purge(node, stanza.attr.from, notify);
 	if ok then
 		reply = st.reply(stanza);
 	else
@@ -218,12 +216,14 @@ function handlers.set_purge(origin, stanza, purge)
 	return origin.send(reply);
 end
 
-function simple_broadcast(node, jids, item)
-	item = st.clone(item);
-	item.attr.xmlns = nil; -- Clear the pubsub namespace
+function simple_broadcast(kind, node, jids, item)
+	if item then
+		item = st.clone(item);
+		item.attr.xmlns = nil; -- Clear the pubsub namespace
+	end
 	local message = st.message({ from = module.host, type = "headline" })
 		:tag("event", { xmlns = xmlns_pubsub_event })
-			:tag("items", { node = node })
+			:tag(kind, { node = node })
 				:add_child(item);
 	for jid in pairs(jids) do
 		module:log("debug", "Sending notification to %s", jid);
@@ -232,7 +232,8 @@ function simple_broadcast(node, jids, item)
 	end
 end
 
-module:hook("iq/host/http://jabber.org/protocol/pubsub:pubsub", handle_pubsub_iq);
+module:hook("iq/host/"..xmlns_pubsub..":pubsub", handle_pubsub_iq);
+module:hook("iq/host/"..xmlns_pubsub_owner..":pubsub", handle_pubsub_iq);
 
 local disco_info;
 
diff --git a/util/pubsub.lua b/util/pubsub.lua
index 17795cf1..c77140b9 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -245,7 +245,7 @@ function service:publish(node, actor, id, item)
 	end
 	node_obj.data[id] = item;
 	self.events.fire_event("item-published", { node = node, actor = actor, id = id, item = item });
-	self.config.broadcaster(node, node_obj.subscribers, item);
+	self.config.broadcaster("items", node, node_obj.subscribers, item);
 	return true;
 end
 
@@ -259,19 +259,28 @@ function service:retract(node, actor, id, retract)
 	if (not node_obj) or (not node_obj.data[id]) then
 		return false, "item-not-found";
 	end
-	if id then
-		node_obj.data[id] = nil;
-	else
-		node_obj.data = {}; -- Purge
-	end
+	node_obj.data[id] = nil;
 	if retract then
-		self.config.broadcaster(node, node_obj.subscribers, retract);
+		self.config.broadcaster("items", node, node_obj.subscribers, retract);
 	end
 	return true
 end
 
-function service:purge(node, actor, purge)
-	return self:retract(node, actor, nil, purge);
+function service:purge(node, actor, notify)
+	-- Access checking
+	if not self:may(node, actor, "retract") then
+		return false, "forbidden";
+	end
+	--
+	local node_obj = self.nodes[node];
+	if not node_obj then
+		return false, "item-not-found";
+	end
+	node_obj.data = {}; -- Purge
+	if notify then
+		self.config.broadcaster("purge", node, node_obj.subscribers);
+	end
+	return true
 end
 
 function service:get_items(node, actor, id)
-- 
cgit v1.2.3


From f899900fa53a2ca28dc7805971a42e84ae16f974 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sat, 26 Jan 2013 03:49:45 +0500
Subject: mod_pubsub: Fix nil access error.

---
 plugins/mod_pubsub.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 56fabaec..d39ba0fa 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -318,7 +318,7 @@ module:hook("iq-get/host/http://jabber.org/protocol/disco#items:query", function
 	end
 	local ok, ret = service:get_nodes(event.stanza.attr.from);
 	if not ok then
-		event.origin.send(pubsub_error_reply(stanza, ret));
+		event.origin.send(pubsub_error_reply(event.stanza, ret));
 	else
 		local reply = st.reply(event.stanza)
 			:tag("query", { xmlns = "http://jabber.org/protocol/disco#items" });
-- 
cgit v1.2.3


From 40bfc76ff8bfc16a5097240657ef447c4a232c08 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sat, 26 Jan 2013 03:50:13 +0500
Subject: mod_pubsub: require usermanager.

---
 plugins/mod_pubsub.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index d39ba0fa..56496584 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -2,6 +2,7 @@ local pubsub = require "util.pubsub";
 local st = require "util.stanza";
 local jid_bare = require "util.jid".bare;
 local uuid_generate = require "util.uuid".generate;
+local usermanager = require "core.usermanager";
 
 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
 local xmlns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
-- 
cgit v1.2.3


From f3f1a3c44ece8b6cfbad0cb0f73cfac9f38bc72c Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sat, 26 Jan 2013 03:54:18 +0500
Subject: util.pubsub: Fix nil access error in get_subscriptions.

---
 util/pubsub.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/pubsub.lua b/util/pubsub.lua
index c77140b9..3d97d4ed 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -338,7 +338,7 @@ function service:get_subscriptions(node, actor, jid)
 			if node then -- Return only subscriptions to this node
 				if subscribed_nodes[node] then
 					ret[#ret+1] = {
-						node = subscribed_node;
+						node = subscribed_nodes[node];
 						jid = jid;
 						subscription = node_obj.subscribers[jid];
 					};
-- 
cgit v1.2.3


From d11b41d1dd5cbdbdc3f6ec4752767a5fefbf5798 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 27 Jan 2013 17:11:45 +0100
Subject: mod_component: Look for the correct xmlns (thanks NebuK)

---
 plugins/mod_component.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index 74b02843..68d8a5de 100644
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -313,6 +313,6 @@ module:provides("net", {
 	listener = listener;
 	default_port = 5347;
 	multiplex = {
-		pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:component%1.*>";
+		pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:component:accept%1.*>";
 	};
 });
-- 
cgit v1.2.3


From 9468212a73173752909bb15af9964e6fbb6d154b Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Mon, 28 Jan 2013 01:06:05 +0100
Subject: mod_pubsub: Broadcast items correctly on new subscriptions

---
 plugins/mod_pubsub.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 56496584..8b6aea6c 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -143,7 +143,7 @@ function handlers.set_subscribe(origin, stanza, subscribe)
 		if items then
 			local jids = { [jid] = options or true };
 			for id, item in pairs(items) do
-				service.config.broadcaster(node, jids, item);
+				service.config.broadcaster("items", node, jids, item);
 			end
 		end
 	end
-- 
cgit v1.2.3


From 8a6d52c9319c5c9e4e79bfcc9d27d88fcb5d6b6f Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 31 Jan 2013 15:33:41 +0100
Subject: mod_pubsub: More strict checks for node and ids

---
 plugins/mod_pubsub.lua | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 8b6aea6c..96a9eaae 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -32,6 +32,8 @@ end
 local pubsub_errors = {
 	["conflict"] = { "cancel", "conflict" };
 	["invalid-jid"] = { "modify", "bad-request", nil, "invalid-jid" };
+	["jid-required"] = { "modify", "bad-request", nil, "jid-required" };
+	["nodeid-required"] = { "modify", "bad-request", nil, "nodeid-required" };
 	["item-not-found"] = { "cancel", "item-not-found" };
 	["not-subscribed"] = { "modify", "unexpected-request", nil, "not-subscribed" };
 	["forbidden"] = { "cancel", "forbidden" };
@@ -50,6 +52,9 @@ function handlers.get_items(origin, stanza, items)
 	local item = items:get_child("item");
 	local id = item and item.attr.id;
 	
+	if not node then
+		return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
+	end
 	local ok, results = service:get_items(node, stanza.attr.from, id);
 	if not ok then
 		return origin.send(pubsub_error_reply(stanza, results));
@@ -72,6 +77,9 @@ end
 
 function handlers.get_subscriptions(origin, stanza, subscriptions)
 	local node = subscriptions.attr.node;
+	if not node then
+		return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
+	end
 	local ok, ret = service:get_subscriptions(node, stanza.attr.from, stanza.attr.from);
 	if not ok then
 		return origin.send(pubsub_error_reply(stanza, ret));
@@ -113,6 +121,9 @@ end
 
 function handlers.set_subscribe(origin, stanza, subscribe)
 	local node, jid = subscribe.attr.node, subscribe.attr.jid;
+	if not (node and jid) then
+		return origin.send(pubsub_error_reply(stanza, jid and "nodeid-required" or "invalid-jid"));
+	end
 	--[[
 	local options_tag, options = stanza.tags[1]:get_child("options"), nil;
 	if options_tag then
@@ -151,6 +162,9 @@ end
 
 function handlers.set_unsubscribe(origin, stanza, unsubscribe)
 	local node, jid = unsubscribe.attr.node, unsubscribe.attr.jid;
+	if not (node and jid) then
+		return origin.send(pubsub_error_reply(stanza, jid and "nodeid-required" or "invalid-jid"));
+	end
 	local ok, ret = service:remove_subscription(node, stanza.attr.from, jid);
 	local reply;
 	if ok then
@@ -163,6 +177,9 @@ end
 
 function handlers.set_publish(origin, stanza, publish)
 	local node = publish.attr.node;
+	if not node then
+		return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
+	end
 	local item = publish:get_child("item");
 	local id = (item and item.attr.id) or uuid_generate();
 	local ok, ret = service:publish(node, stanza.attr.from, id, item);
@@ -184,8 +201,7 @@ function handlers.set_retract(origin, stanza, retract)
 	local item = retract:get_child("item");
 	local id = item and item.attr.id
 	if not (node and id) then
-		origin.send(st.error_reply(stanza, "modify", "bad-request"));
-		return true;
+		return origin.send(pubsub_error_reply(stanza, node and "item-not-found" or "nodeid-required"));
 	end
 	local reply, notifier;
 	if notify then
@@ -205,8 +221,7 @@ function handlers.set_purge(origin, stanza, purge)
 	notify = (notify == "1") or (notify == "true");
 	local reply;
 	if not node then
-		origin.send(st.error_reply(stanza, "modify", "bad-request"));
-		return true;
+		return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
 	end
 	local ok, ret = service:purge(node, stanza.attr.from, notify);
 	if ok then
-- 
cgit v1.2.3


From 9f39499470e0a0dc1e91afdcb071e48413baa96a Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 31 Jan 2013 15:48:55 +0100
Subject: portmanager: Make sure foo_ports is a table

---
 core/portmanager.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/portmanager.lua b/core/portmanager.lua
index 7427a8eb..b02ba53b 100644
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -89,11 +89,12 @@ function activate(service_name)
 		or default_interfaces
 	bind_interfaces = set.new(type(bind_interfaces)~="table" and {bind_interfaces} or bind_interfaces);
 	
-	local bind_ports = set.new(config.get("*", config_prefix.."ports")
+	local bind_ports = config.get("*", config_prefix.."ports")
 		or service_info.default_ports
 		or {service_info.default_port
 		    or listener.default_port -- COMPAT w/pre-0.9
-		   });
+		   }
+	bind_ports = set.new(type(bind_ports) ~= "table" and { bind_ports } or bind_ports );
 
 	local mode, ssl = listener.default_mode or "*a";
 	
-- 
cgit v1.2.3


From 5cfdac70c61ae6562f72868ef7b55129b166aa80 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 31 Jan 2013 18:41:01 +0100
Subject: mod_pubsub, util.pubsub: Add delete action

---
 plugins/mod_pubsub.lua | 18 ++++++++++++++++++
 util/pubsub.lua        | 12 ++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 96a9eaae..fe6c0b0a 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -119,6 +119,22 @@ function handlers.set_create(origin, stanza, create)
 	return origin.send(reply);
 end
 
+function handlers.set_delete(origin, stanza, delete)
+	local node = delete.attr.node;
+
+	local reply, notifier;
+	if not node then
+		return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
+	end
+	local ok, ret = service:delete(node, stanza.attr.from);
+	if ok then
+		reply = st.reply(stanza);
+	else
+		reply = pubsub_error_reply(stanza, ret);
+	end
+	return origin.send(reply);
+end
+
 function handlers.set_subscribe(origin, stanza, subscribe)
 	local node, jid = subscribe.attr.node, subscribe.attr.jid;
 	if not (node and jid) then
@@ -258,6 +274,7 @@ local feature_map = {
 	retract = { "delete-items", "retract-items" };
 	purge = { "purge-nodes" };
 	publish = { "publish", autocreate_on_publish and "auto-create" };
+	delete = { "delete-nodes" };
 	get_items = { "retrieve-items" };
 	add_subscription = { "subscribe" };
 	get_subscriptions = { "retrieve-subscriptions" };
@@ -418,6 +435,7 @@ set_service(pubsub.new({
 			create = true;
 			publish = true;
 			retract = true;
+			delete = true;
 			get_nodes = true;
 			
 			subscribe = true;
diff --git a/util/pubsub.lua b/util/pubsub.lua
index 3d97d4ed..e7fc86b1 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -226,6 +226,18 @@ function service:create(node, actor)
 	return ok, err;
 end
 
+function service:delete(node, actor)
+	-- Access checking
+	if not self:may(node, actor, "delete") then
+		return false, "forbidden";
+	end
+	--
+	local node_obj = self.nodes[node];
+	self.nodes[node] = nil;
+	self.config.broadcaster("delete", node, node_obj.subscribers);
+	return true;
+end
+
 function service:publish(node, actor, id, item)
 	-- Access checking
 	if not self:may(node, actor, "publish") then
-- 
cgit v1.2.3