Software / code / prosody
Changeset
62:9ec0d447cc9e
Merged mod_InBandRegistration from waqas
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 05 Oct 2008 01:32:43 +0100 |
| parents | 61:7afc23a8114e (current diff) 60:44800be871f5 (diff) |
| children | 63:4c27740fdeff |
| files | util/stanza.lua |
| diffstat | 4 files changed, 103 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/core/modulemanager.lua Sun Oct 05 01:31:27 2008 +0100 +++ b/core/modulemanager.lua Sun Oct 05 01:32:43 2008 +0100 @@ -48,6 +48,7 @@ load("saslauth"); load("legacyauth"); load("roster"); + load("InBandRegistration"); end function load(name)
--- a/core/usermanager.lua Sun Oct 05 01:31:27 2008 +0100 +++ b/core/usermanager.lua Sun Oct 05 01:32:43 2008 +0100 @@ -12,4 +12,12 @@ 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/mod_InBandRegistration.lua Sun Oct 05 01:32:43 2008 +0100 @@ -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);
--- a/util/stanza.lua Sun Oct 05 01:31:27 2008 +0100 +++ b/util/stanza.lua Sun Oct 05 01:32:43 2008 +0100 @@ -123,6 +123,16 @@ 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
