Merged mod_InBandRegistration from waqas

4 files changed, 103 insertions, 0 deletions

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 6d803a26..0aaf4d1f 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -48,6 +48,7 @@ function loadall()
 	load("saslauth");
 	load("legacyauth");
 	load("roster");
+	load("InBandRegistration");
 end
 
 function load(name)
diff --git a/core/usermanager.lua b/core/usermanager.lua
index 0f303b24..e38acc87 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -12,4 +12,12 @@ function validate_credentials(host, username, password)
 	return false;
 end
 
+function user_exists(username, host)
+	return datamanager.load(username, host, "accounts") ~= nil;
+end
+
+function create_user(username, password, host)
+	return datamanager.store(username, host, "accounts", {password = password});
+end
+
 return _M;
\ No newline at end of file
diff --git a/plugins/mod_InBandRegistration.lua b/plugins/mod_InBandRegistration.lua
new file mode 100644
index 00000000..b1bf4cc0
--- /dev/null
+++ b/plugins/mod_InBandRegistration.lua
@@ -0,0 +1,84 @@
+
+local st = require "util.stanza";
+local send = require "core.sessionmanager".send_to_session;
+local usermanager_user_exists = require "core.usermanager".user_exists;
+local usermanager_create_user = require "core.usermanager".create_user;
+
+add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
+	if stanza.tags[1].name == "query" then
+		local query = stanza.tags[1];
+		if stanza.attr.type == "get" then
+			local reply = st.reply(stanza);
+			reply:tag("query", {xmlns = "jabber:iq:register"})
+				:tag("registered"):up()
+				:tag("username"):text(session.username):up()
+				:tag("password"):up();
+			send(session, reply);
+		elseif stanza.attr.type == "set" then
+			if query.tags[1] and query.tags[1].name == "remove" then
+				-- TODO delete user auth data, send iq response, kick all user resources with a <not-authorized/>, delete all user data
+				send(session, st.error_reply(stanza, "cancel", "not-allowed"));
+			else
+				local username = query:child_with_name("username");
+				local password = query:child_with_name("password");
+				if username and password then
+					-- FIXME shouldn't use table.concat
+					username = table.concat(username);
+					password = table.concat(password);
+					if username == session.username then
+						if usermanager_create_user(username, password, session.host) then -- password change -- TODO is this the right way?
+							send(session, st.reply(stanza));
+						else
+							-- TODO internal error, unable to write file, file may be locked, etc
+						end
+					else
+						send(session, st.error_reply(stanza, "modify", "bad-request"));
+					end
+				else
+					send(session, st.error_reply(stanza, "modify", "bad-request"));
+				end
+			end
+		end
+	else
+		send(session, st.error_reply(stanza, "cancel", "service-unavailable"));
+	end;
+end);
+
+add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, stanza)
+	if stanza.tags[1].name == "query" then
+		local query = stanza.tags[1];
+		if stanza.attr.type == "get" then
+			local reply = st.reply(stanza);
+			reply:tag("query", {xmlns = "jabber:iq:register"})
+				:tag("instructions"):text("Choose a username and password for use with this service."):up()
+				:tag("username"):up()
+				:tag("password"):up();
+			send(session, reply);
+		elseif stanza.attr.type == "set" then
+			if query.tags[1] and query.tags[1].name == "remove" then
+				send(session, st.error_reply(stanza, "auth", "registration-required"));
+			else
+				local username = query:child_with_name("username");
+				local password = query:child_with_name("password");
+				if username and password then
+					-- FIXME shouldn't use table.concat
+					username = table.concat(username);
+					password = table.concat(password);
+					if usermanager_user_exists(username, session.host) then
+						send(session, st.error_reply(stanza, "cancel", "conflict"));
+					else
+						if usermanager_create_user(username, password, session.host) then
+							send(session, st.reply(stanza)); -- user created!
+						else
+							-- TODO internal error, unable to write file, file may be locked, etc
+						end
+					end
+				else
+					send(session, st.error_reply(stanza, "modify", "not-acceptable"));
+				end
+			end
+		end
+	else
+		send(session, st.error_reply(stanza, "cancel", "service-unavailable"));
+	end;
+end);
diff --git a/util/stanza.lua b/util/stanza.lua
index 73f58747..85595664 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -123,6 +123,16 @@ function reply(orig)
 	return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or nil) });
 end
 
+function error_reply(orig, type, condition, message, clone)
+	local r = reply(orig);
+	t.attr.type = "error";
+	-- TODO use clone
+	t:tag("error", {type = type})
+		:tag(condition, {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
+	if (message) then t:tag("text"):text(message):up(); end
+	return t; -- stanza ready for adding app-specific errors
+end
+
 function presence(attr)
 	return stanza("presence", attr);
 end