prosody-modules: mod_register_web/mod_register

annotate mod_register_web/mod_register_web.lua @ 2670:6e01878103c0

mod_smacks: Ignore user when writing or reading session_cache on prosody 0.9 At least under some circumstances it seems that session.username is nil when a user tries to resume his session in prosody 0.9. The username is not relevant when no limiting is done (limiting the number of entries in the session cache is only possible in prosody 0.10), so this commit removes the usage of the username when accessing the prosody 0.9 session cache.

author	tmolitor <thilo@eightysoft.de>
date	Thu, 06 Apr 2017 02:12:14 +0200
parents	32604bf33a4c
children	c8161146c698

rev	line source
653 c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 local captcha_options = module:get_option("captcha_options", {});
746 03595194075a mod_register_web: nodeprep username before creating user (thanks IRON) Matthew Wild <mwild1@gmail.com> parents: 653 diff changeset	2 local nodeprep = require "util.encodings".stringprep.nodeprep;
1225 a3766d3baacb mod_register_web: Import usermanager and util.http into locals Kim Alvefur <zash@zash.se> parents: 1223 diff changeset	3 local usermanager = require "core.usermanager";
1247 34fbe58d19da mod_register_web: Use net.http instead of util.http, as we need to make requests (thanks dustin) Matthew Wild <mwild1@gmail.com> parents: 1239 diff changeset	4 local http = require "net.http";
1459 742f3dc601b5 mod_register_web: Use path separator from package.config Kim Alvefur <zash@zash.se> parents: 1320 diff changeset	5 local path_sep = package.config:sub(1,1);
1778 32604bf33a4c mod_register_web: Switch to the new reCAPTCHA API, including support for "nocaptcha" when users are already signed in to Google. Thijs Alkemade <me@thijsalkema.de> parents: 1618 diff changeset	6 local json = require "util.json".decode;
32604bf33a4c mod_register_web: Switch to the new reCAPTCHA API, including support for "nocaptcha" when users are already signed in to Google. Thijs Alkemade <me@thijsalkema.de> parents: 1618 diff changeset	7 local t_concat = table.concat;
653 c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	8
1460 5e1f7af23cf0 mod_register_web: Add dependency on mod_http Kim Alvefur <zash@zash.se> parents: 1459 diff changeset	9 module:depends"http";
5e1f7af23cf0 mod_register_web: Add dependency on mod_http Kim Alvefur <zash@zash.se> parents: 1459 diff changeset	10
1235 9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	11 local extra_fields = {
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	12 nick = true; name = true; first = true; last = true; email = true;
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	13 address = true; city = true; state = true; zip = true;
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	14 phone = true; url = true; date = true;
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	15 }
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	16
1572 1aa894db3585 mod_register_web: Add option for specifying path to templates Kim Alvefur <zash@zash.se> parents: 1460 diff changeset	17 local template_path = module:get_option_string("register_web_template", "templates");
1227 6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	18 function template(data)
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	19 -- Like util.template, but deals with plain text
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	20 return { apply = function(values) return (data:gsub("{([^}]+)}", values)); end }
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	21 end
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	22
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	23 local function get_template(name)
1572 1aa894db3585 mod_register_web: Add option for specifying path to templates Kim Alvefur <zash@zash.se> parents: 1460 diff changeset	24 local fh = assert(module:load_resource(template_path..path_sep..name..".html"));
1227 6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	25 local data = assert(fh:read("*a"));
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	26 fh:close();
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	27 return template(data);
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	28 end
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	29
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	30 local function render(template, data)
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	31 return tostring(template.apply(data));
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	32 end
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	33
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	34 local register_tpl = get_template "register";
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	35 local success_tpl = get_template "success";
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	36
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	37 if next(captcha_options) ~= nil then
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	38 local recaptcha_tpl = get_template "recaptcha";
1227 6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	39
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	40 function generate_captcha(display_options)
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	41 return recaptcha_tpl.apply(setmetatable({
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	42 recaptcha_display_error = display_options and display_options.recaptcha_error
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	43 and ("&error="..display_options.recaptcha_error) or "";
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	44 }, {
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	45 __index = function (t, k)
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	46 if captcha_options[k] then return captcha_options[k]; end
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	47 module:log("error", "Missing parameter from captcha_options: %s", k);
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	48 end
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	49 }));
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	50 end
1234 da39ba4047a7 mod_register_web: Pass request to captcha handler Kim Alvefur <zash@zash.se> parents: 1233 diff changeset	51 function verify_captcha(request, form, callback)
1778 32604bf33a4c mod_register_web: Switch to the new reCAPTCHA API, including support for "nocaptcha" when users are already signed in to Google. Thijs Alkemade <me@thijsalkema.de> parents: 1618 diff changeset	52 http.request("https://www.google.com/recaptcha/api/siteverify", {
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	53 body = http.formencode {
1778 32604bf33a4c mod_register_web: Switch to the new reCAPTCHA API, including support for "nocaptcha" when users are already signed in to Google. Thijs Alkemade <me@thijsalkema.de> parents: 1618 diff changeset	54 secret = captcha_options.recaptcha_private_key;
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	55 remoteip = request.conn:ip();
1778 32604bf33a4c mod_register_web: Switch to the new reCAPTCHA API, including support for "nocaptcha" when users are already signed in to Google. Thijs Alkemade <me@thijsalkema.de> parents: 1618 diff changeset	56 response = form["g-recaptcha-response"];
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	57 };
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	58 }, function (verify_result, code)
1778 32604bf33a4c mod_register_web: Switch to the new reCAPTCHA API, including support for "nocaptcha" when users are already signed in to Google. Thijs Alkemade <me@thijsalkema.de> parents: 1618 diff changeset	59 local result = json(verify_result);
32604bf33a4c mod_register_web: Switch to the new reCAPTCHA API, including support for "nocaptcha" when users are already signed in to Google. Thijs Alkemade <me@thijsalkema.de> parents: 1618 diff changeset	60 if result.success == true then
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	61 callback(true);
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	62 else
1778 32604bf33a4c mod_register_web: Switch to the new reCAPTCHA API, including support for "nocaptcha" when users are already signed in to Google. Thijs Alkemade <me@thijsalkema.de> parents: 1618 diff changeset	63 callback(false, t_concat(result["error-codes"]));
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	64 end
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	65 end);
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	66 end
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	67 else
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	68 module:log("debug", "No Recaptcha options set, using fallback captcha")
1231 502ce9672eae mod_register_web: Use local Kim Alvefur <zash@zash.se> parents: 1230 diff changeset	69 local random = math.random;
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	70 local hmac_sha1 = require "util.hashes".hmac_sha1;
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	71 local secret = require "util.uuid".generate()
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	72 local ops = { '+', '-' };
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	73 local captcha_tpl = get_template "simplecaptcha";
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	74 function generate_captcha()
1231 502ce9672eae mod_register_web: Use local Kim Alvefur <zash@zash.se> parents: 1230 diff changeset	75 local op = ops[random(1, #ops)];
502ce9672eae mod_register_web: Use local Kim Alvefur <zash@zash.se> parents: 1230 diff changeset	76 local x, y = random(1, 9)
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	77 repeat
1231 502ce9672eae mod_register_web: Use local Kim Alvefur <zash@zash.se> parents: 1230 diff changeset	78 y = random(1, 9);
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	79 until x ~= y;
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	80 local answer;
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	81 if op == '+' then
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	82 answer = x + y;
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	83 elseif op == '-' then
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	84 if x < y then
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	85 -- Avoid negative numbers
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	86 x, y = y, x;
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	87 end
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	88 answer = x - y;
1227 6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	89 end
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	90 local challenge = hmac_sha1(secret, answer, true);
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	91 return captcha_tpl.apply {
db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	92 op = op, x = x, y = y, challenge = challenge;
1226 0667624637da mod_register_web: Split out recaptcha verification to a separate function Kim Alvefur <zash@zash.se> parents: 1225 diff changeset	93 };
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	94 end
1234 da39ba4047a7 mod_register_web: Pass request to captcha handler Kim Alvefur <zash@zash.se> parents: 1233 diff changeset	95 function verify_captcha(request, form, callback)
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	96 if hmac_sha1(secret, form.captcha_reply, true) == form.captcha_challenge then
1226 0667624637da mod_register_web: Split out recaptcha verification to a separate function Kim Alvefur <zash@zash.se> parents: 1225 diff changeset	97 callback(true);
0667624637da mod_register_web: Split out recaptcha verification to a separate function Kim Alvefur <zash@zash.se> parents: 1225 diff changeset	98 else
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	99 callback(false, "Captcha verification failed");
1226 0667624637da mod_register_web: Split out recaptcha verification to a separate function Kim Alvefur <zash@zash.se> parents: 1225 diff changeset	100 end
1228 db85ff22ae97 mod_register_web: Add a simple fallback captcha Kim Alvefur <zash@zash.se> parents: 1227 diff changeset	101 end
1226 0667624637da mod_register_web: Split out recaptcha verification to a separate function Kim Alvefur <zash@zash.se> parents: 1225 diff changeset	102 end
653 c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	103
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	104 function generate_page(event, display_options)
1618 c56baec031e8 mod_register_web: Send Content-Type headers Kim Alvefur <zash@zash.se> parents: 1572 diff changeset	105 local request, response = event.request, event.response;
1227 6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	106
1618 c56baec031e8 mod_register_web: Send Content-Type headers Kim Alvefur <zash@zash.se> parents: 1572 diff changeset	107 response.headers.content_type = "text/html; charset=utf-8";
1227 6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	108 return render(register_tpl, {
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	109 path = request.path; hostname = module.host;
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	110 notice = display_options and display_options.register_error or "";
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	111 captcha = generate_captcha(display_options);
6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	112 })
653 c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	113 end
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	114
1320 e670d4cc5027 mod_register_web: Pass request around so IP address can be reported Kim Alvefur <zash@zash.se> parents: 1247 diff changeset	115 function register_user(form, origin)
1229 12e3bc0fd6ed mod_register_web: Indentation fix Kim Alvefur <zash@zash.se> parents: 1228 diff changeset	116 local prepped_username = nodeprep(form.username);
1230 f7c561fbd5a6 mod_register_web: Friendly error messages if the username is taken or failed nodeprep Kim Alvefur <zash@zash.se> parents: 1229 diff changeset	117 if not prepped_username then
f7c561fbd5a6 mod_register_web: Friendly error messages if the username is taken or failed nodeprep Kim Alvefur <zash@zash.se> parents: 1229 diff changeset	118 return nil, "Username contains forbidden characters";
f7c561fbd5a6 mod_register_web: Friendly error messages if the username is taken or failed nodeprep Kim Alvefur <zash@zash.se> parents: 1229 diff changeset	119 end
1236 59332e0bfbdc mod_register_web: Check for empty username Kim Alvefur <zash@zash.se> parents: 1235 diff changeset	120 if #prepped_username == 0 then
59332e0bfbdc mod_register_web: Check for empty username Kim Alvefur <zash@zash.se> parents: 1235 diff changeset	121 return nil, "The username field was empty";
59332e0bfbdc mod_register_web: Check for empty username Kim Alvefur <zash@zash.se> parents: 1235 diff changeset	122 end
1229 12e3bc0fd6ed mod_register_web: Indentation fix Kim Alvefur <zash@zash.se> parents: 1228 diff changeset	123 if usermanager.user_exists(prepped_username, module.host) then
1230 f7c561fbd5a6 mod_register_web: Friendly error messages if the username is taken or failed nodeprep Kim Alvefur <zash@zash.se> parents: 1229 diff changeset	124 return nil, "Username already taken";
1229 12e3bc0fd6ed mod_register_web: Indentation fix Kim Alvefur <zash@zash.se> parents: 1228 diff changeset	125 end
1238 752285859607 mod_register_web: Use correct variables Kim Alvefur <zash@zash.se> parents: 1237 diff changeset	126 local registering = { username = prepped_username , host = module.host, allowed = true }
1237 c669cb78b293 mod_register_web: Fire user-registering event like mod_register Kim Alvefur <zash@zash.se> parents: 1236 diff changeset	127 module:fire_event("user-registering", registering);
c669cb78b293 mod_register_web: Fire user-registering event like mod_register Kim Alvefur <zash@zash.se> parents: 1236 diff changeset	128 if not registering.allowed then
c669cb78b293 mod_register_web: Fire user-registering event like mod_register Kim Alvefur <zash@zash.se> parents: 1236 diff changeset	129 return nil, "Registration not allowed";
c669cb78b293 mod_register_web: Fire user-registering event like mod_register Kim Alvefur <zash@zash.se> parents: 1236 diff changeset	130 end
1233 f7b1992e4ff6 mod_register_web: Add missing = Kim Alvefur <zash@zash.se> parents: 1232 diff changeset	131 local ok, err = usermanager.create_user(prepped_username, form.password, module.host);
1232 12f59489ef6e mod_register_web: Fire user-registered event Kim Alvefur <zash@zash.se> parents: 1231 diff changeset	132 if ok then
1235 9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	133 local extra_data = {};
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	134 for field in pairs(extra_fields) do
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	135 local field_value = form[field];
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	136 if field_value and #field_value > 0 then
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	137 extra_data[field] = field_value;
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	138 end
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	139 end
1238 752285859607 mod_register_web: Use correct variables Kim Alvefur <zash@zash.se> parents: 1237 diff changeset	140 if next(extra_data) ~= nil then
1235 9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	141 datamanager.store(prepped_username, module.host, "account_details", extra_data);
9277e0a3922f mod_register_web: Support additional registration fields Kim Alvefur <zash@zash.se> parents: 1234 diff changeset	142 end
1232 12f59489ef6e mod_register_web: Fire user-registered event Kim Alvefur <zash@zash.se> parents: 1231 diff changeset	143 module:fire_event("user-registered", {
12f59489ef6e mod_register_web: Fire user-registered event Kim Alvefur <zash@zash.se> parents: 1231 diff changeset	144 username = prepped_username,
12f59489ef6e mod_register_web: Fire user-registered event Kim Alvefur <zash@zash.se> parents: 1231 diff changeset	145 host = module.host,
1320 e670d4cc5027 mod_register_web: Pass request around so IP address can be reported Kim Alvefur <zash@zash.se> parents: 1247 diff changeset	146 source = module.name,
e670d4cc5027 mod_register_web: Pass request around so IP address can be reported Kim Alvefur <zash@zash.se> parents: 1247 diff changeset	147 ip = origin.conn:ip(),
1232 12f59489ef6e mod_register_web: Fire user-registered event Kim Alvefur <zash@zash.se> parents: 1231 diff changeset	148 });
12f59489ef6e mod_register_web: Fire user-registered event Kim Alvefur <zash@zash.se> parents: 1231 diff changeset	149 end
12f59489ef6e mod_register_web: Fire user-registered event Kim Alvefur <zash@zash.se> parents: 1231 diff changeset	150 return ok, err;
653 c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	151 end
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	152
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	153 function generate_success(event, form)
1227 6015434f0e05 mod_register_web: Move HTML into separate template files Kim Alvefur <zash@zash.se> parents: 1226 diff changeset	154 return render(success_tpl, { jid = nodeprep(form.username).."@"..module.host });
653 c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	155 end
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	156
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	157 function generate_register_response(event, form, ok, err)
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	158 local message;
1618 c56baec031e8 mod_register_web: Send Content-Type headers Kim Alvefur <zash@zash.se> parents: 1572 diff changeset	159 event.response.headers.content_type = "text/html; charset=utf-8";
653 c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	160 if ok then
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	161 return generate_success(event, form);
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	162 else
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	163 return generate_page(event, { register_error = err });
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	164 end
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	165 end
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	166
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	167 function handle_form(event)
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	168 local request, response = event.request, event.response;
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	169 local form = http.formdecode(request.body);
1234 da39ba4047a7 mod_register_web: Pass request to captcha handler Kim Alvefur <zash@zash.se> parents: 1233 diff changeset	170 verify_captcha(request, form, function (ok, err)
1226 0667624637da mod_register_web: Split out recaptcha verification to a separate function Kim Alvefur <zash@zash.se> parents: 1225 diff changeset	171 if ok then
1320 e670d4cc5027 mod_register_web: Pass request around so IP address can be reported Kim Alvefur <zash@zash.se> parents: 1247 diff changeset	172 local register_ok, register_err = register_user(form, request);
653 c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	173 response:send(generate_register_response(event, form, register_ok, register_err));
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	174 else
1226 0667624637da mod_register_web: Split out recaptcha verification to a separate function Kim Alvefur <zash@zash.se> parents: 1225 diff changeset	175 response:send(generate_page(event, { register_error = err }));
653 c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	176 end
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	177 end);
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	178 return true; -- Leave connection open until we respond above
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	179 end
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	180
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	181 module:provides("http", {
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	182 route = {
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	183 GET = generate_page;
1239 cc5cbeeb9fc7 mod_register_web: Handle URLs with a trailing slash Kim Alvefur <zash@zash.se> parents: 1238 diff changeset	184 ["GET /"] = generate_page;
653 c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	185 POST = handle_form;
1239 cc5cbeeb9fc7 mod_register_web: Handle URLs with a trailing slash Kim Alvefur <zash@zash.se> parents: 1238 diff changeset	186 ["POST /"] = handle_form;
653 c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	187 };
c08b0e4b7b38 mod_register_web: Extremely rough web registration page, with captcha Matthew Wild <mwild1@gmail.com> parents: diff changeset	188 });

Mercurial > prosody-modules

annotate mod_register_web/mod_register_web.lua @ 2670:6e01878103c0