prosodyctl: Add message describing the distinguished name input expected

[prosody.git] / plugins / mod_http.lua

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 22441faaa4a1fae255708bf48384f4a0aeddbb22..0689634ec704a0f08848b75d95fed076f852c96b 100644 (file)
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -9,6 +9,7 @@
 module:set_global();
 module:depends("http_errors");
 
+local portmanager = require "core.portmanager";
 local moduleapi = require "core.moduleapi";
 local url_parse = require "socket.url".parse;
 local url_build = require "socket.url".build;
@@ -38,9 +39,10 @@ local function get_http_event(host, app_path, key)
 end
 
 local function get_base_path(host_module, app_name, default_app_path)
-       return normalize_path(host_module:get_option("http_paths", {})[app_name] -- Host
+       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
+               or default_app_path)) -- Default
+               :gsub("%$(%w+)", { host = module.host });
 end
 
 local ports_by_scheme = { http = 80, https = 443, };
@@ -48,16 +50,16 @@ local ports_by_scheme = { http = 80, https = 443, };
 -- Helper to deduce a module's external URL
 function moduleapi.http_url(module, app_name, default_path)
        app_name = app_name or (module.name:gsub("^http_", ""));
-       local ext = url_parse(module:get_option_string("http_external_url")) or {};
+       local external_url = url_parse(module:get_option_string("http_external_url")) or {};
        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
                for port, services in pairs(ports) do
                        local url = {
-                               scheme = (ext.scheme or services[1].service.name);
-                               host = (ext.host or module.host);
-                               port = tonumber(ext.port) or port or 80;
-                               path = normalize_path(ext.path or "/")..
+                               scheme = (external_url.scheme or services[1].service.name);
+                               host = (external_url.host or module:get_option_string("http_host", module.host));
+                               port = tonumber(external_url.port) or port or 80;
+                               path = normalize_path(external_url.path or "/")..
                                        (get_base_path(module, app_name, default_path or "/"..app_name):sub(2));
                        }
                        if ports_by_scheme[url.scheme] == url.port then url.port = nil end
@@ -67,7 +69,7 @@ function moduleapi.http_url(module, app_name, default_path)
 end
 
 function module.add_host(module)
-       local host = module.host;
+       local host = module:get_option_string("http_host", module.host);
        local apps = {};
        module.environment.apps = apps;
        local function http_app_added(event)
@@ -88,10 +90,10 @@ function module.add_host(module)
                                        local data = handler;
                                        handler = function () return data; end
                                elseif event_name:sub(-2, -1) == "/*" then
-                                       local base_path = event_name:match("/(.+)/*$");
+                                       local base_path_len = #event_name:match("/.+$");
                                        local _handler = handler;
                                        handler = function (event)
-                                               local path = event.request.path:sub(#base_path+1);
+                                               local path = event.request.path:sub(base_path_len);
                                                return _handler(event, path);
                                        end;
                                end
@@ -137,6 +139,7 @@ module:provides("net", {
        listener = server.listener;
        default_port = 5281;
        encryption = "ssl";
+       ssl_config = { verify = "none" };
        multiplex = {
                pattern = "^[A-Z]";
        };