From b1d1a87772aa583572642c2fc76fa5bba1ca8e9a Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sat, 25 Oct 2008 01:48:34 +0500
Subject: Minor fixes, comments

---
 core/stanza_router.lua | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'core')

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 73924d9c..4b77b6b6 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -44,7 +44,7 @@ function core_process_stanza(origin, stanza)
 	end
 	
 	if not to then
-			core_handle_stanza(origin, stanza);
+		core_handle_stanza(origin, stanza);
 	elseif hosts[to] and hosts[to].type == "local" then
 		core_handle_stanza(origin, stanza);
 	elseif stanza.name == "iq" and not select(3, jid_split(to)) then
@@ -172,6 +172,10 @@ function core_route_stanza(origin, stanza)
 	-- Deliver
 	local to = stanza.attr.to;
 	local node, host, resource = jid_split(to);
+	local to_bare = node and (node.."@"..host) or host; -- bare JID
+	local from = stanza.attr.from;
+	local from_node, from_host, from_resource = jid_split(from);
+	local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
 
 	if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable") then resource = nil; end
 
@@ -188,9 +192,9 @@ function core_route_stanza(origin, stanza)
 						if stanza.attr.type == "probe" then
 							if is_authorized_to_see_presence(origin, node, host) then
 								for k in pairs(user.sessions) do -- return presence for all resources
-									if user.sessions[k].presence then
-										local pres = user.sessions[k].presence;
-										pres.attr.to = origin.full_jid;
+									local pres = user.sessions[k].presence;
+									if pres then
+										pres.attr.to = from; -- FIXME use from_bare?
 										pres.attr.from = user.sessions[k].full_jid;
 										send(origin, pres);
 										pres.attr.to = nil;
@@ -198,7 +202,7 @@ function core_route_stanza(origin, stanza)
 									end
 								end
 							else
-								send(origin, st.presence({from=user.."@"..host, to=origin.username.."@"..origin.host, type="unsubscribed"}));
+								send(origin, st.presence({from=to_bare, to=origin.username.."@"..origin.host, type="unsubscribed"}));
 							end
 						elseif stanza.attr.type == "subscribe" then
 							-- TODO
@@ -206,13 +210,16 @@ function core_route_stanza(origin, stanza)
 							-- TODO
 						elseif stanza.attr.type == "subscribed" then
 							-- TODO
+							-- sender.roster[recipient.bare_jid]. subscription = from or both
+							-- sender.rosterpush recipient
+							-- send presence for all sender resources to recipient.bare_jid
 						elseif stanza.attr.type == "unsubscribed" then
 							-- TODO
 						end -- discard any other type
 					else -- sender is available or unavailable
 						for k in pairs(user.sessions) do -- presence broadcast to all user resources
 							if user.sessions[k].full_jid then
-								stanza.attr.to = user.sessions[k].full_jid;
+								stanza.attr.to = user.sessions[k].full_jid; -- reset at the end of function
 								send(user.sessions[k], stanza);
 							end
 						end
@@ -231,7 +238,7 @@ function core_route_stanza(origin, stanza)
 				end
 			else
 				-- User + resource is online...
-				stanza.attr.to = res.full_jid;
+				stanza.attr.to = res.full_jid; -- reset at the end of function
 				send(res, stanza); -- Yay \o/
 			end
 		else
@@ -239,7 +246,7 @@ function core_route_stanza(origin, stanza)
 			if user_exists(node, host) then
 				if stanza.name == "presence" then
 					if stanza.attr.type == "probe" and is_authorized_to_see_presence(origin, node, host) then -- FIXME what to do for not c2s?
-						-- TODO send last recieved unavailable presence
+						-- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too)
 					else
 						-- TODO send unavailable presence
 					end
@@ -252,7 +259,7 @@ function core_route_stanza(origin, stanza)
 				-- TODO we would get here for nodeless JIDs too. Do something fun maybe? Echo service? Let plugins use xmpp:server/resource addresses?
 				if stanza.name == "presence" then
 					if stanza.attr.type == "probe" then
-						send(origin, st.presence({from = stanza.attr.to, to = stanza.attr.from, type = "unsubscribed"}));
+						send(origin, st.presence({from = to_bare, to = from_bare, type = "unsubscribed"}));
 					end
 					-- else ignore
 				else
@@ -262,10 +269,12 @@ function core_route_stanza(origin, stanza)
 		end
 	elseif origin.type == "c2s" then
 		-- Remote host
+		local xmlns = stanza.attr.xmlns;
 		--stanza.attr.xmlns = "jabber:server";
 		stanza.attr.xmlns = nil;
 		log("debug", "sending s2s stanza: %s", tostring(stanza));
-		send_s2s(origin.host, host, stanza);
+		send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors
+		stanza.attr.xmlns = xmlns; -- reset
 	else
 		log("warn", "received stanza from unhandled connection type: %s", origin.type);
 	end
-- 
cgit v1.2.3


From 17d7c83a7141e6d2142c9dece0845051c85ef592 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sat, 25 Oct 2008 02:16:29 +0500
Subject: Inbound subscription approval

---
 core/rostermanager.lua | 16 +++++++++++++++-
 core/stanza_router.lua | 26 +++++++++++++++++++-------
 2 files changed, 34 insertions(+), 8 deletions(-)

(limited to 'core')

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index c39d28ed..a9be62aa 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -83,7 +83,7 @@ function load_roster(username, host)
 		return roster;
 	end
 	-- Attempt to load roster for non-loaded user
-	-- TODO also support loading for offline user
+	return datamanager.load(username, host, "roster") or {};
 end
 
 function save_roster(username, host)
@@ -93,4 +93,18 @@ function save_roster(username, host)
 	return nil;
 end
 
+function process_inbound_subscription_approval(username, host, jid)
+	local roster = load_roster(username, host);
+	local item = roster[jid];
+	if item and item.ask and (item.subscription == "none" or item.subscription == "from") then
+		if item.subscription == "none" then
+			item.subscription = "to";
+		else
+			item.subscription = "both";
+		end
+		item.ask = nil;
+		return datamanager.store(username, host, "roster", roster);
+	end
+end
+
 return _M;
\ No newline at end of file
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 4b77b6b6..da7433c7 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -12,6 +12,8 @@ local send = require "core.sessionmanager".send_to_session;
 local send_s2s = require "core.s2smanager".send_to_host;
 local user_exists = require "core.usermanager".user_exists;
 
+local rostermanager = require "core.rostermanager";
+
 local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
 local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
 local format = string.format;
@@ -194,15 +196,15 @@ function core_route_stanza(origin, stanza)
 								for k in pairs(user.sessions) do -- return presence for all resources
 									local pres = user.sessions[k].presence;
 									if pres then
-										pres.attr.to = from; -- FIXME use from_bare?
+										pres.attr.to = from; -- FIXME use from_bare or from?
 										pres.attr.from = user.sessions[k].full_jid;
 										send(origin, pres);
-										pres.attr.to = nil;
-										pres.attr.from = nil;
 									end
 								end
+								pres.attr.to = nil;
+								pres.attr.from = nil;
 							else
-								send(origin, st.presence({from=to_bare, to=origin.username.."@"..origin.host, type="unsubscribed"}));
+								send(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"}));
 							end
 						elseif stanza.attr.type == "subscribe" then
 							-- TODO
@@ -210,9 +212,19 @@ function core_route_stanza(origin, stanza)
 							-- TODO
 						elseif stanza.attr.type == "subscribed" then
 							-- TODO
-							-- sender.roster[recipient.bare_jid]. subscription = from or both
-							-- sender.rosterpush recipient
-							-- send presence for all sender resources to recipient.bare_jid
+							if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
+								rostermanager.roster_push(node, host, from_bare);
+								for k in pairs(user.sessions) do -- return presence for all resources
+									local pres = user.sessions[k].presence;
+									if pres then
+										pres.attr.to = from; -- FIXME use from_bare or from?
+										pres.attr.from = user.sessions[k].full_jid;
+										send(origin, pres);
+									end
+								end
+								pres.attr.to = nil;
+								pres.attr.from = nil;
+							end
 						elseif stanza.attr.type == "unsubscribed" then
 							-- TODO
 						end -- discard any other type
-- 
cgit v1.2.3


From 6c822abf42a548865e7907f1f02c8e3344580b4d Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sat, 25 Oct 2008 02:29:58 +0500
Subject: Inbound subscription cancellation

---
 core/rostermanager.lua | 14 ++++++++++++++
 core/stanza_router.lua |  5 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'core')

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index a9be62aa..3cdbbd3a 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -107,4 +107,18 @@ function process_inbound_subscription_approval(username, host, jid)
 	end
 end
 
+function process_inbound_subscription_cancellation(username, host, jid)
+	local roster = load_roster(username, host);
+	local item = roster[jid];
+	if item and (item.subscription == "to" or item.subscription == "both") then
+		if item.subscription == "to" then
+			item.subscription = "none";
+		else
+			item.subscription = "from";
+		end
+		-- FIXME do we need to item.ask = nil;?
+		return datamanager.store(username, host, "roster", roster);
+	end
+end
+
 return _M;
\ No newline at end of file
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index da7433c7..3126bb75 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -211,7 +211,6 @@ function core_route_stanza(origin, stanza)
 						elseif stanza.attr.type == "unsubscribe" then
 							-- TODO
 						elseif stanza.attr.type == "subscribed" then
-							-- TODO
 							if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
 								rostermanager.roster_push(node, host, from_bare);
 								for k in pairs(user.sessions) do -- return presence for all resources
@@ -226,7 +225,9 @@ function core_route_stanza(origin, stanza)
 								pres.attr.from = nil;
 							end
 						elseif stanza.attr.type == "unsubscribed" then
-							-- TODO
+							if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
+								rostermanager.roster_push(node, host, from_bare);
+							end
 						end -- discard any other type
 					else -- sender is available or unavailable
 						for k in pairs(user.sessions) do -- presence broadcast to all user resources
-- 
cgit v1.2.3


From 2ab824859d622653d405e8ea0515e3acca9180f4 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sat, 25 Oct 2008 02:38:24 +0500
Subject: Inbound unsubscribe

---
 core/rostermanager.lua | 14 ++++++++++++++
 core/stanza_router.lua |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 3cdbbd3a..83bb379e 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -121,4 +121,18 @@ function process_inbound_subscription_cancellation(username, host, jid)
 	end
 end
 
+function process_inbound_unsubscribe(username, host, jid)
+	local roster = load_roster(username, host);
+	local item = roster[jid];
+	if item and (item.subscription == "from" or item.subscription == "both") then
+		if item.subscription == "from" then
+			item.subscription = "none";
+		else
+			item.subscription = "to";
+		end
+		item.ask = nil;
+		return datamanager.store(username, host, "roster", roster);
+	end
+end
+
 return _M;
\ No newline at end of file
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 3126bb75..16658f30 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -209,7 +209,9 @@ function core_route_stanza(origin, stanza)
 						elseif stanza.attr.type == "subscribe" then
 							-- TODO
 						elseif stanza.attr.type == "unsubscribe" then
-							-- TODO
+							if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then
+								rostermanager.roster_push(node, host, from_bare);
+							end
 						elseif stanza.attr.type == "subscribed" then
 							if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
 								rostermanager.roster_push(node, host, from_bare);
-- 
cgit v1.2.3


From 9bd8c81c916f22ffb11ce4f11f74edc87002fbb2 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sat, 25 Oct 2008 03:13:10 +0500
Subject: Inbound subscription request

---
 core/rostermanager.lua |  6 ++++++
 core/stanza_router.lua | 11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 83bb379e..7d7fd061 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -135,4 +135,10 @@ function process_inbound_unsubscribe(username, host, jid)
 	end
 end
 
+function is_contact_subscribed(username, host, jid)
+	local roster = load_roster(username, host);
+	local item = roster[jid];
+	return item and (item.subscription == "from" or item.subscription == "both");
+end
+
 return _M;
\ No newline at end of file
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 16658f30..be4f9185 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -207,7 +207,16 @@ function core_route_stanza(origin, stanza)
 								send(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"}));
 							end
 						elseif stanza.attr.type == "subscribe" then
-							-- TODO
+							if rostermanager.is_contact_subscribed(node, host, from_bare) then
+								send(origin, st.presence(from=to_bare, to=from_bare, type="subscribed")); -- already subscribed
+							else
+								local pres = st.presence({from=from_bare}, type="subscribe");
+								for k in pairs(user.sessions) do -- return presence for all resources
+									if user.sessions[k].presence then
+										send(user.sessions[k], pres);
+									end
+								end
+							end
 						elseif stanza.attr.type == "unsubscribe" then
 							if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then
 								rostermanager.roster_push(node, host, from_bare);
-- 
cgit v1.2.3


From 30de4348013dc1f21e916f1b2bb198369ff024bf Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sat, 25 Oct 2008 06:49:48 +0500
Subject: Routing code reorganization

---
 core/sessionmanager.lua |  17 +++++++
 core/stanza_router.lua  | 132 ++++++++++++++++++++++++++----------------------
 2 files changed, 90 insertions(+), 59 deletions(-)

(limited to 'core')

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index a7858d9e..db898693 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -115,4 +115,21 @@ function streamopened(session, attr)
 						session.notopen = nil;
 end
 
+function send_to_available_resources(user, host, stanza)
+	local to = stanza.attr.to;
+	stanza.attr.to = nil;
+	local h = hosts[host];
+	if h and h.type == "local" then
+		local u = h.sessions[user];
+		if u then
+			for k, session in pairs(u.sessions) do
+				if session.presence then
+					session.send(stanza);
+				end
+			end
+		end
+	end
+	stanza.attr.to = to;
+end
+
 return _M;
\ No newline at end of file
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index be4f9185..a5dfa6ce 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -8,11 +8,24 @@ require "core.servermanager"
 local log = require "util.logger".init("stanzarouter")
 
 local st = require "util.stanza";
-local send = require "core.sessionmanager".send_to_session;
+local _send = require "core.sessionmanager".send_to_session;
 local send_s2s = require "core.s2smanager".send_to_host;
+function send(session, stanza)
+	if session.type == "c2s" then
+		_send(session, stanza);
+	else
+		local xmlns = stanza.attr.xmlns;
+		--stanza.attr.xmlns = "jabber:server";
+		stanza.attr.xmlns = nil;
+		log("debug", "sending s2s stanza: %s", tostring(stanza));
+		send_s2s(session.host, host, stanza); -- TODO handle remote routing errors
+		stanza.attr.xmlns = xmlns; -- reset
+	end
+end
 local user_exists = require "core.usermanager".user_exists;
 
 local rostermanager = require "core.rostermanager";
+local sessionmanager = require "core.sessionmanager";
 
 local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
 local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
@@ -79,7 +92,7 @@ function core_handle_stanza(origin, stanza)
 						core_route_stanza(origin, stanza);
 					end
 				end
-				if not origin.presence then -- presence probes on initial presence
+				if not origin.presence then -- presence probes on initial presence -- FIXME does unavailable qualify as initial presence?
 					local probe = st.presence({from = origin.full_jid, type = "probe"});
 					for jid in pairs(origin.roster) do -- probe all contacts we are subscribed to
 						local subscription = origin.roster[jid].subscription;
@@ -161,10 +174,59 @@ function core_handle_stanza(origin, stanza)
 	end
 end
 
-function is_authorized_to_see_presence(origin, username, host)
-	local roster = datamanager.load(username, host, "roster") or {};
-	local item = roster[origin.username.."@"..origin.host];
-	return item and (item.subscription == "both" or item.subscription == "from");
+function send_presence_of_available_resources(user, host, jid, recipient_session)
+	local h = hosts[host];
+	local count = 0;
+	if h and h.type == "local" then
+		local u = h.sessions[user];
+		if u then
+			for k, session in pairs(u.sessions) do
+				local pres = session.presence;
+				if pres then
+					pres.attr.to = jid;
+					pres.attr.from = session.full_jid;
+					send(recipient_session, pres);
+					pres.attr.to = nil;
+					pres.attr.from = nil;
+					count = count + 1;
+				end
+			end
+		end
+	end
+	return count;
+end
+
+function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare)
+	local node, host = jid_split(to_bare);
+	if stanza.attr.type == "probe" then
+		if rostermanager.is_contact_subscribed(node, host, from_bare) then
+			if 0 == send_presence_of_available_resources(node, host, from_bare, origin) then
+				-- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too)
+			end
+		else
+			send(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"}));
+		end
+	elseif stanza.attr.type == "subscribe" then
+		if rostermanager.is_contact_subscribed(node, host, from_bare) then
+			send(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed
+		else
+			sessionmanager.send_to_available_resources(node, host, st.presence({from=from_bare, type="subscribe"}));
+			-- TODO store when no resources online
+		end
+	elseif stanza.attr.type == "unsubscribe" then
+		if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then
+			rostermanager.roster_push(node, host, from_bare);
+		end
+	elseif stanza.attr.type == "subscribed" then
+		if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
+			rostermanager.roster_push(node, host, from_bare);
+			send_presence_of_available_resources(node, host, from_bare, origin);
+		end
+	elseif stanza.attr.type == "unsubscribed" then
+		if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
+			rostermanager.roster_push(node, host, from_bare);
+		end
+	end -- discard any other type
 end
 
 function core_route_stanza(origin, stanza)
@@ -191,57 +253,9 @@ function core_route_stanza(origin, stanza)
 				-- if we get here, resource was not specified or was unavailable
 				if stanza.name == "presence" then
 					if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
-						if stanza.attr.type == "probe" then
-							if is_authorized_to_see_presence(origin, node, host) then
-								for k in pairs(user.sessions) do -- return presence for all resources
-									local pres = user.sessions[k].presence;
-									if pres then
-										pres.attr.to = from; -- FIXME use from_bare or from?
-										pres.attr.from = user.sessions[k].full_jid;
-										send(origin, pres);
-									end
-								end
-								pres.attr.to = nil;
-								pres.attr.from = nil;
-							else
-								send(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"}));
-							end
-						elseif stanza.attr.type == "subscribe" then
-							if rostermanager.is_contact_subscribed(node, host, from_bare) then
-								send(origin, st.presence(from=to_bare, to=from_bare, type="subscribed")); -- already subscribed
-							else
-								local pres = st.presence({from=from_bare}, type="subscribe");
-								for k in pairs(user.sessions) do -- return presence for all resources
-									if user.sessions[k].presence then
-										send(user.sessions[k], pres);
-									end
-								end
-							end
-						elseif stanza.attr.type == "unsubscribe" then
-							if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then
-								rostermanager.roster_push(node, host, from_bare);
-							end
-						elseif stanza.attr.type == "subscribed" then
-							if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
-								rostermanager.roster_push(node, host, from_bare);
-								for k in pairs(user.sessions) do -- return presence for all resources
-									local pres = user.sessions[k].presence;
-									if pres then
-										pres.attr.to = from; -- FIXME use from_bare or from?
-										pres.attr.from = user.sessions[k].full_jid;
-										send(origin, pres);
-									end
-								end
-								pres.attr.to = nil;
-								pres.attr.from = nil;
-							end
-						elseif stanza.attr.type == "unsubscribed" then
-							if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
-								rostermanager.roster_push(node, host, from_bare);
-							end
-						end -- discard any other type
+						handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare);
 					else -- sender is available or unavailable
-						for k in pairs(user.sessions) do -- presence broadcast to all user resources
+						for k in pairs(user.sessions) do -- presence broadcast to all user resources. FIXME should this be just for available resources? Do we need to check subscription?
 							if user.sessions[k].full_jid then
 								stanza.attr.to = user.sessions[k].full_jid; -- reset at the end of function
 								send(user.sessions[k], stanza);
@@ -269,10 +283,10 @@ function core_route_stanza(origin, stanza)
 			-- user not online
 			if user_exists(node, host) then
 				if stanza.name == "presence" then
-					if stanza.attr.type == "probe" and is_authorized_to_see_presence(origin, node, host) then -- FIXME what to do for not c2s?
-						-- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too)
+					if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
+						handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare);
 					else
-						-- TODO send unavailable presence
+						-- TODO send unavailable presence or unsubscribed
 					end
 				elseif stanza.name == "message" then
 					-- TODO send message error, or store offline messages
-- 
cgit v1.2.3


From 091e961c40b6d89f548efecea07e641e3f9c4210 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sat, 25 Oct 2008 21:16:08 +0500
Subject: Outbound presence subscription

---
 core/rostermanager.lua  | 136 +++++++++++++++++++++++++++++++++++++++++++++---
 core/sessionmanager.lua |   3 ++
 core/stanza_router.lua  |  42 ++++++++++++++-
 3 files changed, 171 insertions(+), 10 deletions(-)

(limited to 'core')

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 7d7fd061..ffc4f481 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -96,10 +96,10 @@ end
 function process_inbound_subscription_approval(username, host, jid)
 	local roster = load_roster(username, host);
 	local item = roster[jid];
-	if item and item.ask and (item.subscription == "none" or item.subscription == "from") then
+	if item and item.ask then
 		if item.subscription == "none" then
 			item.subscription = "to";
-		else
+		else -- subscription == from
 			item.subscription = "both";
 		end
 		item.ask = nil;
@@ -110,13 +110,21 @@ end
 function process_inbound_subscription_cancellation(username, host, jid)
 	local roster = load_roster(username, host);
 	local item = roster[jid];
-	if item and (item.subscription == "to" or item.subscription == "both") then
+	local changed = nil;
+	if is_contact_pending_out(username, host, jid) then
+		item.ask = nil;
+		changed = true;
+	end
+	if item then
 		if item.subscription == "to" then
 			item.subscription = "none";
-		else
+			changed = true;
+		elseif item.subscription == "both" then
 			item.subscription = "from";
+			changed = true;
 		end
-		-- FIXME do we need to item.ask = nil;?
+	end
+	if changed then
 		return datamanager.store(username, host, "roster", roster);
 	end
 end
@@ -124,13 +132,21 @@ end
 function process_inbound_unsubscribe(username, host, jid)
 	local roster = load_roster(username, host);
 	local item = roster[jid];
-	if item and (item.subscription == "from" or item.subscription == "both") then
+	local changed = nil;
+	if is_contact_pending_in(username, host, jid) then
+		roster.pending[jid] = nil; -- TODO maybe delete roster.pending if empty?
+		changed = true;
+	end
+	if item then
 		if item.subscription == "from" then
 			item.subscription = "none";
-		else
+			changed = true;
+		elseif item.subscription == "both" then
 			item.subscription = "to";
+			changed = true;
 		end
-		item.ask = nil;
+	end
+	if changed then
 		return datamanager.store(username, host, "roster", roster);
 	end
 end
@@ -141,4 +157,108 @@ function is_contact_subscribed(username, host, jid)
 	return item and (item.subscription == "from" or item.subscription == "both");
 end
 
+function is_contact_pending_in(username, host, jid)
+	local roster = load_roster(username, host);
+	return roster.pending or roster.pending[jid];
+end
+function set_contact_pending_in(username, host, jid, pending)
+	local roster = load_roster(username, host);
+	local item = roster[jid];
+	if item and (item.subscription == "from" or item.subscription == "both") then
+		return; -- false
+	end
+	if not roster.pending then roster.pending = {}; end
+	roster.pending[jid] = true;
+	return datamanager.store(username, host, "roster", roster);
+end
+function is_contact_pending_out(username, host, jid)
+	local roster = load_roster(username, host);
+	local item = roster[jid];
+	return item and item.ask;
+end
+function set_contact_pending_out(username, host, jid) -- subscribe
+	local roster = load_roster(username, host);
+	local item = roster[jid];
+	if item and (item.ask or item.subscription == "to" or item.subscription == "both") then
+		return true;
+	end
+	if not item then
+		item = {subscription = "none"};
+		roster[jid] = item;
+	end
+	item.ask = "subscribe";
+	return datamanager.store(username, host, "roster", roster);
+end
+function unsubscribe(username, host, jid)
+	local roster = load_roster(username, host);
+	local item = roster[jid];
+	if not item then return false; end
+	if (item.subscription == "from" or item.subscription == "none") and not item.ask then
+		return true;
+	end
+	item.ask = nil;
+	if item.subscription == "both" then
+		item.subscription = "from";
+	elseif item.subscription == "to" then
+		item.subscription = "none";
+	end
+	return datamanager.store(username, host, "roster", roster);
+end
+function subscribed(username, host, jid)
+	if is_contact_pending_in(username, host, jid) then
+		local roster = load_roster(username, host);
+		local item = roster[jid];
+		if item.subscription == "none" then
+			item.subscription = "from";
+		else -- subscription == to
+			item.subsctiption = "both";
+		end
+		roster.pending[jid] = nil;
+		-- TODO maybe remove roster.pending if empty
+		return datamanager.store(username, host, "roster", roster);
+	end -- TODO else implement optional feature pre-approval (ask = subscribed)
+end
+function unsubscribed(username, host, jid)
+	local roster = load_roster(username, host);
+	local item = roster[jid];
+	local pending = is_contact_pending_in(username, host, jid);
+	local changed = nil;
+	if is_contact_pending_in(username, host, jid) then
+		roster.pending[jid] = nil; -- TODO maybe delete roster.pending if empty?
+		changed = true;
+	end
+	if item then
+		if item.subscription == "from" then
+			item.subscription = "none";
+			changed = true;
+		elseif item.subscription == both then
+			item.subscription = "to";
+			changed = true;
+		end
+	end
+	if changed then
+		return datamanager.store(username, host, "roster", roster);
+	end
+end
+
+function process_outbound_subscription_request(username, host, jid)
+	local roster = load_roster(username, host);
+	local item = roster[jid];
+	if item and (item.subscription == "none" or item.subscription == "from") then
+		item.ask = "subscribe";
+		return datamanager.store(username, host, "roster", roster);
+	end
+end
+
+--[[function process_outbound_subscription_approval(username, host, jid)
+	local roster = load_roster(username, host);
+	local item = roster[jid];
+	if item and (item.subscription == "none" or item.subscription == "from" then
+		item.ask = "subscribe";
+		return datamanager.store(username, host, "roster", roster);
+	end
+end]]
+
+
+
 return _M;
\ No newline at end of file
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index db898693..82a001c1 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -116,6 +116,7 @@ function streamopened(session, attr)
 end
 
 function send_to_available_resources(user, host, stanza)
+	local count = 0;
 	local to = stanza.attr.to;
 	stanza.attr.to = nil;
 	local h = hosts[host];
@@ -125,11 +126,13 @@ function send_to_available_resources(user, host, stanza)
 			for k, session in pairs(u.sessions) do
 				if session.presence then
 					session.send(stanza);
+					count = count + 1;
 				end
 			end
 		end
 	end
 	stanza.attr.to = to;
+	return count;
 end
 
 return _M;
\ No newline at end of file
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index a5dfa6ce..8293747a 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -196,6 +196,41 @@ function send_presence_of_available_resources(user, host, jid, recipient_session
 	return count;
 end
 
+function handle_outbound_presence_subscriptions(origin, stanza, from_bare, to_bare)
+	local node, host = jid_split(to_bare);
+	if stanza.attr.type == "subscribe" then
+		-- 1. route stanza
+		-- 2. roster push (subscription = none, ask = subscribe)
+		if rostermanager.set_contact_pending_out(node, host, from_bare) then
+			rostermanager.roster_push(node, host, from_bare);
+		end -- else file error
+		core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="subscribe"}));
+	elseif stanza.attr.type == "unsubscribe" then
+		-- 1. route stanza
+		-- 2. roster push (subscription = none or from)
+		if rostermanager.unsubscribe(node, host, from_bare) then
+			rostermanager.roster_push(node, host, from_bare); -- FIXME do roster push when roster has in fact not changed?
+		end -- else file error
+		core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="unsubscribe"}));
+	elseif stanza.attr.type == "subscribed" then
+		-- 1. route stanza
+		-- 2. roster_push ()
+		-- 3. send_presence_of_available_resources
+		if rostermanager.subscribed(node, host, from_bare) then
+			rostermanager.roster_push(node, host, from_bare);
+			core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="subscribed"}));
+			send_presence_of_available_resources(user, host, from_bare, origin);
+		end
+	elseif stanza.attr.type == "unsubscribed" then
+		-- 1. route stanza
+		-- 2. roster push (subscription = none or to)
+		if rostermanager.unsubscribed(node, host, from_bare) then
+			rostermanager.roster_push(node, host, from_bare);
+			core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="unsubscribed"}));
+		end
+	end
+end
+
 function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare)
 	local node, host = jid_split(to_bare);
 	if stanza.attr.type == "probe" then
@@ -210,8 +245,11 @@ function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_b
 		if rostermanager.is_contact_subscribed(node, host, from_bare) then
 			send(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed
 		else
-			sessionmanager.send_to_available_resources(node, host, st.presence({from=from_bare, type="subscribe"}));
-			-- TODO store when no resources online
+			if not rostermanager.is_contact_pending(node, host, from_bare) then
+				if rostermanager.set_contact_pending(node, host, from_bare) then
+					sessionmanager.send_to_available_resources(node, host, st.presence({from=from_bare, type="subscribe"}));
+				end -- TODO else return error, unable to save
+			end
 		end
 	elseif stanza.attr.type == "unsubscribe" then
 		if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then
-- 
cgit v1.2.3


From 1746f7eea0135b89a4f871d11c71cded04c4c0c3 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Sun, 26 Oct 2008 00:22:18 +0500
Subject: Bug fixes and checks for presence subscriptions, etc

---
 core/rostermanager.lua | 13 +++++++----
 core/stanza_router.lua | 61 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 49 insertions(+), 25 deletions(-)

(limited to 'core')

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index ffc4f481..7d8d4ee1 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -49,7 +49,7 @@ function remove_from_roster(session, jid)
 end
 
 function roster_push(username, host, jid)
-	if hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then
+	if jid ~= "pending" and hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then
 		local item = hosts[host].sessions[username].roster[jid];
 		local stanza = st.iq({type="set"});
 		stanza:tag("query", {xmlns = "jabber:iq:roster"});
@@ -74,19 +74,23 @@ function roster_push(username, host, jid)
 end
 
 function load_roster(username, host)
+	log("debug", "load_roster: asked for: "..username.."@"..host);
 	if hosts[host] and hosts[host].sessions[username] then
 		local roster = hosts[host].sessions[username].roster;
 		if not roster then
+			log("debug", "load_roster: loading for new user: "..username.."@"..host);
 			roster = datamanager.load(username, host, "roster") or {};
 			hosts[host].sessions[username].roster = roster;
 		end
 		return roster;
 	end
 	-- Attempt to load roster for non-loaded user
+	log("debug", "load_roster: loading for offline user: "..username.."@"..host);
 	return datamanager.load(username, host, "roster") or {};
 end
 
 function save_roster(username, host)
+	log("debug", "save_roster: saving roster for "..username.."@"..host);
 	if hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then
 		return datamanager.store(username, host, "roster", hosts[host].sessions[username].roster);
 	end
@@ -159,7 +163,7 @@ end
 
 function is_contact_pending_in(username, host, jid)
 	local roster = load_roster(username, host);
-	return roster.pending or roster.pending[jid];
+	return roster.pending and roster.pending[jid];
 end
 function set_contact_pending_in(username, host, jid, pending)
 	local roster = load_roster(username, host);
@@ -183,10 +187,11 @@ function set_contact_pending_out(username, host, jid) -- subscribe
 		return true;
 	end
 	if not item then
-		item = {subscription = "none"};
+		item = {subscription = "none", groups = {}};
 		roster[jid] = item;
 	end
 	item.ask = "subscribe";
+	log("debug", "set_contact_pending_out: saving roster; set "..username.."@"..host..".roster["..jid.."].ask=subscribe");
 	return datamanager.store(username, host, "roster", roster);
 end
 function unsubscribe(username, host, jid)
@@ -211,7 +216,7 @@ function subscribed(username, host, jid)
 		if item.subscription == "none" then
 			item.subscription = "from";
 		else -- subscription == to
-			item.subsctiption = "both";
+			item.subscription = "both";
 		end
 		roster.pending[jid] = nil;
 		-- TODO maybe remove roster.pending if empty
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 8293747a..d63dfaf3 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -60,6 +60,12 @@ function core_process_stanza(origin, stanza)
 	
 	if not to then
 		core_handle_stanza(origin, stanza);
+	elseif origin.type == "c2s" and stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
+		local node, host = jid_split(stanza.attr.to);
+		local to_bare = node and (node.."@"..host) or host; -- bare JID
+		local from_node, from_host = jid_split(stanza.attr.from);
+		local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
+		handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare);
 	elseif hosts[to] and hosts[to].type == "local" then
 		core_handle_stanza(origin, stanza);
 	elseif stanza.name == "iq" and not select(3, jid_split(to)) then
@@ -196,75 +202,88 @@ function send_presence_of_available_resources(user, host, jid, recipient_session
 	return count;
 end
 
-function handle_outbound_presence_subscriptions(origin, stanza, from_bare, to_bare)
-	local node, host = jid_split(to_bare);
+function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare)
+	local node, host = jid_split(from_bare);
+	local st_from, st_to = stanza.attr.from, stanza.attr.to;
+	stanza.attr.from, stanza.attr.to = from_bare, to_bare;
 	if stanza.attr.type == "subscribe" then
+		log("debug", "outbound subscribe from "..from_bare.." for "..to_bare);
 		-- 1. route stanza
 		-- 2. roster push (subscription = none, ask = subscribe)
-		if rostermanager.set_contact_pending_out(node, host, from_bare) then
-			rostermanager.roster_push(node, host, from_bare);
+		if rostermanager.set_contact_pending_out(node, host, to_bare) then
+			rostermanager.roster_push(node, host, to_bare);
 		end -- else file error
-		core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="subscribe"}));
+		core_route_stanza(origin, stanza);
 	elseif stanza.attr.type == "unsubscribe" then
+		log("debug", "outbound unsubscribe from "..from_bare.." for "..to_bare);
 		-- 1. route stanza
 		-- 2. roster push (subscription = none or from)
-		if rostermanager.unsubscribe(node, host, from_bare) then
-			rostermanager.roster_push(node, host, from_bare); -- FIXME do roster push when roster has in fact not changed?
+		if rostermanager.unsubscribe(node, host, to_bare) then
+			rostermanager.roster_push(node, host, to_bare); -- FIXME do roster push when roster has in fact not changed?
 		end -- else file error
-		core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="unsubscribe"}));
+		core_route_stanza(origin, stanza);
 	elseif stanza.attr.type == "subscribed" then
+		log("debug", "outbound subscribed from "..from_bare.." for "..to_bare);
 		-- 1. route stanza
 		-- 2. roster_push ()
 		-- 3. send_presence_of_available_resources
-		if rostermanager.subscribed(node, host, from_bare) then
-			rostermanager.roster_push(node, host, from_bare);
-			core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="subscribed"}));
-			send_presence_of_available_resources(user, host, from_bare, origin);
+		if rostermanager.subscribed(node, host, to_bare) then
+			rostermanager.roster_push(node, host, to_bare);
+			core_route_stanza(origin, stanza);
+			send_presence_of_available_resources(node, host, to_bare, origin);
 		end
 	elseif stanza.attr.type == "unsubscribed" then
+		log("debug", "outbound unsubscribed from "..from_bare.." for "..to_bare);
 		-- 1. route stanza
 		-- 2. roster push (subscription = none or to)
-		if rostermanager.unsubscribed(node, host, from_bare) then
-			rostermanager.roster_push(node, host, from_bare);
-			core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="unsubscribed"}));
+		if rostermanager.unsubscribed(node, host, to_bare) then
+			rostermanager.roster_push(node, host, to_bare);
+			core_route_stanza(origin, stanza);
 		end
 	end
+	stanza.attr.from, stanza.attr.to = st_from, st_to;
 end
 
 function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare)
 	local node, host = jid_split(to_bare);
+	local st_from, st_to = stanza.attr.from, stanza.attr.to;
+	stanza.attr.from, stanza.attr.to = from_bare, to_bare;
 	if stanza.attr.type == "probe" then
 		if rostermanager.is_contact_subscribed(node, host, from_bare) then
 			if 0 == send_presence_of_available_resources(node, host, from_bare, origin) then
 				-- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too)
 			end
 		else
-			send(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"}));
+			core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"}));
 		end
 	elseif stanza.attr.type == "subscribe" then
+		log("debug", "inbound subscribe from "..from_bare.." for "..to_bare);
 		if rostermanager.is_contact_subscribed(node, host, from_bare) then
-			send(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed
+			core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed
 		else
-			if not rostermanager.is_contact_pending(node, host, from_bare) then
-				if rostermanager.set_contact_pending(node, host, from_bare) then
-					sessionmanager.send_to_available_resources(node, host, st.presence({from=from_bare, type="subscribe"}));
+			if not rostermanager.is_contact_pending_in(node, host, from_bare) then
+				if rostermanager.set_contact_pending_in(node, host, from_bare) then
+					sessionmanager.send_to_available_resources(node, host, stanza);
 				end -- TODO else return error, unable to save
 			end
 		end
 	elseif stanza.attr.type == "unsubscribe" then
+		log("debug", "inbound unsubscribe from "..from_bare.." for "..to_bare);
 		if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then
 			rostermanager.roster_push(node, host, from_bare);
 		end
 	elseif stanza.attr.type == "subscribed" then
+		log("debug", "inbound subscribed from "..from_bare.." for "..to_bare);
 		if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
 			rostermanager.roster_push(node, host, from_bare);
-			send_presence_of_available_resources(node, host, from_bare, origin);
 		end
 	elseif stanza.attr.type == "unsubscribed" then
+		log("debug", "inbound unsubscribed from "..from_bare.." for "..to_bare);
 		if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
 			rostermanager.roster_push(node, host, from_bare);
 		end
 	end -- discard any other type
+	stanza.attr.from, stanza.attr.to = st_from, st_to;
 end
 
 function core_route_stanza(origin, stanza)
-- 
cgit v1.2.3