mod_http: Link to docs on routes in error message

[prosody.git] / plugins / mod_http.lua

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index d8e1e10a7bdc92a8a77494bf99bda770378f1f09..93d5843914d4531c188db20863d5306dfb8247c7 100644 (file)
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -8,7 +8,6 @@
 
 module:set_global();
 
-local parse_url = require "socket.url".parse;
 local server = require "net.http.server";
 
 local function normalize_path(path)
@@ -17,23 +16,32 @@ local function normalize_path(path)
        return path;
 end
 
-local function get_http_event(http_module, app_name, key)
+local function get_http_event(host, app_path, key)
        local method, path = key:match("^(%S+)%s+(.+)$");
-       if not method and key:sub(1,1) == "/" then
+       if not method then
+               if key:sub(1,1) ~= "/" then
+                       return nil;
+               end
                method, path = "GET", key;
-       else
-               return nil;
        end
        path = normalize_path(path);
-       local app_path = normalize_path(http_module:get_option_string(app_name.."_http_path", "/"..app_name));
-       return method:upper().." "..http_module.host..app_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
+               or module:get_option("http_paths", {})[app_name] -- Global
+               or default_app_path; -- Default
 end
 
 function module.add_host(module)
+       local host = module.host;
        local apps = {};
        module.environment.apps = apps;
        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            
                        -- TODO: Link to docs
                        module:log("error", "HTTP app has no 'name', add one or use module:provides('http', app)");
@@ -42,16 +50,24 @@ function module.add_host(module)
                apps[app_name] = apps[app_name] or {};
                local app_handlers = apps[app_name];
                for key, handler in pairs(event.item.route or {}) do
-                       local event_name = get_http_event(module, app_name, key);
+                       local event_name = get_http_event(host, app_path, key);
                        if event_name then
+                               if event_name:sub(-2, -1) == "/*" then
+                                       local base_path = event_name:match("/(.+)/*$");
+                                       local _handler = handler;
+                                       handler = function (event)
+                                               local path = event.request.path:sub(#base_path+1);
+                                               return _handler(event, path);
+                                       end;
+                               end
                                if not app_handlers[event_name] then
                                        app_handlers[event_name] = handler;
-                                       server.add_handler(event_name, handler);
+                                       module:hook_object_event(server, event_name, handler);
                                else
                                        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
@@ -60,7 +76,7 @@ function module.add_host(module)
                local app_handlers = apps[event.item.name];
                apps[event.item.name] = nil;
                for event, handler in pairs(app_handlers) do
-                       server.remove_handler(event, handler);
+                       module:unhook_object_event(server, event, handler);
                end
        end