From 6f6ac910564bf6ecdc0e6b70cf06bd84a24868fb Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 5 Apr 2019 16:10:51 +0200
Subject: net.http.files: Copy of mod_http_files

The intent is to make it easier to reuse and simplify mod_http_files.
Currently modules will use the serve() function exported by
mod_http_files in order to serve their own files. This makes it unclear
whether mod_http_files should be doing anything on its own. Moving the
logic into a separate module should help here, as well as make re-use
outside of prosody easier.
---
 net/http/files.lua | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 198 insertions(+)
 create mode 100644 net/http/files.lua

(limited to 'net/http')

diff --git a/net/http/files.lua b/net/http/files.lua
new file mode 100644
index 00000000..1dae0d6d
--- /dev/null
+++ b/net/http/files.lua
@@ -0,0 +1,198 @@
+-- Prosody IM
+-- 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.
+--
+
+module:depends("http");
+local server = require"net.http.server";
+local lfs = require "lfs";
+
+local os_date = os.date;
+local open = io.open;
+local stat = lfs.attributes;
+local build_path = require"socket.url".build_path;
+local path_sep = package.config:sub(1,1);
+
+local base_path = module:get_option_path("http_files_dir", module:get_option_path("http_path"));
+local cache_size = module:get_option_number("http_files_cache_size", 128);
+local cache_max_file_size = module:get_option_number("http_files_cache_max_file_size", 4096);
+local dir_indices = module:get_option_array("http_index_files", { "index.html", "index.htm" });
+local directory_index = module:get_option_boolean("http_dir_listing");
+
+local mime_map = module:shared("/*/http_files/mime").types;
+if not mime_map then
+	mime_map = {
+		html = "text/html", htm = "text/html",
+		xml = "application/xml",
+		txt = "text/plain",
+		css = "text/css",
+		js = "application/javascript",
+		png = "image/png",
+		gif = "image/gif",
+		jpeg = "image/jpeg", jpg = "image/jpeg",
+		svg = "image/svg+xml",
+	};
+	module:shared("/*/http_files/mime").types = mime_map;
+
+	local mime_types, err = open(module:get_option_path("mime_types_file", "/etc/mime.types", "config"), "r");
+	if mime_types then
+		local mime_data = mime_types:read("*a");
+		mime_types:close();
+		setmetatable(mime_map, {
+			__index = function(t, ext)
+				local typ = mime_data:match("\n(%S+)[^\n]*%s"..(ext:lower()).."%s") or "application/octet-stream";
+				t[ext] = typ;
+				return typ;
+			end
+		});
+	end
+end
+
+local forbidden_chars_pattern = "[/%z]";
+if prosody.platform == "windows" then
+	forbidden_chars_pattern = "[/%z\001-\031\127\"*:<>?|]"
+end
+
+local urldecode = require "util.http".urldecode;
+function sanitize_path(path)
+	if not path then return end
+	local out = {};
+
+	local c = 0;
+	for component in path:gmatch("([^/]+)") do
+		component = urldecode(component);
+		if component:find(forbidden_chars_pattern) then
+			return nil;
+		elseif component == ".." then
+			if c <= 0 then
+				return nil;
+			end
+			out[c] = nil;
+			c = c - 1;
+		elseif component ~= "." then
+			c = c + 1;
+			out[c] = component;
+		end
+	end
+	if path:sub(-1,-1) == "/" then
+		out[c+1] = "";
+	end
+	return "/"..table.concat(out, "/");
+end
+
+local cache = require "util.cache".new(cache_size);
+
+function serve(opts)
+	if type(opts) ~= "table" then -- assume path string
+		opts = { path = opts };
+	end
+	-- luacheck: ignore 431
+	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 sanitized_path = sanitize_path(path);
+		if path and not sanitized_path then
+			return 400;
+		end
+		path = sanitized_path;
+		local orig_path = sanitize_path(request.path);
+		local full_path = base_path .. (path or ""):gsub("/", path_sep);
+		local attr = stat(full_path:match("^.*[^\\/]")); -- Strip trailing path separator because Windows
+		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 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 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 data = cache:get(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 dir_path = { is_absolute = true, is_directory = true };
+				for dir in orig_path:gmatch("[^/]+") do dir_path[#dir_path+1]=dir; end
+				response_headers.location = build_path(dir_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
+
+			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:set(orig_path, { data = data, content_type = mime_map.html; etag = etag; });
+			response_headers.content_type = mime_map.html;
+
+		else
+			local f, err = open(full_path, "rb");
+			if not f then
+				module:log("debug", "Could not open %s. Error was %s", full_path, err);
+				return 403;
+			end
+			local ext = full_path:match("%.([^./]+)$");
+			local content_type = ext and mime_map[ext];
+			response_headers.content_type = content_type;
+			if attr.size > cache_max_file_size then
+				response_headers.content_length = attr.size;
+				module:log("debug", "%d > cache_max_file_size", attr.size);
+				return response:send_file(f);
+			else
+				data = f:read("*a");
+				f:close();
+			end
+			cache:set(orig_path, { data = data; content_type = content_type; etag = etag });
+		end
+
+		return response:send(data);
+	end
+
+	return serve_file;
+end
+
+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
+
-- 
cgit v1.2.3


From 3ea6ca719574ce8a1bfa9532c5526da05f3ff5d9 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 5 Apr 2019 17:09:03 +0200
Subject: net.http.files: Make into standalone library

---
 net/http/files.lua | 78 ++++++++++--------------------------------------------
 1 file changed, 14 insertions(+), 64 deletions(-)

(limited to 'net/http')

diff --git a/net/http/files.lua b/net/http/files.lua
index 1dae0d6d..0b898dc6 100644
--- a/net/http/files.lua
+++ b/net/http/files.lua
@@ -6,9 +6,10 @@
 -- COPYING file in the source package for more information.
 --
 
-module:depends("http");
 local server = require"net.http.server";
 local lfs = require "lfs";
+local new_cache = require "util.cache".new;
+local log = require "util.logger".init("net.http.files");
 
 local os_date = os.date;
 local open = io.open;
@@ -16,48 +17,14 @@ local stat = lfs.attributes;
 local build_path = require"socket.url".build_path;
 local path_sep = package.config:sub(1,1);
 
-local base_path = module:get_option_path("http_files_dir", module:get_option_path("http_path"));
-local cache_size = module:get_option_number("http_files_cache_size", 128);
-local cache_max_file_size = module:get_option_number("http_files_cache_max_file_size", 4096);
-local dir_indices = module:get_option_array("http_index_files", { "index.html", "index.htm" });
-local directory_index = module:get_option_boolean("http_dir_listing");
-
-local mime_map = module:shared("/*/http_files/mime").types;
-if not mime_map then
-	mime_map = {
-		html = "text/html", htm = "text/html",
-		xml = "application/xml",
-		txt = "text/plain",
-		css = "text/css",
-		js = "application/javascript",
-		png = "image/png",
-		gif = "image/gif",
-		jpeg = "image/jpeg", jpg = "image/jpeg",
-		svg = "image/svg+xml",
-	};
-	module:shared("/*/http_files/mime").types = mime_map;
-
-	local mime_types, err = open(module:get_option_path("mime_types_file", "/etc/mime.types", "config"), "r");
-	if mime_types then
-		local mime_data = mime_types:read("*a");
-		mime_types:close();
-		setmetatable(mime_map, {
-			__index = function(t, ext)
-				local typ = mime_data:match("\n(%S+)[^\n]*%s"..(ext:lower()).."%s") or "application/octet-stream";
-				t[ext] = typ;
-				return typ;
-			end
-		});
-	end
-end
 
 local forbidden_chars_pattern = "[/%z]";
-if prosody.platform == "windows" then
+if package.config:sub(1,1) == "\\" then
 	forbidden_chars_pattern = "[/%z\001-\031\127\"*:<>?|]"
 end
 
 local urldecode = require "util.http".urldecode;
-function sanitize_path(path)
+local function sanitize_path(path) --> util.paths or util.http?
 	if not path then return end
 	local out = {};
 
@@ -83,15 +50,16 @@ function sanitize_path(path)
 	return "/"..table.concat(out, "/");
 end
 
-local cache = require "util.cache".new(cache_size);
-
-function serve(opts)
+local function serve(opts)
 	if type(opts) ~= "table" then -- assume path string
 		opts = { path = opts };
 	end
+	local mime_map = opts.mime_map or { html = "text/html" };
+	local cache = new_cache(opts.cache_size or 256);
+	local cache_max_file_size = tonumber(opts.cache_max_file_size) or 1024
 	-- luacheck: ignore 431
 	local base_path = opts.path;
-	local dir_indices = opts.index_files or dir_indices;
+	local dir_indices = opts.index_files or { "index.html", "index.htm" };
 	local directory_index = opts.directory_index;
 	local function serve_file(event, path)
 		local request, response = event.request, event.response;
@@ -151,7 +119,7 @@ function serve(opts)
 		else
 			local f, err = open(full_path, "rb");
 			if not f then
-				module:log("debug", "Could not open %s. Error was %s", full_path, err);
+				log("debug", "Could not open %s. Error was %s", full_path, err);
 				return 403;
 			end
 			local ext = full_path:match("%.([^./]+)$");
@@ -159,7 +127,7 @@ function serve(opts)
 			response_headers.content_type = content_type;
 			if attr.size > cache_max_file_size then
 				response_headers.content_length = attr.size;
-				module:log("debug", "%d > cache_max_file_size", attr.size);
+				log("debug", "%d > cache_max_file_size", attr.size);
 				return response:send_file(f);
 			else
 				data = f:read("*a");
@@ -174,25 +142,7 @@ function serve(opts)
 	return serve_file;
 end
 
-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
+return {
+	serve = serve;
+}
 
-- 
cgit v1.2.3


From a371d01137d44a43cbeabe2590174fc36053bb2a Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 4 May 2019 04:48:40 +0200
Subject: net.http.files: Bump cache hits so they stay cached

It's not an LRU cache unless this is done.
---
 net/http/files.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'net/http')

diff --git a/net/http/files.lua b/net/http/files.lua
index 0b898dc6..090b15c8 100644
--- a/net/http/files.lua
+++ b/net/http/files.lua
@@ -94,6 +94,7 @@ local function serve(opts)
 		if data and data.etag == etag then
 			response_headers.content_type = data.content_type;
 			data = data.data;
+			cache:get(orig_path, data);
 		elseif attr.mode == "directory" and path then
 			if full_path:sub(-1) ~= "/" then
 				local dir_path = { is_absolute = true, is_directory = true };
-- 
cgit v1.2.3


From c6ca3b473e60f56a20113a3ab9d8a33231aae0e5 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 29 Jun 2019 19:19:38 +0200
Subject: net.http.files: Fix cache handling

Typo that broke the LRU-ness of the caching
---
 net/http/files.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'net/http')

diff --git a/net/http/files.lua b/net/http/files.lua
index 090b15c8..7ff81fc8 100644
--- a/net/http/files.lua
+++ b/net/http/files.lua
@@ -94,7 +94,7 @@ local function serve(opts)
 		if data and data.etag == etag then
 			response_headers.content_type = data.content_type;
 			data = data.data;
-			cache:get(orig_path, data);
+			cache:set(orig_path, data);
 		elseif attr.mode == "directory" and path then
 			if full_path:sub(-1) ~= "/" then
 				local dir_path = { is_absolute = true, is_directory = true };
-- 
cgit v1.2.3


From 89a6f8d8c108bdf633d7d6589c260de833c56bf5 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 12 Oct 2019 18:27:02 +0200
Subject: net.http.server: Ensure HEAD requests are sent with empty body

---
 net/http/server.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'net/http')

diff --git a/net/http/server.lua b/net/http/server.lua
index 9b63d516..47680455 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -194,8 +194,11 @@ function handle_request(conn, request, finish_cb)
 		response_conn_header = httpversion == "1.1" and "close" or nil
 	end
 
+	local is_head_request = request.method == "HEAD";
+
 	local response = {
 		request = request;
+		is_head_request = is_head_request;
 		status_code = 200;
 		headers = { date = date_header, connection = response_conn_header };
 		persistent = persistent;
@@ -291,16 +294,29 @@ local function prepare_header(response)
 	return output;
 end
 _M.prepare_header = prepare_header;
+function _M.send_head_response(response)
+	if response.finished then return; end
+	local output = prepare_header(response);
+	response.conn:write(t_concat(output));
+	response:done();
+end
 function _M.send_response(response, body)
 	if response.finished then return; end
 	body = body or response.body or "";
 	response.headers.content_length = #body;
+	if response.is_head_request then
+		return _M.send_head_response(response)
+	end
 	local output = prepare_header(response);
 	t_insert(output, body);
 	response.conn:write(t_concat(output));
 	response:done();
 end
 function _M.send_file(response, f)
+	if response.is_head_request then
+		if f.close then f:close(); end
+		return _M.send_head_response(response);
+	end
 	if response.finished then return; end
 	local chunked = not response.headers.content_length;
 	if chunked then response.headers.transfer_encoding = "chunked"; end
-- 
cgit v1.2.3


From 8e485ec3200359adcc00731a371b4455d24bb562 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 12 Oct 2019 18:27:54 +0200
Subject: net.http.server: Re-fire unhandled HEAD requsts as GET events (fixes
 #1447)

BC: This overloads the GET event.

Previous commit ensures HEAD requests are sent without a body.
---
 net/http/server.lua | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'net/http')

diff --git a/net/http/server.lua b/net/http/server.lua
index 47680455..b649ff5f 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -229,6 +229,11 @@ function handle_request(conn, request, finish_cb)
 	local payload = { request = request, response = response };
 	log("debug", "Firing event: %s", global_event);
 	local result = events.fire_event(global_event, payload);
+	if result == nil and is_head_request then
+		local global_head_event = "GET "..request.path:match("[^?]*");
+		log("debug", "Firing event: %s", global_head_event);
+		result = events.fire_event(global_head_event, payload);
+	end
 	if result == nil then
 		if not hosts[host] then
 			if hosts[default_host] then
@@ -249,6 +254,12 @@ function handle_request(conn, request, finish_cb)
 		local host_event = request.method.." "..host..request.path:match("[^?]*");
 		log("debug", "Firing event: %s", host_event);
 		result = events.fire_event(host_event, payload);
+
+		if result == nil and is_head_request then
+			local host_head_event = "GET "..host..request.path:match("[^?]*");
+			log("debug", "Firing event: %s", host_head_event);
+			result = events.fire_event(host_head_event, payload);
+		end
 	end
 	if result ~= nil then
 		if result ~= true then
-- 
cgit v1.2.3


From 30a72c72a392fdbee1e91946c9a72ed88a20b232 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 12 Oct 2019 19:30:29 +0200
Subject: net.http.server: Explicitly convert number to string, avoiding
 implicit coercion

---
 net/http/server.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'net/http')

diff --git a/net/http/server.lua b/net/http/server.lua
index b649ff5f..bf24c97e 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -314,7 +314,7 @@ end
 function _M.send_response(response, body)
 	if response.finished then return; end
 	body = body or response.body or "";
-	response.headers.content_length = #body;
+	response.headers.content_length = ("%d"):format(#body);
 	if response.is_head_request then
 		return _M.send_head_response(response)
 	end
-- 
cgit v1.2.3


From 9e6dce07bf7a9836eb8123bf198c8671d423157f Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 12 Oct 2019 19:31:48 +0200
Subject: net.http.files: Explicitly convert number to string, avoiding
 implicit coercion

---
 net/http/files.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'net/http')

diff --git a/net/http/files.lua b/net/http/files.lua
index 7ff81fc8..650c6f47 100644
--- a/net/http/files.lua
+++ b/net/http/files.lua
@@ -127,7 +127,7 @@ local function serve(opts)
 			local content_type = ext and mime_map[ext];
 			response_headers.content_type = content_type;
 			if attr.size > cache_max_file_size then
-				response_headers.content_length = attr.size;
+				response_headers.content_length = ("%d"):format(attr.size);
 				log("debug", "%d > cache_max_file_size", attr.size);
 				return response:send_file(f);
 			else
-- 
cgit v1.2.3


From 2b035680860450dd6ce9d3b853c26bd900752f8f Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 1 Nov 2019 23:18:29 +0100
Subject: net.http.codes: Avoid implicit number -> string coercion

---
 net/http/codes.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'net/http')

diff --git a/net/http/codes.lua b/net/http/codes.lua
index 8098b5c3..4327f151 100644
--- a/net/http/codes.lua
+++ b/net/http/codes.lua
@@ -82,5 +82,5 @@ local response_codes = {
 	-- [512-599] = "Unassigned";
 };
 
-for k,v in pairs(response_codes) do response_codes[k] = k.." "..v; end
+for k,v in pairs(response_codes) do response_codes[k] = ("%03d %s"):format(k, v); end
 return setmetatable(response_codes, { __index = function(_, k) return k.." Unassigned"; end })
-- 
cgit v1.2.3


From 6a73014b9acdf69a7c415ac8f5fa173f83a68362 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 1 Nov 2019 22:25:54 +0100
Subject: net.http.server: Factor out handling of event response for easier
 reuse

---
 net/http/server.lua | 65 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

(limited to 'net/http')

diff --git a/net/http/server.lua b/net/http/server.lua
index bf24c97e..991ef970 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -170,6 +170,38 @@ local headerfix = setmetatable({}, {
 	end
 });
 
+local function handle_result(request, response, result)
+	if result == nil then
+		result = 404;
+	end
+
+	if result == true then
+		return;
+	end
+
+	local body;
+	local result_type = type(result);
+	if result_type == "number" then
+		response.status_code = result;
+		if result >= 400 then
+			body = events.fire_event("http-error", { request = request, response = response, code = result });
+		end
+	elseif result_type == "string" then
+		body = result;
+	elseif result_type == "table" then
+		for k, v in pairs(result) do
+			if k ~= "headers" then
+				response[k] = v;
+			else
+				for header_name, header_value in pairs(v) do
+					response.headers[header_name] = header_value;
+				end
+			end
+		end
+	end
+	response:send(body);
+end
+
 function _M.hijack_response(response, listener) -- luacheck: ignore
 	error("TODO");
 end
@@ -261,39 +293,10 @@ function handle_request(conn, request, finish_cb)
 			result = events.fire_event(host_head_event, payload);
 		end
 	end
-	if result ~= nil then
-		if result ~= true then
-			local body;
-			local result_type = type(result);
-			if result_type == "number" then
-				response.status_code = result;
-				if result >= 400 then
-					payload.code = result;
-					body = events.fire_event("http-error", payload);
-				end
-			elseif result_type == "string" then
-				body = result;
-			elseif result_type == "table" then
-				for k, v in pairs(result) do
-					if k ~= "headers" then
-						response[k] = v;
-					else
-						for header_name, header_value in pairs(v) do
-							response.headers[header_name] = header_value;
-						end
-					end
-				end
-			end
-			response:send(body);
-		end
-		return;
-	end
 
-	-- if handler not called, return 404
-	response.status_code = 404;
-	payload.code = 404;
-	response:send(events.fire_event("http-error", payload));
+	return handle_result(request, response, result);
 end
+
 local function prepare_header(response)
 	local status_line = "HTTP/"..response.request.httpversion.." "..(response.status or codes[response.status_code]);
 	local headers = response.headers;
-- 
cgit v1.2.3


From fbab8ed06ac738e6aec96db67141f987b9d3c058 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 1 Nov 2019 22:28:39 +0100
Subject: net.http.server: Tail call because tail call!

---
 net/http/server.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'net/http')

diff --git a/net/http/server.lua b/net/http/server.lua
index 991ef970..0682d6ed 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -199,7 +199,7 @@ local function handle_result(request, response, result)
 			end
 		end
 	end
-	response:send(body);
+	return response:send(body);
 end
 
 function _M.hijack_response(response, listener) -- luacheck: ignore
-- 
cgit v1.2.3


From fdfe1e0b2bf8cea4e2e512fa8e25bface008a59b Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 1 Nov 2019 22:30:35 +0100
Subject: net.http.server: Handle util.error objects from http handlers

---
 net/http/server.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'net/http')

diff --git a/net/http/server.lua b/net/http/server.lua
index 0682d6ed..0d49dbce 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -13,6 +13,7 @@ local traceback = debug.traceback;
 local tostring = tostring;
 local cache = require "util.cache";
 local codes = require "net.http.codes";
+local errors = require "util.error";
 local blocksize = 2^16;
 
 local _M = {};
@@ -188,6 +189,8 @@ local function handle_result(request, response, result)
 		end
 	elseif result_type == "string" then
 		body = result;
+	elseif errors.is_err(result) then
+		body = events.fire_event("http-error", { request = request, response = response, code = result.code, error = result });
 	elseif result_type == "table" then
 		for k, v in pairs(result) do
 			if k ~= "headers" then
-- 
cgit v1.2.3


From 5cac177270b40336e9820619e9c6ab3973ad95b4 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 1 Nov 2019 22:31:15 +0100
Subject: net.http.server: Handle promises from http handlers

---
 net/http/server.lua | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'net/http')

diff --git a/net/http/server.lua b/net/http/server.lua
index 0d49dbce..dc64728f 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -13,6 +13,7 @@ local traceback = debug.traceback;
 local tostring = tostring;
 local cache = require "util.cache";
 local codes = require "net.http.codes";
+local promise = require "util.promise";
 local errors = require "util.error";
 local blocksize = 2^16;
 
@@ -191,6 +192,13 @@ local function handle_result(request, response, result)
 		body = result;
 	elseif errors.is_err(result) then
 		body = events.fire_event("http-error", { request = request, response = response, code = result.code, error = result });
+	elseif promise.is_promise(result) then
+		result:next(function (ret)
+			handle_result(request, response, ret);
+		end, function (err)
+			handle_result(request, response, err);
+		end);
+		return true;
 	elseif result_type == "table" then
 		for k, v in pairs(result) do
 			if k ~= "headers" then
-- 
cgit v1.2.3


From 58990598f283f24f99dd5899669acc310b5437b1 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Tue, 5 Nov 2019 01:34:13 +0100
Subject: net.http.server: Treat promise rejection without value as a HTTP 500
 error

---
 net/http/server.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'net/http')

diff --git a/net/http/server.lua b/net/http/server.lua
index dc64728f..47f064a5 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -196,7 +196,7 @@ local function handle_result(request, response, result)
 		result:next(function (ret)
 			handle_result(request, response, ret);
 		end, function (err)
-			handle_result(request, response, err);
+			handle_result(request, response, err or 500);
 		end);
 		return true;
 	elseif result_type == "table" then
-- 
cgit v1.2.3