Mercurial > prosody-modules
annotate mod_register_json/mod_register_json.lua @ 548:4691e72a055c
mod_register_json: cleaned up useless unused code (thanks Mr. Gecko)
author | Marco Cirillo <maranda@lightwitch.org> |
---|---|
date | Sat, 14 Jan 2012 19:49:35 +0000 |
parents | 09280dd0b22e |
children | d8143f627f9f |
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 |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
7 local jid_prep = require "util.jid".prep |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
8 local jid_split = require "util.jid".split |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
9 local usermanager = require "core.usermanager" |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
10 local b64_decode = require "util.encodings".base64.decode |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
11 local json_decode = require "util.json".decode |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
12 local httpserver = require "net.httpserver" |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
13 local os_time = os.time |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
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 |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
20 local set_realm_name = module:get_option("reg_servlet_realm") or "Restricted" |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
21 local throttle_time = module:get_option("reg_servlet_ttime") or false |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
22 local whitelist = module:get_option("reg_servlet_wl") or {} |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
23 local blacklist = module:get_option("reg_servlet_bl") or {} |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
24 local recent_ips = {} |
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
|
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 |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
28 local function http_response(code, message, extra_headers) |
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
29 local response = { |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
30 status = code .. " " .. message, |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
31 body = message .. "\n" } |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
32 if extra_headers then response.headers = extra_headers end |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
33 return response |
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
34 end |
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
35 |
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
36 local function handle_req(method, body, request) |
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
37 if request.method ~= "POST" then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
38 return http_response(405, "Bad method...", {["Allow"] = "POST"}) |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
39 end |
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
40 if not request.headers["authorization"] then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
41 return http_response(401, "No... No...", {["WWW-Authenticate"]='Basic realm="'.. set_realm_name ..'"'}) |
355
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 |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
44 local user, password = b64_decode(request.headers.authorization:match("[^ ]*$") or ""):match("([^:]*):(.*)") |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
45 user = jid_prep(user) |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
46 if not user or not password then return http_response(400, "What's this..?") end |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
47 local user_node, user_host = jid_split(user) |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
48 if not hosts[user_host] then return http_response(401, "Negative.") end |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
49 |
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
|
50 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
|
51 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
|
52 module:log("warn", "%s failed authentication", user) |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
53 return http_response(401, "Who the hell are you?! Guards!") |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
54 end |
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
55 |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
56 local req_body |
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
|
57 -- 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
|
58 if not pcall(function() req_body = json_decode(body) end) then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
59 module:log("debug", "JSON data submitted for user registration by %s failed to Decode.", user) |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
60 return http_response(400, "JSON Decoding failed.") |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
61 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
|
62 -- Decode JSON data and check that all bits are there else throw an error |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
63 req_body = json_decode(body) |
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
|
64 if req_body["username"] == nil or req_body["password"] == nil or req_body["host"] == nil or req_body["ip"] == nil then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
65 module:log("debug", "%s supplied an insufficent number of elements or wrong elements for the JSON registration", user) |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
66 return http_response(400, "Invalid syntax.") |
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 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
|
68 -- 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
|
69 if not usermanager.is_admin(user, req_body["host"]) then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
70 module:log("warn", "%s tried to submit registration data for %s but he's not an admin", user, req_body["host"]) |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
71 return http_response(401, "I obey only to my masters... Have a nice day.") |
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
|
72 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
|
73 -- Checks for both Throttling/Whitelist and Blacklist (basically copycatted from prosody's register.lua code) |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
74 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
|
75 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
|
76 if not recent_ips[req_body["ip"]] then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
77 recent_ips[req_body["ip"]] = { time = os_time(), count = 1 } |
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
|
78 else |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
79 local ip = recent_ips[req_body["ip"]] |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
80 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
|
81 |
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
|
82 if os_time() - ip.time < throttle_time then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
83 ip.time = os_time() |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
84 module:log("warn", "JSON Registration request from %s has been throttled.", req_body["ip"]) |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
85 return http_response(503, "Woah... How many users you want to register..? Request throttled, wait a bit and try again.") |
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
|
86 end |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
87 ip.time = os_time() |
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
|
88 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
|
89 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
|
90 |
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 -- 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
|
92 -- And nodeprep the username |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
93 local username = nodeprep(req_body["username"]) |
430
f0fafd19fd72
mod_register_json: changed pestered code to something less pestered. (added nodeprep)
Marco Cirillo <maranda@lightwitch.org>
parents:
429
diff
changeset
|
94 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
|
95 if not username then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
96 module:log("debug", "%s supplied an username containing invalid characters: %s", user, username) |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
97 return http_response(406, "Supplied username contains invalid characters, see RFC 6122.") |
429
ea6641deec12
mod_register_json: added check for invalid characters in the username.
Marco Cirillo <maranda@lightwitch.org>
parents:
370
diff
changeset
|
98 else |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
99 usermanager.create_user(username, req_body["password"], req_body["host"]) |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
100 module:log("debug", "%s registration data submission for %s is successful", user, username) |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
101 return http_response(200, "Done.") |
429
ea6641deec12
mod_register_json: added check for invalid characters in the username.
Marco Cirillo <maranda@lightwitch.org>
parents:
370
diff
changeset
|
102 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
|
103 else |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
104 module:log("debug", "%s registration data submission for %s failed (user already exists)", user, username) |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
105 return http_response(409, "User already exists.") |
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
|
106 end |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
107 end |
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
108 end |
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
109 end |
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
110 |
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
|
111 -- Set it up! |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
112 local function setup() |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
113 local ports = module:get_option("reg_servlet_ports") or { 9280 } |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
114 local port_number, base_name, ssl_table |
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
|
115 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
|
116 if type(opts) == "number" then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
117 port_number, base_name = opts, "register_account" |
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 elseif type(opts) == "table" then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
119 port_number, base_name, ssl_table = opts.port or 9280, opts.path or "register_account", opts.ssl or nil |
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
|
120 elseif type(opts) == "string" then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
121 base_name, port_number = opts, 9280 |
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
|
122 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
|
123 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
|
124 |
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 if ssl_table == nil then |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
126 ports = { { port = port_number } } |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
127 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
|
128 else |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
129 if port_number == 9280 then port_number = 9443 end |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
130 ports = { { port = port_number, ssl = ssl_table } } |
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
131 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
|
132 end |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
133 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
|
134 |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
135 if prosody.start_time then -- already started |
529
84e992f70ba3
mod_register_json: stick to one code "punctuation" style.
Marco Cirillo <maranda@lightwitch.org>
parents:
430
diff
changeset
|
136 setup() |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
137 else |
536
09280dd0b22e
mod_register_json: replaced prosody.events.add_handler with module:hook.
Marco Cirillo <maranda@lightwitch.org>
parents:
529
diff
changeset
|
138 module:hook("server-started", setup) |
355
a5da789b2e7d
mod_register_json: First commit (needs tests).
Marco Cirillo <maranda@lightwitch.org>
parents:
diff
changeset
|
139 end |