Merge 0.9->trunk

4 files changed, 106 insertions, 74 deletions

diff --git a/net/dns.lua b/net/dns.lua
index 5b32a56c..a134eceb 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -549,6 +549,7 @@ function resolver:decode(packet, force)    -- - - - - - - - - - - - - - decode
 
 	if not force then
 		if not self.active[response.header.id] or not self.active[response.header.id][response.question.raw] then
+			self.active[response.header.id] = nil;
 			return nil;
 		end
 	end
@@ -642,6 +643,7 @@ function resolver:voidsocket(sock)
 		self.socket[self.socketset[sock]] = nil;
 		self.socketset[sock] = nil;
 	end
+	sock:close();
 end
 
 function resolver:socket_wrapper_set(func)  -- - - - - - - socket_wrapper_set
@@ -796,6 +798,9 @@ function resolver:servfail(sock)
 				end
 			end
 		end
+		if next(queries) == nil then
+			self.active[id] = nil;
+		end
 	end
 
 	if num == self.best_server then
@@ -852,6 +857,7 @@ function resolver:receive(rset)    -- - - - - - - - - - - - - - - - -  receive
 						set(self.wanted, q.class, q.type, q.name, nil);
 					end
 				end
+				
 			end
 		end
 	end
diff --git a/net/http/parser.lua b/net/http/parser.lua
index c760a0a4..b53dfa4e 100644
--- a/net/http/parser.lua
+++ b/net/http/parser.lua
@@ -91,7 +91,14 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
 							responseheaders = headers;
 						};
 					else
-						local parsed_url = url_parse(path);
+						local parsed_url;
+						if path:byte() == 47 then -- starts with /
+							local _path, _query = path:match("([^?]*).?(.*)");
+							if _query == "" then _query = nil; end
+							parsed_url = { path = _path, query = _query };
+						else
+							parsed_url = url_parse(path);
+						end
 						path = preprocess_path(parsed_url.path);
 						headers.host = parsed_url.host or headers.host;
 
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index a56f2992..12ab2355 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -204,6 +204,7 @@ function commands.help(session, data)
 		print [[host - Commands to activate, deactivate and list virtual hosts]]
 		print [[user - Commands to create and delete users, and change their passwords]]
 		print [[server - Uptime, version, shutting down, etc.]]
+		print [[port - Commands to manage ports the server is listening on]]
 		print [[config - Reloading the configuration, etc.]]
 		print [[console - Help regarding the console itself]]
 	elseif section == "c2s" then
@@ -233,6 +234,9 @@ function commands.help(session, data)
 		print [[server:version() - Show the server's version number]]
 		print [[server:uptime() - Show how long the server has been running]]
 		print [[server:shutdown(reason) - Shut down the server, with an optional reason to be broadcast to all connections]]
+	elseif section == "port" then
+		print [[port:list() - Lists all network ports prosody currently listens on]]
+		print [[port:close(port, interface) - Close a port]]
 	elseif section == "config" then
 		print [[config:reload() - Reload the server configuration. Modules may need to be reloaded for changes to take effect.]]
 	elseif section == "console" then
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index 43094eb4..915bec58 100644
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -7,6 +7,7 @@
 --
 
 module:depends("http");
+local server = require"net.http.server";
 local lfs = require "lfs";
 
 local os_date = os.date;
@@ -14,9 +15,9 @@ local open = io.open;
 local stat = lfs.attributes;
 local build_path = require"socket.url".build_path;
 
-local http_base = module:get_option_string("http_files_dir", module:get_option_string("http_path", "www_files"));
-local dir_indices = module:get_option("http_files_index", { "index.html", "index.htm" });
-local show_file_list = module:get_option_boolean("http_files_show_list");
+local base_path = module:get_option_string("http_files_dir", module:get_option_string("http_path"));
+local dir_indices = module:get_option("http_index_files", { "index.html", "index.htm" });
+local directory_index = module:get_option_boolean("http_dir_listing");
 
 local mime_map = module:shared("mime").types;
 if not mime_map then
@@ -49,90 +50,104 @@ end
 
 local cache = setmetatable({}, { __mode = "kv" }); -- Let the garbage collector have it if it wants to.
 
-function serve_file(event, path)
-	local request, response = event.request, event.response;
-	local orig_path = request.path;
-	local full_path = http_base.."/"..path;
-	local attr = stat(full_path);
-	if not attr then
-		return 404;
+function serve(opts)
+	if type(opts) ~= "table" then -- assume path string
+		opts = { path = opts };
 	end
+	local base_path = opts.path;
+	local dir_indices = opts.index_files or dir_indices;
+	local directory_index = opts.directory_index;
+	local function serve_file(event, path)
+		local request, response = event.request, event.response;
+		local orig_path = request.path;
+		local full_path = base_path .. (path and "/"..path or "");
+		local attr = stat(full_path);
+		if not attr then
+			return 404;
+		end
 
-	local request_headers, response_headers = request.headers, response.headers;
-
-	local last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification);
-	response_headers.last_modified = last_modified;
+		local request_headers, response_headers = request.headers, response.headers;
 
-	local etag = ("%02x-%x-%x-%x"):format(attr.dev or 0, attr.ino or 0, attr.size or 0, attr.modification or 0);
-	response_headers.etag = etag;
+		local last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification);
+		response_headers.last_modified = last_modified;
 
-	local if_none_match = request_headers.if_none_match
-	local if_modified_since = request_headers.if_modified_since;
-	if etag == if_none_match
-	or (not if_none_match and last_modified == if_modified_since) then
-		return 304;
-	end
+		local etag = ("%02x-%x-%x-%x"):format(attr.dev or 0, attr.ino or 0, attr.size or 0, attr.modification or 0);
+		response_headers.etag = etag;
 
-	local data = cache[path];
-	if data and data.etag == etag then
-		response_headers.content_type = data.content_type;
-		data = data.data;
-	elseif attr.mode == "directory" then
-		if full_path:sub(-1) ~= "/" then
-			local path = { is_absolute = true, is_directory = true };
-			for dir in orig_path:gmatch("[^/]+") do path[#path+1]=dir; end
-			response_headers.location = build_path(path);
-			return 301;
-		end
-		for i=1,#dir_indices do
-			if stat(full_path..dir_indices[i], "mode") == "file" then
-				return serve_file(event, path..dir_indices[i]);
-			end
+		local if_none_match = request_headers.if_none_match
+		local if_modified_since = request_headers.if_modified_since;
+		if etag == if_none_match
+		or (not if_none_match and last_modified == if_modified_since) then
+			return 304;
 		end
 
-		if not show_file_list then
-			return 403;
-		else
-			local html = require"util.stanza".stanza("html")
-				:tag("head"):tag("title"):text(path):up()
-					:tag("meta", { charset="utf-8" }):up()
-				:up()
-				:tag("body"):tag("h1"):text(path):up()
-					:tag("ul");
-			for file in lfs.dir(full_path) do
-				if file:sub(1,1) ~= "." then
-					local attr = stat(full_path..file) or {};
-					html:tag("li", { class = attr.mode })
-						:tag("a", { href = file }):text(file)
-					:up():up();
+		local data = cache[orig_path];
+		if data and data.etag == etag then
+			response_headers.content_type = data.content_type;
+			data = data.data;
+		elseif attr.mode == "directory" and path then
+			if full_path:sub(-1) ~= "/" then
+				local path = { is_absolute = true, is_directory = true };
+				for dir in orig_path:gmatch("[^/]+") do path[#path+1]=dir; end
+				response_headers.location = build_path(path);
+				return 301;
+			end
+			for i=1,#dir_indices do
+				if stat(full_path..dir_indices[i], "mode") == "file" then
+					return serve_file(event, path..dir_indices[i]);
 				end
 			end
-			data = "<!DOCTYPE html>\n"..tostring(html);
-			cache[path] = { data = data, content_type = mime_map.html; etag = etag; };
+
+			if directory_index then
+				data = server._events.fire_event("directory-index", { path = request.path, full_path = full_path });
+			end
+			if not data then
+				return 403;
+			end
+			cache[orig_path] = { data = data, content_type = mime_map.html; etag = etag; };
 			response_headers.content_type = mime_map.html;
-		end
 
-	else
-		local f, err = open(full_path, "rb");
-		if f then
-			data = f:read("*a");
-			f:close();
-		end
-		if not data then
-			return 403;
+		else
+			local f, err = open(full_path, "rb");
+			if f then
+				data, err = f:read("*a");
+				f:close();
+			end
+			if not data then
+				module:log("debug", "Could not open or read %s. Error was %s", full_path, err);
+				return 403;
+			end
+			local ext = full_path:match("%.([^./]+)$");
+			local content_type = ext and mime_map[ext];
+			cache[orig_path] = { data = data; content_type = content_type; etag = etag };
+			response_headers.content_type = content_type;
 		end
-		local ext = path:match("%.([^./]+)$");
-		local content_type = ext and mime_map[ext];
-		cache[path] = { data = data; content_type = content_type; etag = etag };
-		response_headers.content_type = content_type;
+
+		return response:send(data);
 	end
 
-	return response:send(data);
+	return serve_file;
 end
 
-module:provides("http", {
-	route = {
-		["GET /*"] = serve_file;
-	};
-});
+function wrap_route(routes)
+	for route,handler in pairs(routes) do
+		if type(handler) ~= "function" then
+			routes[route] = serve(handler);
+		end
+	end
+	return routes;
+end
+
+if base_path then
+	module:provides("http", {
+		route = {
+			["GET /*"] = serve {
+				path = base_path;
+				directory_index = directory_index;
+			}
+		};
+	});
+else
+	module:log("debug", "http_files_dir not set, assuming use by some other module");
+end