From 42907ced08178a2a99662148870ff5217959bf78 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Fri, 21 Dec 2012 13:37:39 +0500 Subject: net.http.parser: Skip url.parse when we don't have a full URL (also fixes traceback on paths starting with '//'). --- net/http/parser.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3 From 92abfa2d51728cfae3ab41d4131cae5f8081d8cc Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 21 Dec 2012 16:10:45 +0100 Subject: mod_http_files: Log the error if we can't open or read a file --- plugins/mod_http_files.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index 43094eb4..2e906b70 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -115,10 +115,11 @@ function serve_file(event, path) else local f, err = open(full_path, "rb"); if f then - data = f:read("*a"); + 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 = path:match("%.([^./]+)$"); -- cgit v1.2.3 From 8bf32f0b1cbba88e6bb97b8a7e47b207e864882a Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 21 Dec 2012 17:22:19 +0100 Subject: mod_http_files: Rename config options and variable names --- plugins/mod_http_files.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index 2e906b70..d77c64c0 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -14,9 +14,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", "www_files")); +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 @@ -52,7 +52,7 @@ local cache = setmetatable({}, { __mode = "kv" }); -- Let the garbage collector function serve_file(event, path) local request, response = event.request, event.response; local orig_path = request.path; - local full_path = http_base.."/"..path; + local full_path = base_path.."/"..path; local attr = stat(full_path); if not attr then return 404; @@ -90,7 +90,7 @@ function serve_file(event, path) end end - if not show_file_list then + if not directory_index then return 403; else local html = require"util.stanza".stanza("html") -- cgit v1.2.3 From cd27b11d362144ade3d9f1f637b8ff831a9bc433 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 21 Dec 2012 17:54:43 +0100 Subject: mod_http_files: Export function can be used by other modules to serve files. Don't serve files by default unless http_files_dir is set --- plugins/mod_http_files.lua | 161 +++++++++++++++++++++++++-------------------- 1 file changed, 88 insertions(+), 73 deletions(-) diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index d77c64c0..1de58407 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -14,7 +14,7 @@ local open = io.open; local stat = lfs.attributes; local build_path = require"socket.url".build_path; -local base_path = module:get_option_string("http_files_dir", module:get_option_string("http_path", "www_files")); +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"); @@ -49,91 +49,106 @@ 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 = base_path.."/"..path; - local attr = stat(full_path); - if not attr then - return 404; - end +function serve(opts) + 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 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 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 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[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; + 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 - for i=1,#dir_indices do - if stat(full_path..dir_indices[i], "mode") == "file" then - return serve_file(event, path..dir_indices[i]); + + 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 end - end - if not directory_index 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(); + if not directory_index 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(); + end end + data = "\n"..tostring(html); + cache[path] = { data = data, content_type = mime_map.html; etag = etag; }; + response_headers.content_type = mime_map.html; end - data = "\n"..tostring(html); - cache[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, 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; + 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 = 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; 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; - }; -}); + +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 da563cbf87e505d415399441d69277ee55277a23 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 21 Dec 2012 20:08:33 +0100 Subject: mod_http_files: Replace file listing with an event, allowing a different plugin to generate it --- plugins/mod_http_files.lua | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index 1de58407..bd39936d 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; @@ -94,27 +95,14 @@ function serve(opts) end end - if not directory_index then + 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; - 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(); - end - end - data = "\n"..tostring(html); - cache[path] = { data = data, content_type = mime_map.html; etag = etag; }; - response_headers.content_type = mime_map.html; end + cache[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"); -- cgit v1.2.3 From 87cf947c6c9255777c55fd07450ea74fbb97bfc7 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 21 Dec 2012 20:34:40 +0100 Subject: mod_http_files: Work with non-wildcard-routes. Key cache on the original HTTP path. --- plugins/mod_http_files.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index bd39936d..311b3a4b 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -78,11 +78,11 @@ function serve(opts) return 304; end - local data = cache[path]; + 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" then + 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 @@ -101,7 +101,7 @@ function serve(opts) if not data then return 403; end - cache[path] = { data = data, content_type = mime_map.html; etag = etag; }; + cache[orig_path] = { data = data, content_type = mime_map.html; etag = etag; }; response_headers.content_type = mime_map.html; else @@ -114,9 +114,9 @@ function serve(opts) module:log("debug", "Could not open or read %s. Error was %s", full_path, err); return 403; end - local ext = path:match("%.([^./]+)$"); + local ext = orig_path:match("%.([^./]+)$"); local content_type = ext and mime_map[ext]; - cache[path] = { data = data; content_type = content_type; etag = etag }; + cache[orig_path] = { data = data; content_type = content_type; etag = etag }; response_headers.content_type = content_type; end -- cgit v1.2.3 From 4130b38a58a4065d7157be93b47fce98fce6ab0e Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 21 Dec 2012 20:40:29 +0100 Subject: mod_http_files: Expose function other modules can use to combine their routes with file paths to serve --- plugins/mod_http_files.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index 311b3a4b..a96db7b6 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -126,6 +126,14 @@ function serve(opts) return serve_file; end +function wrap_route(routes) + for route,handler in pairs(routes) do + if type(handler) == "table" and handler.path then + routes[route] = serve(handler); + end + end + return routes; +end if base_path then module:provides("http", { -- cgit v1.2.3 From 81b3ba144214371cbfa3ac39d0fae1880cac1302 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 22 Dec 2012 12:06:36 +0000 Subject: net.dns: Clean up query list when a server is marked down --- net/dns.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/dns.lua b/net/dns.lua index 5b32a56c..1950ba73 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 @@ -796,6 +797,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 +856,7 @@ function resolver:receive(rset) -- - - - - - - - - - - - - - - - - receive set(self.wanted, q.class, q.type, q.name, nil); end end + end end end -- cgit v1.2.3 From a7f6283a2e582f5b6b0a920b6e0418ebb9c379d9 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 22 Dec 2012 14:20:12 +0100 Subject: net.dns: Close voided sockets, so they don't stay in net.server --- net/dns.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/net/dns.lua b/net/dns.lua index 1950ba73..a134eceb 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -643,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 -- cgit v1.2.3 From 59db48f8cb71226bd12087c8a9148cf0a89c3f32 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 23 Dec 2012 11:17:44 +0100 Subject: mod_http_files: Allow passing a string to serve() --- plugins/mod_http_files.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index a96db7b6..f1ae4918 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -51,6 +51,9 @@ end local cache = setmetatable({}, { __mode = "kv" }); -- Let the garbage collector have it if it wants to. 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; @@ -128,7 +131,7 @@ end function wrap_route(routes) for route,handler in pairs(routes) do - if type(handler) == "table" and handler.path then + if type(handler) ~= "function" then routes[route] = serve(handler); end end -- cgit v1.2.3 From 360e2a58846cf2dbe41e798e683f658adfa335e6 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 23 Dec 2012 17:04:44 +0100 Subject: mod_http_files: Fix sending Content-Type for index files --- plugins/mod_http_files.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index f1ae4918..915bec58 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -117,7 +117,7 @@ function serve(opts) module:log("debug", "Could not open or read %s. Error was %s", full_path, err); return 403; end - local ext = orig_path:match("%.([^./]+)$"); + 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; -- cgit v1.2.3 From 020dc0052ac01b65d59bcf4e45c481ee446c6c64 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 26 Dec 2012 02:46:49 +0100 Subject: mod_admin_telnet: Add info about port commands to help --- plugins/mod_admin_telnet.lua | 4 ++++ 1 file changed, 4 insertions(+) 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 -- cgit v1.2.3