Merge 0.10->trunk

[prosody.git] / plugins / mod_http.lua

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index f386f87085e7dba69bbeba57262b8f6b5e9f35f2..49529ea28b1109c264acc8cdc1ad56d487e3ea17 100644 (file)
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2012 Matthew Wild
 -- Copyright (C) 2008-2012 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -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 = host_module.host });
 end
 
 local ports_by_scheme = { http = 80, https = 443, };
@@ -49,6 +51,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
@@ -88,10 +93,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
@@ -106,7 +111,7 @@ function module.add_host(module)
                        end
                end
        end
-       
+
        local function http_app_removed(event)
                local app_handlers = apps[event.item.name];
                apps[event.item.name] = nil;
@@ -114,7 +119,7 @@ function module.add_host(module)
                        module:unhook_object_event(server, event, handler);
                end
        end
-       
+
        module:handle_items("http-provider", http_app_added, http_app_removed);
 
        server.add_host(host);
@@ -137,6 +142,13 @@ module:provides("net", {
        listener = server.listener;
        default_port = 5281;
        encryption = "ssl";
+       ssl_config = {
+               verify = {
+                       peer = false,
+                       client_once = false,
+                       "none",
+               }
+       };
        multiplex = {
                pattern = "^[A-Z]";
        };