Software `/` code `/` prosody

Annotate

plugins/mod_register.lua @ 5877:615a0774e4cc

util.timer: Updated to use util.indexedbheap to provide a more complete API. Timers can now be stopped or rescheduled. Callbacks are now pcall'd. Adding/removing timers from within timer callbacks works better. Optional parameter can be passed when creating timer which gets passed to callback, eliminating the need for closures in various timer uses. Timers are now much more lightweight.

author	Waqas Hussain <waqas20@gmail.com>
date	Wed, 30 Oct 2013 17:44:42 -0400
parent	5776:bd0ff8ae98a8
child	7017:ff734a602886

rev	line source
1523 841d61be198f Remove version number from copyright headers Matthew Wild <mwild1@gmail.com> parents: 1189 diff changeset	1 -- Prosody IM
2923 b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2448 diff changeset	2 -- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2448 diff changeset	3 -- Copyright (C) 2008-2010 Waqas Hussain
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5763 diff changeset	4 --
758 b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 691 diff changeset	5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 691 diff changeset	6 -- COPYING file in the source package for more information.
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	7 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	8
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 438 diff changeset	9
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	10 local st = require "util.stanza";
4398 acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	11 local dataform_new = require "util.dataforms".new;
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	12 local usermanager_user_exists = require "core.usermanager".user_exists;
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	13 local usermanager_create_user = require "core.usermanager".create_user;
2935 4e4d0d899d9d mod_register: Use set_password to set passwords instead of create_user. Waqas Hussain <waqas20@gmail.com> parents: 2923 diff changeset	14 local usermanager_set_password = require "core.usermanager".set_password;
3996 7f35b292531b mod_register: Change to use new delete_user auth provider method Matthew Wild <mwild1@gmail.com> parents: 3995 diff changeset	15 local usermanager_delete_user = require "core.usermanager".delete_user;
690 e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	16 local os_time = os.time;
927 cc180d25dbeb Fixed: mod_register: Node prepping was not being applied to usernames (part of issue #57) Waqas Hussain <waqas20@gmail.com> parents: 926 diff changeset	17 local nodeprep = require "util.encodings".stringprep.nodeprep;
3995 e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	18 local jid_bare = require "util.jid".bare;
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	19
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	20 local compat = module:get_option_boolean("registration_compat", true);
4270 d2d47fde9811 mod_register: Change the default for 'allow_registration' from true to false, most users shouldn't be affected as allow_registration is already explicitly set in the default config file. Matthew Wild <mwild1@gmail.com> parents: 4269 diff changeset	21 local allow_registration = module:get_option_boolean("allow_registration", false);
4398 acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	22 local additional_fields = module:get_option("additional_registration_fields", {});
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	23
5500 eeea0eb2602a mod_auth_internal_hashed, mod_auth_internal_plain, mod_privacy, mod_private, mod_register, mod_vcard, mod_muc: Use module:open_store() Kim Alvefur <zash@zash.se> parents: 5371 diff changeset	24 local account_details = module:open_store("account_details");
eeea0eb2602a mod_auth_internal_hashed, mod_auth_internal_plain, mod_privacy, mod_private, mod_register, mod_vcard, mod_muc: Use module:open_store() Kim Alvefur <zash@zash.se> parents: 5371 diff changeset	25
4398 acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	26 local field_map = {
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	27 username = { name = "username", type = "text-single", label = "Username", required = true };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	28 password = { name = "password", type = "text-private", label = "Password", required = true };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	29 nick = { name = "nick", type = "text-single", label = "Nickname" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	30 name = { name = "name", type = "text-single", label = "Full Name" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	31 first = { name = "first", type = "text-single", label = "Given Name" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	32 last = { name = "last", type = "text-single", label = "Family Name" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	33 email = { name = "email", type = "text-single", label = "Email" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	34 address = { name = "address", type = "text-single", label = "Street" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	35 city = { name = "city", type = "text-single", label = "City" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	36 state = { name = "state", type = "text-single", label = "State" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	37 zip = { name = "zip", type = "text-single", label = "Postal code" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	38 phone = { name = "phone", type = "text-single", label = "Telephone number" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	39 url = { name = "url", type = "text-single", label = "Webpage" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	40 date = { name = "date", type = "text-single", label = "Birth date" };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	41 };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	42
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	43 local registration_form = dataform_new{
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	44 title = "Creating a new account";
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	45 instructions = "Choose a username and password for use with this service.";
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	46
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	47 field_map.username;
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	48 field_map.password;
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	49 };
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	50
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	51 local registration_query = st.stanza("query", {xmlns = "jabber:iq:register"})
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	52 :tag("instructions"):text("Choose a username and password for use with this service."):up()
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	53 :tag("username"):up()
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	54 :tag("password"):up();
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	55
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	56 for _, field in ipairs(additional_fields) do
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	57 if type(field) == "table" then
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	58 registration_form[#registration_form + 1] = field;
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	59 else
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	60 if field:match("%+$") then
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	61 field = field:sub(1, #field - 1);
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	62 field_map[field].required = true;
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	63 end
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	64
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	65 registration_form[#registration_form + 1] = field_map[field];
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	66 registration_query:tag(field):up();
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	67 end
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	68 end
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	69 registration_query:add_child(registration_form:form());
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	70
541 3521e0851c9e Change modules to use the new add_feature module API method. Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	71 module:add_feature("jabber:iq:register");
421 63be85693710 Modules now sending disco replies Waqas Hussain <waqas20@gmail.com> parents: 386 diff changeset	72
4268 c249f10eb9bb Advertise in-band registration support. Glenn Maynard <glenn@zewt.org> parents: 3997 diff changeset	73 local register_stream_feature = st.stanza("register", {xmlns="http://jabber.org/features/iq-register"}):up();
c249f10eb9bb Advertise in-band registration support. Glenn Maynard <glenn@zewt.org> parents: 3997 diff changeset	74 module:hook("stream-features", function(event)
5707 36a289e9244c mod_register: Fix indentation Kim Alvefur <zash@zash.se> parents: 5637 diff changeset	75 local session, features = event.origin, event.features;
4268 c249f10eb9bb Advertise in-band registration support. Glenn Maynard <glenn@zewt.org> parents: 3997 diff changeset	76
c249f10eb9bb Advertise in-band registration support. Glenn Maynard <glenn@zewt.org> parents: 3997 diff changeset	77 -- Advertise registration to unauthorized clients only.
4269 cd4011af8b4c mod_register: Move allow_registration option into an upvalue for efficiency (now it is being checked on every new c2s stream) Matthew Wild <mwild1@gmail.com> parents: 4268 diff changeset	78 if not(allow_registration) or session.type ~= "c2s_unauthed" then
4268 c249f10eb9bb Advertise in-band registration support. Glenn Maynard <glenn@zewt.org> parents: 3997 diff changeset	79 return
c249f10eb9bb Advertise in-band registration support. Glenn Maynard <glenn@zewt.org> parents: 3997 diff changeset	80 end
c249f10eb9bb Advertise in-band registration support. Glenn Maynard <glenn@zewt.org> parents: 3997 diff changeset	81
c249f10eb9bb Advertise in-band registration support. Glenn Maynard <glenn@zewt.org> parents: 3997 diff changeset	82 features:add_child(register_stream_feature);
c249f10eb9bb Advertise in-band registration support. Glenn Maynard <glenn@zewt.org> parents: 3997 diff changeset	83 end);
c249f10eb9bb Advertise in-band registration support. Glenn Maynard <glenn@zewt.org> parents: 3997 diff changeset	84
3995 e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	85 local function handle_registration_stanza(event)
3529 3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	86 local session, stanza = event.origin, event.stanza;
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	87
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	88 local query = stanza.tags[1];
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	89 if stanza.attr.type == "get" then
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	90 local reply = st.reply(stanza);
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	91 reply:tag("query", {xmlns = "jabber:iq:register"})
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	92 :tag("registered"):up()
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	93 :tag("username"):text(session.username):up()
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	94 :tag("password"):up();
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	95 session.send(reply);
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	96 else -- stanza.attr.type == "set"
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	97 if query.tags[1] and query.tags[1].name == "remove" then
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	98 local username, host = session.username, session.host;
5098 fca8b5946f6f mod_register: Hijack the session close call to send the final iq reply when deleting Kim Alvefur <zash@zash.se> parents: 5096 diff changeset	99
fca8b5946f6f mod_register: Hijack the session close call to send the final iq reply when deleting Kim Alvefur <zash@zash.se> parents: 5096 diff changeset	100 local old_session_close = session.close;
fca8b5946f6f mod_register: Hijack the session close call to send the final iq reply when deleting Kim Alvefur <zash@zash.se> parents: 5096 diff changeset	101 session.close = function(session, ...)
fca8b5946f6f mod_register: Hijack the session close call to send the final iq reply when deleting Kim Alvefur <zash@zash.se> parents: 5096 diff changeset	102 session.send(st.reply(stanza));
fca8b5946f6f mod_register: Hijack the session close call to send the final iq reply when deleting Kim Alvefur <zash@zash.se> parents: 5096 diff changeset	103 return old_session_close(session, ...);
fca8b5946f6f mod_register: Hijack the session close call to send the final iq reply when deleting Kim Alvefur <zash@zash.se> parents: 5096 diff changeset	104 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5763 diff changeset	105
3996 7f35b292531b mod_register: Change to use new delete_user auth provider method Matthew Wild <mwild1@gmail.com> parents: 3995 diff changeset	106 local ok, err = usermanager_delete_user(username, host);
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5763 diff changeset	107
3996 7f35b292531b mod_register: Change to use new delete_user auth provider method Matthew Wild <mwild1@gmail.com> parents: 3995 diff changeset	108 if not ok then
7f35b292531b mod_register: Change to use new delete_user auth provider method Matthew Wild <mwild1@gmail.com> parents: 3995 diff changeset	109 module:log("debug", "Removing user account %s@%s failed: %s", username, host, err);
5098 fca8b5946f6f mod_register: Hijack the session close call to send the final iq reply when deleting Kim Alvefur <zash@zash.se> parents: 5096 diff changeset	110 session.close = old_session_close;
3996 7f35b292531b mod_register: Change to use new delete_user auth provider method Matthew Wild <mwild1@gmail.com> parents: 3995 diff changeset	111 session.send(st.error_reply(stanza, "cancel", "service-unavailable", err));
7f35b292531b mod_register: Change to use new delete_user auth provider method Matthew Wild <mwild1@gmail.com> parents: 3995 diff changeset	112 return true;
7f35b292531b mod_register: Change to use new delete_user auth provider method Matthew Wild <mwild1@gmail.com> parents: 3995 diff changeset	113 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5763 diff changeset	114
3529 3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	115 module:log("info", "User removed their account: %s@%s", username, host);
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	116 module:fire_event("user-deregistered", { username = username, host = host, source = "mod_register", session = session });
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	117 else
5637 991b47778bf3 mod_register: get_child_text()! Kim Alvefur <zash@zash.se> parents: 5500 diff changeset	118 local username = nodeprep(query:get_child_text("username"));
991b47778bf3 mod_register: get_child_text()! Kim Alvefur <zash@zash.se> parents: 5500 diff changeset	119 local password = query:get_child_text("password");
3529 3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	120 if username and password then
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	121 if username == session.username then
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	122 if usermanager_set_password(username, password, session.host) then
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	123 session.send(st.reply(stanza));
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	124 else
3529 3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	125 -- TODO unable to write file, file may be locked, etc, what's the correct error?
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	126 session.send(st.error_reply(stanza, "wait", "internal-server-error"));
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	127 end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	128 else
311 513bd52e8e19 Fixed mod_register to use session.send for sending stanzas Waqas Hussain <waqas20@gmail.com> parents: 85 diff changeset	129 session.send(st.error_reply(stanza, "modify", "bad-request"));
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	130 end
3529 3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	131 else
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	132 session.send(st.error_reply(stanza, "modify", "bad-request"));
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	133 end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	134 end
3529 3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	135 end
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	136 return true;
3995 e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	137 end
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	138
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	139 module:hook("iq/self/jabber:iq:register:query", handle_registration_stanza);
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	140 if compat then
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	141 module:hook("iq/host/jabber:iq:register:query", function (event)
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	142 local session, stanza = event.origin, event.stanza;
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	143 if session.type == "c2s" and jid_bare(stanza.attr.to) == session.host then
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	144 return handle_registration_stanza(event);
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	145 end
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	146 end);
e504b06492c6 mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true) Matthew Wild <mwild1@gmail.com> parents: 3540 diff changeset	147 end
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	148
4398 acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	149 local function parse_response(query)
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	150 local form = query:get_child("x", "jabber:x:data");
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	151 if form then
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	152 return registration_form:data(form);
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	153 else
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	154 local data = {};
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	155 local errors = {};
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	156 for _, field in ipairs(registration_form) do
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	157 local name, required = field.name, field.required;
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	158 if field_map[name] then
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	159 data[name] = query:get_child_text(name);
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	160 if (not data[name] or #data[name] == 0) and required then
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	161 errors[name] = "Required value missing";
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	162 end
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	163 end
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	164 end
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	165 if next(errors) then
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	166 return data, errors;
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	167 end
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	168 return data;
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	169 end
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	170 end
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	171
690 e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	172 local recent_ips = {};
5763 0e52f1d5ca71 mod_register: Use more specific get_option variants Kim Alvefur <zash@zash.se> parents: 5707 diff changeset	173 local min_seconds_between_registrations = module:get_option_number("min_seconds_between_registrations");
0e52f1d5ca71 mod_register: Use more specific get_option variants Kim Alvefur <zash@zash.se> parents: 5707 diff changeset	174 local whitelist_only = module:get_option_boolean("whitelist_registration_only");
0e52f1d5ca71 mod_register: Use more specific get_option variants Kim Alvefur <zash@zash.se> parents: 5707 diff changeset	175 local whitelisted_ips = module:get_option_set("registration_whitelist", { "127.0.0.1" })._items;
0e52f1d5ca71 mod_register: Use more specific get_option variants Kim Alvefur <zash@zash.se> parents: 5707 diff changeset	176 local blacklisted_ips = module:get_option_set("registration_blacklist", {})._items;
690 e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	177
3529 3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	178 module:hook("stanza/iq/jabber:iq:register:query", function(event)
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	179 local session, stanza = event.origin, event.stanza;
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	180
4269 cd4011af8b4c mod_register: Move allow_registration option into an upvalue for efficiency (now it is being checked on every new c2s stream) Matthew Wild <mwild1@gmail.com> parents: 4268 diff changeset	181 if not(allow_registration) or session.type ~= "c2s_unauthed" then
665 09e0e9c722a3 Add allow_registration option to disable account registration Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	182 session.send(st.error_reply(stanza, "cancel", "service-unavailable"));
3529 3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	183 else
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	184 local query = stanza.tags[1];
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	185 if stanza.attr.type == "get" then
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	186 local reply = st.reply(stanza);
4398 acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	187 reply:add_child(registration_query);
311 513bd52e8e19 Fixed mod_register to use session.send for sending stanzas Waqas Hussain <waqas20@gmail.com> parents: 85 diff changeset	188 session.send(reply);
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	189 elseif stanza.attr.type == "set" then
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	190 if query.tags[1] and query.tags[1].name == "remove" then
311 513bd52e8e19 Fixed mod_register to use session.send for sending stanzas Waqas Hussain <waqas20@gmail.com> parents: 85 diff changeset	191 session.send(st.error_reply(stanza, "auth", "registration-required"));
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	192 else
4398 acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	193 local data, errors = parse_response(query);
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	194 if errors then
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	195 session.send(st.error_reply(stanza, "modify", "not-acceptable"));
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	196 else
690 e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	197 -- Check that the user is not blacklisted or registering too often
2085 64872e216e23 mod_register: Log a debug message when a session's IP is not available. Waqas Hussain <waqas20@gmail.com> parents: 1861 diff changeset	198 if not session.ip then
64872e216e23 mod_register: Log a debug message when a session's IP is not available. Waqas Hussain <waqas20@gmail.com> parents: 1861 diff changeset	199 module:log("debug", "User's IP not known; can't apply blacklist/whitelist");
64872e216e23 mod_register: Log a debug message when a session's IP is not available. Waqas Hussain <waqas20@gmail.com> parents: 1861 diff changeset	200 elseif blacklisted_ips[session.ip] or (whitelist_only and not whitelisted_ips[session.ip]) then
1859 c965b0accc7c mod_register: Added helpful text to registration error responses. Waqas Hussain <waqas20@gmail.com> parents: 1858 diff changeset	201 session.send(st.error_reply(stanza, "cancel", "not-acceptable", "You are not allowed to register an account."));
3529 3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	202 return true;
690 e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	203 elseif min_seconds_between_registrations and not whitelisted_ips[session.ip] then
e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	204 if not recent_ips[session.ip] then
e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	205 recent_ips[session.ip] = { time = os_time(), count = 1 };
e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	206 else
e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	207 local ip = recent_ips[session.ip];
e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	208 ip.count = ip.count + 1;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5763 diff changeset	209
690 e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	210 if os_time() - ip.time < min_seconds_between_registrations then
e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	211 ip.time = os_time();
1858 49eef8e19a71 mod_register: Changed error type for hitting registration rate limit from 'cancel' to 'wait'. Waqas Hussain <waqas20@gmail.com> parents: 1857 diff changeset	212 session.send(st.error_reply(stanza, "wait", "not-acceptable"));
3529 3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	213 return true;
690 e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	214 end
e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	215 ip.time = os_time();
e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	216 end
e901a0709005 Added rate limiting to in-band registration, and added IP [black/white]lists Matthew Wild <mwild1@gmail.com> parents: 665 diff changeset	217 end
4398 acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	218 local username, password = nodeprep(data.username), data.password;
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	219 data.username, data.password = nil, nil;
1857 ef266aa8e18f mod_register: Fixed: No error was returned if username failed nodeprep. Waqas Hussain <waqas20@gmail.com> parents: 1523 diff changeset	220 local host = module.host;
2448 542335c8a5bc mod_register: Return a <not-acceptable/> error on empty usernames (thanks Neustradamus). Waqas Hussain <waqas20@gmail.com> parents: 2260 diff changeset	221 if not username or username == "" then
1859 c965b0accc7c mod_register: Added helpful text to registration error responses. Waqas Hussain <waqas20@gmail.com> parents: 1858 diff changeset	222 session.send(st.error_reply(stanza, "modify", "not-acceptable", "The requested username is invalid."));
5165 39bb9344f194 mod_register: Fire event to allow blocking user registration Florian Zeitz <florob@babelmonkeys.de> parents: 5098 diff changeset	223 return true;
39bb9344f194 mod_register: Fire event to allow blocking user registration Florian Zeitz <florob@babelmonkeys.de> parents: 5098 diff changeset	224 end
39bb9344f194 mod_register: Fire event to allow blocking user registration Florian Zeitz <florob@babelmonkeys.de> parents: 5098 diff changeset	225 local user = { username = username , host = host, allowed = true }
39bb9344f194 mod_register: Fire event to allow blocking user registration Florian Zeitz <florob@babelmonkeys.de> parents: 5098 diff changeset	226 module:fire_event("user-registering", user);
39bb9344f194 mod_register: Fire event to allow blocking user registration Florian Zeitz <florob@babelmonkeys.de> parents: 5098 diff changeset	227 if not user.allowed then
39bb9344f194 mod_register: Fire event to allow blocking user registration Florian Zeitz <florob@babelmonkeys.de> parents: 5098 diff changeset	228 session.send(st.error_reply(stanza, "modify", "not-acceptable", "The requested username is forbidden."));
1857 ef266aa8e18f mod_register: Fixed: No error was returned if username failed nodeprep. Waqas Hussain <waqas20@gmail.com> parents: 1523 diff changeset	229 elseif usermanager_user_exists(username, host) then
1859 c965b0accc7c mod_register: Added helpful text to registration error responses. Waqas Hussain <waqas20@gmail.com> parents: 1858 diff changeset	230 session.send(st.error_reply(stanza, "cancel", "conflict", "The requested username already exists."));
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	231 else
4398 acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	232 -- TODO unable to write file, file may be locked, etc, what's the correct error?
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	233 local error_reply = st.error_reply(stanza, "wait", "internal-server-error", "Failed to write data to disk.");
1857 ef266aa8e18f mod_register: Fixed: No error was returned if username failed nodeprep. Waqas Hussain <waqas20@gmail.com> parents: 1523 diff changeset	234 if usermanager_create_user(username, password, host) then
5500 eeea0eb2602a mod_auth_internal_hashed, mod_auth_internal_plain, mod_privacy, mod_private, mod_register, mod_vcard, mod_muc: Use module:open_store() Kim Alvefur <zash@zash.se> parents: 5371 diff changeset	235 if next(data) and not account_details:set(username, data) then
4398 acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	236 usermanager_delete_user(username, host);
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	237 session.send(error_reply);
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	238 return true;
acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	239 end
311 513bd52e8e19 Fixed mod_register to use session.send for sending stanzas Waqas Hussain <waqas20@gmail.com> parents: 85 diff changeset	240 session.send(st.reply(stanza)); -- user created!
1857 ef266aa8e18f mod_register: Fixed: No error was returned if username failed nodeprep. Waqas Hussain <waqas20@gmail.com> parents: 1523 diff changeset	241 module:log("info", "User account created: %s@%s", username, host);
3540 bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3529 diff changeset	242 module:fire_event("user-registered", {
1857 ef266aa8e18f mod_register: Fixed: No error was returned if username failed nodeprep. Waqas Hussain <waqas20@gmail.com> parents: 1523 diff changeset	243 username = username, host = host, source = "mod_register",
1189 63ed3902f357 mod_register: Attach session to user-registered and user-deregistered events Matthew Wild <mwild1@gmail.com> parents: 1184 diff changeset	244 session = session });
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	245 else
4398 acc37e221940 mod_register: Add support for additional registration fields Florian Zeitz <florob@babelmonkeys.de> parents: 4270 diff changeset	246 session.send(error_reply);
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	247 end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	248 end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	249 end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	250 end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	251 end
3529 3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	252 end
3f9cc12308aa mod_register: Updated to use the new events API. Waqas Hussain <waqas20@gmail.com> parents: 3394 diff changeset	253 return true;
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: diff changeset	254 end);

prosody

615a0774e4cc

plugins/mod_register.lua

Software / code / prosody

Annotate

plugins/mod_register.lua @ 5877:615a0774e4cc

Software `/` code `/` prosody