X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_http.lua;h=0689634ec704a0f08848b75d95fed076f852c96b;hb=bca9d41c435fcce947eb9ee166efae96becbac5f;hp=6da4db2438017a9b28e19d5eff98f8d03217f27b;hpb=3b635da220bdbe28712f7007be430eb6e1283912;p=prosody.git

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 6da4db24..0689634e 100644
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -7,37 +7,76 @@
 --
 
 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;
 
-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 (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 });
+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 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 = (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
+			return url_build(url);
+		end
+	end
+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)
 		local app_name = event.item.name;
 		local default_app_path = event.item.default_path or "/"..app_name;
-		local app_path = normalize_path(module:get_option_string(app_name.."_http_path", 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;
@@ -47,22 +86,25 @@ 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
-					local base_path = event_name:match("/(.+)/*$");
+				if type(handler) ~= "function" then
+					local data = handler;
+					handler = function () return data; end
+				elseif event_name:sub(-2, -1) == "/*" then
+					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
 				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
@@ -71,14 +113,19 @@ 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
 	
 	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", {
+module:provides("net", {
 	name = "http";
 	listener = server.listener;
 	default_port = 5280;
@@ -87,11 +134,12 @@ module:add_item("net-provider", {
 	};
 });
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "https";
 	listener = server.listener;
 	default_port = 5281;
 	encryption = "ssl";
+	ssl_config = { verify = "none" };
 	multiplex = {
 		pattern = "^[A-Z]";
 	};