X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_httpserver.lua;h=654aff067ce5d894078f37ac381888312e83e3f7;hb=0e56f7d48799e928e6bec45495abc551a3f5f5ac;hp=73357f1be02526ea34c77500807a389eeba73900;hpb=93be7feb6d88d80b4eef68306d71d75bfd8fa904;p=prosody.git

diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua
index 73357f1b..654aff06 100644
--- a/plugins/mod_httpserver.lua
+++ b/plugins/mod_httpserver.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -8,48 +8,90 @@
 
 
 local httpserver = require "net.httpserver";
+local lfs = require "lfs";
 
 local open = io.open;
 local t_concat = table.concat;
-local check_http_path;
+local stat = lfs.attributes;
 
 local http_base = config.get("*", "core", "http_path") or "www_files";
 
-local response_403 = { status = "403 Forbidden", body = "<h1>Invalid URL</h1>Sorry, we couldn't find what you were looking for :(" };
+local response_400 = { status = "400 Bad Request", body = "<h1>Bad Request</h1>Sorry, we didn't understand your request :(" };
+local response_403 = { status = "403 Forbidden", body = "<h1>Forbidden</h1>You don't have permission to view the contents of this directory :(" };
 local response_404 = { status = "404 Not Found", body = "<h1>Page Not Found</h1>Sorry, we couldn't find what you were looking for :(" };
 
-local http_path = { http_base };
-local function handle_request(method, body, request)
-	local path = check_http_path(request.url.path:gsub("^/[^/]+%.*", ""));
-	if not path then
-		return response_403;
-	end
-	http_path[2] = path;
-	local f, err = open(t_concat(http_path), "r");
-	if not f then return response_404; end
-	local data = f:read("*a");
-	f:close();
-	return data;
-end
+-- TODO: Should we read this from /etc/mime.types if it exists? (startup time...?)
+local mime_map = {
+	html = "text/html";
+	htm = "text/html";
+	xml = "text/xml";
+	xsl = "text/xml";
+	txt = "text/plain; charset=utf-8";
+	js = "text/javascript";
+	css = "text/css";
+};
 
-local ports = config.get(module.host, "core", "http_ports") or { 5280 };
-httpserver.new_from_config(ports, "files", handle_request);
-
-function check_http_path(url)
-	if url:sub(1,1) ~= "/" then
-		url = "/"..url;
+local function preprocess_path(path)
+	if path:sub(1,1) ~= "/" then
+		path = "/"..path;
 	end
-	
 	local level = 0;
-	for part in url:gmatch("%/([^/]+)") do
-		if part == ".." then
+	for component in path:gmatch("([^/]+)/") do
+		if component == ".." then
 			level = level - 1;
-		elseif part ~= "." then
+		elseif component ~= "." then
 			level = level + 1;
 		end
 		if level < 0 then
 			return nil;
 		end
 	end
-	return url;
+	return path;
+end
+
+function serve_file(path)
+	local full_path = http_base..path;
+	if stat(full_path, "mode") == "directory" then
+		if stat(full_path.."/index.html", "mode") == "file" then
+			return serve_file(path.."/index.html");
+		end
+		return response_403;
+	end
+	local f, err = open(full_path, "rb");
+	if not f then return response_404; end
+	local data = f:read("*a");
+	f:close();
+	if not data then
+		return response_403;
+	end
+	local ext = path:match("%.([^.]*)$");
+	local mime = mime_map[ext]; -- Content-Type should be nil when not known
+	return {
+		headers = { ["Content-Type"] = mime; };
+		body = data;
+	};
+end
+
+local function handle_file_request(method, body, request)
+	local path = preprocess_path(request.url.path);
+	if not path then return response_400; end
+	path = path:gsub("^/[^/]+", ""); -- Strip /files/
+	return serve_file(path);
+end
+
+local function handle_default_request(method, body, request)
+	local path = preprocess_path(request.url.path);
+	if not path then return response_400; end
+	return serve_file(path);
+end
+
+local function setup()
+	local ports = config.get(module.host, "core", "http_ports") or { 5280 };
+	httpserver.set_default_handler(handle_default_request);
+	httpserver.new_from_config(ports, handle_file_request, { base = "files" });
+end
+if prosody.start_time then -- already started
+	setup();
+else
+	prosody.events.add_handler("server-started", setup);
 end