X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fmod_http.lua;h=95933da5d82529d28e4123134d772fc641e2bb80;hb=cd4302a2db387ed852a06cb997e6424d61ca5419;hp=c379a5628ae281439bffb60a23707441ac48846d;hpb=23407c138e72289a00f9db340bbbaf5068fb4135;p=prosody.git

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index c379a562..95933da5 100644
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -1,20 +1,26 @@
 -- 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.
 --
 
 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 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
 
@@ -26,24 +32,51 @@ local function get_http_event(host, app_path, key)
 	if method:sub(1,1) == "/" then
 		return nil;
 	end
+	if app_path == "/" and path:sub(1,1) == "/" then
+		app_path = "";
+	end
 	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
+		: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(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;
@@ -57,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
@@ -75,7 +108,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;
@@ -83,7 +116,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);
@@ -92,7 +125,7 @@ function module.add_host(module)
 	end
 end
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "http";
 	listener = server.listener;
 	default_port = 5280;
@@ -101,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]";
 	};