mod_http: Rework how module:http_url() builds the url.

[prosody.git] / plugins / mod_http.lua

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 8b8d9c474609fbf36540c69d8a0b03579d16ea7d..090b522ba8e9b17f0f2e3cfcf86237d9583e6cb3 100644 (file)
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -7,32 +7,63 @@
 --
 
 module:set_global();
+module:depends("http_errors");
+
+local moduleapi = require "core.moduleapi";
+local url_parse = require "socket.url".parse;
+local url_build = require "socket.url".build;
 
-local parse_url = require "socket.url".parse;
 local server = require "net.http.server";
 
+server.set_default_host(module:get_option_string("http_default_host"));
+
 local function normalize_path(path)
-       if path:sub(1,1) ~= "/" then path = "/"..path; end
        if path:sub(-1,-1) == "/" then path = path:sub(1, -2); end
+       if path:sub(1,1) ~= "/" then path = "/"..path; end
        return path;
 end
 
 local function get_http_event(host, app_path, key)
        local method, path = key:match("^(%S+)%s+(.+)$");
-       if not method then
-               if key:sub(1,1) ~= "/" then
-                       return nil;
-               end
-               method, path = "GET", key;
+       if not method then -- No path specified, default to "" (base path)
+               method, path = key, "";
+       end
+       if method:sub(1,1) == "/" then
+               return nil;
+       end
+       if app_path == "/" and path:sub(1,1) == "/" then
+               app_path = "";
        end
-       path = normalize_path(path);
        return method:upper().." "..host..app_path..path;
 end
 
 local function get_base_path(host_module, app_name, default_app_path)
-       return 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
+end
+
+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 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 "/")..
+                                       (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
+                       return url_build(url);
+               end
+       end
 end
 
 function module.add_host(module)
@@ -42,8 +73,8 @@ function module.add_host(module)
        local function http_app_added(event)
                local app_name = event.item.name;
                local default_app_path = event.item.default_path or "/"..app_name;
-               local app_path = normalize_path(get_base_path(module, app_name, default_app_path));
-               if not app_name then            
+               local app_path = get_base_path(module, app_name, default_app_path);
+               if not app_name then
                        -- TODO: Link to docs
                        module:log("error", "HTTP app has no 'name', add one or use module:provides('http', app)");
                        return;
@@ -53,7 +84,10 @@ function module.add_host(module)
                for key, handler in pairs(event.item.route or {}) do
                        local event_name = get_http_event(host, app_path, key);
                        if event_name then
-                               if event_name:sub(-2, -1) == "/*" then
+                               if type(handler) ~= "function" then
+                                       local data = handler;
+                                       handler = function () return data; end
+                               elseif event_name:sub(-2, -1) == "/*" then
                                        local base_path = event_name:match("/(.+)/*$");
                                        local _handler = handler;
                                        handler = function (event)
@@ -68,7 +102,7 @@ function module.add_host(module)
                                        module:log("warn", "App %s added handler twice for '%s', ignoring", app_name, event_name);
                                end
                        else
-                               module:log("error", "Invalid route in %s: %q", app_name, key);
+                               module:log("error", "Invalid route in %s, %q. See http://prosody.im/doc/developers/http#routes", app_name, key);
                        end
                end
        end
@@ -82,6 +116,11 @@ function module.add_host(module)
        end
        
        module:handle_items("http-provider", http_app_added, http_app_removed);
+
+       server.add_host(host);
+       function module.unload()
+               server.remove_host(host);
+       end
 end
 
 module:add_item("net-provider", {