prosody-modules: mod_register_json/mod_register

annotate mod_register_json/mod_register_json.lua @ 487:8bdab5489653

mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)

author	Marco Cirillo <maranda@lightwitch.org>
date	Fri, 02 Dec 2011 01:03:06 +0000
parents	f0fafd19fd72
children	84e992f70ba3

rev	line source
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	1 -- Expose a simple servlet to handle user registrations from web pages
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	2 -- via JSON.
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	3 --
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	4 -- A Good chunk of the code is from mod_data_access.lua by Kim Alvefur
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	5 -- aka Zash.
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	6
361 146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	7 local jid_prep = require "util.jid".prep;
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	8 local jid_split = require "util.jid".split;
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	9 local usermanager = require "core.usermanager";
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	10 local b64_decode = require "util.encodings".base64.decode;
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	11 local json_decode = require "util.json".decode;
370 16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	12 local httpserver = require "net.httpserver";
364 1edd3f7c749c mod_register_json: fixed missing declared variable. Marco Cirillo <maranda@lightwitch.org> parents: 363 diff changeset	13 local os_time = os.time;
430 f0fafd19fd72 mod_register_json: changed pestered code to something less pestered. (added nodeprep) Marco Cirillo <maranda@lightwitch.org> parents: 429 diff changeset	14 local nodeprep = require "util.encodings".stringprep.nodeprep;
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	15
357 59345fd38ad9 mod_register_json: Changed a few bits to allow the service to be specified as standalone (by default uses port 9443), Q: Does it work? Marco Cirillo <maranda@lightwitch.org> parents: 356 diff changeset	16 module.host = "*" -- HTTP/BOSH Servlets need to be global.
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	17
359 5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	18 -- Pick up configuration.
5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	19
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	20 local set_realm_name = module:get_option("reg_servlet_realm") or "Restricted";
359 5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	21 local throttle_time = module:get_option("reg_servlet_ttime") or false;
5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	22 local whitelist = module:get_option("reg_servlet_wl") or {};
5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	23 local blacklist = module:get_option("reg_servlet_bl") or {};
5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	24 local recent_ips = {};
5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	25
5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	26 -- Begin
5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	27
5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	28 for _, ip in ipairs(whitelist) do whitelisted_ips[ip] = true; end
5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	29 for _, ip in ipairs(blacklist) do blacklisted_ips[ip] = true; end
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	30
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	31 local function http_response(code, message, extra_headers)
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	32 local response = {
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	33 status = code .. " " .. message;
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	34 body = message .. "\n"; }
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	35 if extra_headers then response.headers = extra_headers; end
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	36 return response
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	37 end
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	38
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	39 local function handle_req(method, body, request)
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	40 if request.method ~= "POST" then
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	41 return http_response(405, "Bad method...", {["Allow"] = "POST"});
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	42 end
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	43 if not request.headers["authorization"] then
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	44 return http_response(401, "No... No...",
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	45 {["WWW-Authenticate"]='Basic realm="'.. set_realm_name ..'"'})
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	46 end
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	47
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	48 local user, password = b64_decode(request.headers.authorization
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	49 :match("[^ ]$") or ""):match("([^:]):(.*)");
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	50 user = jid_prep(user);
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	51 if not user or not password then return http_response(400, "What's this..?"); end
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	52 local user_node, user_host = jid_split(user)
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	53 if not hosts[user_host] then return http_response(401, "Negative."); end
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	54
359 5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	55 module:log("warn", "%s is authing to submit a new user registration data", user)
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	56 if not usermanager.test_password(user_node, user_host, password) then
359 5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	57 module:log("warn", "%s failed authentication", user)
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	58 return http_response(401, "Who the hell are you?! Guards!");
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	59 end
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	60
361 146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	61 local req_body;
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	62 -- We check that what we have is valid JSON wise else we throw an error...
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	63 if not pcall(function() req_body = json_decode(body) end) then
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	64 module:log("debug", "JSON data submitted for user registration by %s failed to Decode.", user);
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	65 return http_response(400, "JSON Decoding failed.");
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	66 else
363 72a5778579c5 mod_register_json: Let's call it the first commit, fixed all code errors (aka it works). Marco Cirillo <maranda@lightwitch.org> parents: 362 diff changeset	67 -- Decode JSON data and check that all bits are there else throw an error
72a5778579c5 mod_register_json: Let's call it the first commit, fixed all code errors (aka it works). Marco Cirillo <maranda@lightwitch.org> parents: 362 diff changeset	68 req_body = json_decode(body);
72a5778579c5 mod_register_json: Let's call it the first commit, fixed all code errors (aka it works). Marco Cirillo <maranda@lightwitch.org> parents: 362 diff changeset	69 if req_body["username"] == nil or req_body["password"] == nil or req_body["host"] == nil or req_body["ip"] == nil then
72a5778579c5 mod_register_json: Let's call it the first commit, fixed all code errors (aka it works). Marco Cirillo <maranda@lightwitch.org> parents: 362 diff changeset	70 module:log("debug", "%s supplied an insufficent number of elements or wrong elements for the JSON registration", user);
72a5778579c5 mod_register_json: Let's call it the first commit, fixed all code errors (aka it works). Marco Cirillo <maranda@lightwitch.org> parents: 362 diff changeset	71 return http_response(400, "Invalid syntax.");
72a5778579c5 mod_register_json: Let's call it the first commit, fixed all code errors (aka it works). Marco Cirillo <maranda@lightwitch.org> parents: 362 diff changeset	72 end
361 146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	73 -- Check if user is an admin of said host
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	74 if not usermanager.is_admin(user, req_body["host"]) then
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	75 module:log("warn", "%s tried to submit registration data for %s but he's not an admin", user, req_body["host"]);
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	76 return http_response(401, "I obey only to my masters... Have a nice day.");
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	77 else
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	78 -- Checks for both Throttling/Whitelist and Blacklist (basically copycatted from prosody's register.lua code)
362 bd0a8c032163 mod_register_json: Typo fix. Marco Cirillo <maranda@lightwitch.org> parents: 361 diff changeset	79 if blacklist[req_body["ip"]] then module:log("warn", "Attempt of reg. submission to the JSON servlet from blacklisted address: %s", req_body["ip"]); return http_response(403, "The specified address is blacklisted, sorry sorry."); end
361 146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	80 if throttle_time and not whitelist[req_body["ip"]] then
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	81 if not recent_ips[req_body["ip"]] then
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	82 recent_ips[req_body["ip"]] = { time = os_time(), count = 1 };
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	83 else
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	84 local ip = recent_ips[req_body["ip"]];
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	85 ip.count = ip.count + 1;
359 5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	86
361 146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	87 if os_time() - ip.time < throttle_time then
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	88 ip.time = os_time();
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	89 module:log("warn", "JSON Registration request from %s has been throttled.", req_body["ip"]);
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	90 return http_response(503, "Woah... How many users you want to register..? Request throttled, wait a bit and try again.");
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	91 end
359 5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	92 ip.time = os_time();
5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	93 end
5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	94 end
361 146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	95
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	96 -- We first check if the supplied username for registration is already there.
430 f0fafd19fd72 mod_register_json: changed pestered code to something less pestered. (added nodeprep) Marco Cirillo <maranda@lightwitch.org> parents: 429 diff changeset	97 -- And nodeprep the username
f0fafd19fd72 mod_register_json: changed pestered code to something less pestered. (added nodeprep) Marco Cirillo <maranda@lightwitch.org> parents: 429 diff changeset	98 local username = nodeprep(req_body["username"]);
f0fafd19fd72 mod_register_json: changed pestered code to something less pestered. (added nodeprep) Marco Cirillo <maranda@lightwitch.org> parents: 429 diff changeset	99 if not usermanager.user_exists(username, req_body["host"]) then
f0fafd19fd72 mod_register_json: changed pestered code to something less pestered. (added nodeprep) Marco Cirillo <maranda@lightwitch.org> parents: 429 diff changeset	100 if not username then
f0fafd19fd72 mod_register_json: changed pestered code to something less pestered. (added nodeprep) Marco Cirillo <maranda@lightwitch.org> parents: 429 diff changeset	101 module:log("debug", "%s supplied an username containing invalid characters: %s", user, username);
429 ea6641deec12 mod_register_json: added check for invalid characters in the username. Marco Cirillo <maranda@lightwitch.org> parents: 370 diff changeset	102 return http_response(406, "Supplied username contains invalid characters, see RFC 6122.");
ea6641deec12 mod_register_json: added check for invalid characters in the username. Marco Cirillo <maranda@lightwitch.org> parents: 370 diff changeset	103 else
430 f0fafd19fd72 mod_register_json: changed pestered code to something less pestered. (added nodeprep) Marco Cirillo <maranda@lightwitch.org> parents: 429 diff changeset	104 usermanager.create_user(username, req_body["password"], req_body["host"]);
f0fafd19fd72 mod_register_json: changed pestered code to something less pestered. (added nodeprep) Marco Cirillo <maranda@lightwitch.org> parents: 429 diff changeset	105 module:log("debug", "%s registration data submission for %s is successful", user, username);
429 ea6641deec12 mod_register_json: added check for invalid characters in the username. Marco Cirillo <maranda@lightwitch.org> parents: 370 diff changeset	106 return http_response(200, "Done.");
ea6641deec12 mod_register_json: added check for invalid characters in the username. Marco Cirillo <maranda@lightwitch.org> parents: 370 diff changeset	107 end
361 146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	108 else
430 f0fafd19fd72 mod_register_json: changed pestered code to something less pestered. (added nodeprep) Marco Cirillo <maranda@lightwitch.org> parents: 429 diff changeset	109 module:log("debug", "%s registration data submission for %s failed (user already exists)", user, username);
361 146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	110 return http_response(409, "User already exists.");
146496a3be78 mod_register_json: Failed at JSON successful decode check, fixed with a code refactor. Marco Cirillo <maranda@lightwitch.org> parents: 360 diff changeset	111 end
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	112 end
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	113 end
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	114 end
a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	115
359 5d22ebcb9ec5 mod_register_json: Changed log levels, added a few primitive throttling/whitelist/blacklist options Marco Cirillo <maranda@lightwitch.org> parents: 358 diff changeset	116 -- Set it up!
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	117 local function setup()
370 16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	118 local ports = module:get_option("reg_servlet_ports") or { 9280 };
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	119 local port_number, base_name, ssl_table;
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	120 for _, opts in ipairs(ports) do
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	121 if type(opts) == "number" then
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	122 port_number, base_name = opts, "register_account";
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	123 elseif type(opts) == "table" then
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	124 port_number, base_name, ssl_table = opts.port or 9280, opts.path or "register_account", opts.ssl or nil;
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	125 elseif type(opts) == "string" then
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	126 base_name, port_number = opts, 9280;
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	127 end
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	128 end
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	129
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	130 if ssl_table == nil then
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	131 ports = { { port = port_number } };
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	132 httpserver.new_from_config(ports, handle_req, { base = base_name });
369 29a8828243ce mod_register_json: Fixed http listener creation syntax. (Please document that in the API, that would avoid my brain overheating, thank you.) Marco Cirillo <maranda@lightwitch.org> parents: 365 diff changeset	133 else
370 16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	134 if port_number == 9280 then port_number = 9443; end
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	135 ports = { { port = port_number, ssl = ssl_table } };
16da8cd69715 mod_register_json: There again, finally found the right way to pass the ports table to be processed correctly. Marco Cirillo <maranda@lightwitch.org> parents: 369 diff changeset	136 httpserver.new_from_config(ports, handle_req, { base = base_name });
357 59345fd38ad9 mod_register_json: Changed a few bits to allow the service to be specified as standalone (by default uses port 9443), Q: Does it work? Marco Cirillo <maranda@lightwitch.org> parents: 356 diff changeset	137 end
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	138 end
369 29a8828243ce mod_register_json: Fixed http listener creation syntax. (Please document that in the API, that would avoid my brain overheating, thank you.) Marco Cirillo <maranda@lightwitch.org> parents: 365 diff changeset	139
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	140 if prosody.start_time then -- already started
369 29a8828243ce mod_register_json: Fixed http listener creation syntax. (Please document that in the API, that would avoid my brain overheating, thank you.) Marco Cirillo <maranda@lightwitch.org> parents: 365 diff changeset	141 setup();
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	142 else
369 29a8828243ce mod_register_json: Fixed http listener creation syntax. (Please document that in the API, that would avoid my brain overheating, thank you.) Marco Cirillo <maranda@lightwitch.org> parents: 365 diff changeset	143 prosody.events.add_handler("server-started", setup);
355 a5da789b2e7d mod_register_json: First commit (needs tests). Marco Cirillo <maranda@lightwitch.org> parents: diff changeset	144 end

Mercurial > prosody-modules

annotate mod_register_json/mod_register_json.lua @ 487:8bdab5489653