From e64c982be472e25835cf9bf9f14efb131b73aece Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 26 Apr 2012 16:48:16 +0100
Subject: mod_http_files, net.http.parser: Move path normalization to
 net.http.parser so that all modules can benefit

---
 net/http/parser.lua        | 20 +++++++++++++++++++-
 plugins/mod_http_files.lua | 24 +-----------------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/net/http/parser.lua b/net/http/parser.lua
index fdcb8ebb..3d9d1a87 100644
--- a/net/http/parser.lua
+++ b/net/http/parser.lua
@@ -2,6 +2,24 @@
 local tonumber = tonumber;
 local assert = assert;
 
+local function preprocess_path(path)
+	if path:sub(1,1) ~= "/" then
+		path = "/"..path;
+	end
+	local level = 0;
+	for component in path:gmatch("([^/]+)/") do
+		if component == ".." then
+			level = level - 1;
+		elseif component ~= "." then
+			level = level + 1;
+		end
+		if level < 0 then
+			return nil;
+		end
+	end
+	return path;
+end
+
 local httpstream = {};
 
 function httpstream.new(success_cb, error_cb, parser_type, options_cb)
@@ -74,7 +92,7 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb)
 						if path:match("^https?://") then
 							headers.host, path = path:match("^https?://([^/]*)(.*)");
 						end
-						path = path:gsub("^//+", "/"); -- TODO parse url more
+						path = preprocess_path(path);
 
 						len = len or 0;
 						packet = {
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index 932d2547..9be735b7 100644
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -25,31 +25,9 @@ local mime_map = {
 	css = "text/css";
 };
 
-local function preprocess_path(path)
-	if path:sub(1,1) ~= "/" then
-		path = "/"..path;
-	end
-	local level = 0;
-	for component in path:gmatch("([^/]+)/") do
-		if component == ".." then
-			level = level - 1;
-		elseif component ~= "." then
-			level = level + 1;
-		end
-		if level < 0 then
-			return nil;
-		end
-	end
-	return path;
-end
-
 function serve_file(event, path)
 	local response = event.response;
-	path = path and preprocess_path(path);
-	if not path then
-		return 400;
-	end
-	local full_path = http_base..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(event, path.."/index.html");
-- 
cgit v1.2.3