Merge 0.10->trunk

4 files changed, 7 insertions, 16 deletions

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 6aa0a4f0..3224a84d 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -109,7 +109,7 @@ local function make_authenticated(session, username)
 	if not username or #username == 0 then return nil, "Invalid username"; end
 	session.username = username;
 	if session.type == "c2s_unauthed" then
-		session.type = "c2s";
+		session.type = "c2s_unbound";
 	end
 	session.log("info", "Authenticated as %s@%s", username or "(unknown)", session.host or "(unknown)");
 	return true;
@@ -177,6 +177,9 @@ local function bind_resource(session, resource)
 	session.full_jid = session.username .. '@' .. session.host .. '/' .. resource;
 	hosts[session.host].sessions[session.username].sessions[resource] = session;
 	full_sessions[session.full_jid] = session;
+	if session.type == "c2s_unbound" then
+		session.type = "c2s";
+	end
 
 	local err;
 	session.roster, err = rm_load_roster(session.username, session.host);
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index af797f08..98952faf 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -79,16 +79,6 @@ function core_process_stanza(origin, stanza)
 			end
 		end
 
-		if not origin.full_jid
-			and not(name == "iq" and st_type == "set" and stanza.tags[1] and stanza.tags[1].name == "bind"
-					and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then
-			-- authenticated client isn't bound and current stanza is not a bind request
-			if stanza.attr.type ~= "result" and stanza.attr.type ~= "error" then
-				origin.send(st.error_reply(stanza, "auth", "not-authorized")); -- FIXME maybe allow stanzas to account or server
-			end
-			return;
-		end
-
 		-- TODO also, stanzas should be returned to their original state before the function ends
 		stanza.attr.from = origin.full_jid;
 	end
diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 454acebb..24c50678 100644
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -19,7 +19,6 @@ local rm_load_roster = require "core.rostermanager".load_roster;
 local rm_remove_from_roster = require "core.rostermanager".remove_from_roster;
 local rm_add_to_roster = require "core.rostermanager".add_to_roster;
 local rm_roster_push = require "core.rostermanager".roster_push;
-local core_post_stanza = prosody.core_post_stanza;
 
 module:add_feature("jabber:iq:roster");
 
@@ -136,7 +135,6 @@ module:hook_global("user-deleted", function(event)
 	local username, host = event.username, event.host;
 	local origin = event.origin or prosody.hosts[host];
 	if host ~= module.host then return end
-	local bare = username .. "@" .. host;
 	local roster = rm_load_roster(username, host);
 	for jid, item in pairs(roster) do
 		if jid then
@@ -144,9 +142,9 @@ module:hook_global("user-deleted", function(event)
 				username = username, jid = jid, item = item, roster = roster, origin = origin,
 			});
 		else
-			for jid in pairs(item.pending) do
+			for pending_jid in pairs(item.pending) do
 				module:fire_event("roster-item-removed", {
-					username = username, jid = jid, roster = roster, origin = origin,
+					username = username, jid = pending_jid, roster = roster, origin = origin,
 				});
 			end
 		end
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index bb36600b..9917c303 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -273,7 +273,7 @@ module:hook("s2s-stream-features", function(event)
 	end
 end);
 
-module:hook("iq/self/urn:ietf:params:xml:ns:xmpp-bind:bind", function(event)
+module:hook("stanza/iq/urn:ietf:params:xml:ns:xmpp-bind:bind", function(event)
 	local origin, stanza = event.origin, event.stanza;
 	local resource;
 	if stanza.attr.type == "set" then