test_util_multitable: make mt variable local [luacheck]

[prosody.git] / plugins / mod_http.lua

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 95933da5d82529d28e4123134d772fc641e2bb80..086887fbcc9a9b63ccd078c3a65804481d12a419 100644 (file)
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -42,7 +42,12 @@ local function get_base_path(host_module, app_name, default_app_path)
        return (normalize_path(host_module:get_option("http_paths", {})[app_name] -- Host
                or module:get_option("http_paths", {})[app_name] -- Global
                or default_app_path)) -- Default
-               :gsub("%$(%w+)", { host = module.host });
+               :gsub("%$(%w+)", { host = host_module.host });
+end
+
+local function redir_handler(event)
+       event.response.headers.location = event.request.path.."/";
+       return 301;
 end
 
 local ports_by_scheme = { http = 80, https = 443, };
@@ -51,6 +56,9 @@ local ports_by_scheme = { http = 80, https = 443, };
 function moduleapi.http_url(module, app_name, default_path)
        app_name = app_name or (module.name:gsub("^http_", ""));
        local external_url = url_parse(module:get_option_string("http_external_url")) or {};
+       if external_url.scheme and external_url.port == nil then
+               external_url.port = ports_by_scheme[external_url.scheme];
+       end
        local services = portmanager.get_active_services();
        local http_services = services:get("https") or services:get("http") or {};
        for interface, ports in pairs(http_services) do
@@ -66,6 +74,8 @@ function moduleapi.http_url(module, app_name, default_path)
                        return url_build(url);
                end
        end
+       module:log("warn", "No http ports enabled, can't generate an external URL");
+       return "http://disabled.invalid/";
 end
 
 function module.add_host(module)
@@ -96,6 +106,9 @@ function module.add_host(module)
                                                local path = event.request.path:sub(base_path_len);
                                                return _handler(event, path);
                                        end;
+                                       module:hook_object_event(server, event_name:sub(1, -3), redir_handler, -1);
+                               elseif event_name:sub(-1, -1) == "/" then
+                                       module:hook_object_event(server, event_name:sub(1, -2), redir_handler, -1);
                                end
                                if not app_handlers[event_name] then
                                        app_handlers[event_name] = handler;
@@ -107,6 +120,12 @@ function module.add_host(module)
                                module:log("error", "Invalid route in %s, %q. See http://prosody.im/doc/developers/http#routes", app_name, key);
                        end
                end
+               local services = portmanager.get_active_services();
+               if services:get("https") or services:get("http") then
+                       module:log("debug", "Serving '%s' at %s", app_name, module:http_url(app_name, app_path));
+               else
+                       module:log("warn", "Not listening on any ports, '%s' will be unreachable", app_name);
+               end
        end
 
        local function http_app_removed(event)
@@ -139,7 +158,13 @@ module:provides("net", {
        listener = server.listener;
        default_port = 5281;
        encryption = "ssl";
-       ssl_config = { verify = "none" };
+       ssl_config = {
+               verify = {
+                       peer = false,
+                       client_once = false,
+                       "none",
+               }
+       };
        multiplex = {
                pattern = "^[A-Z]";
        };