From d8d4b7409ce9b0c63b55c49fe62b29eb1b7e1885 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 11 Sep 2009 03:12:09 +0100 Subject: mod_httpserver: Backport from trunk more thorough validation of URLs prior to processing --- plugins/mod_httpserver.lua | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua index a8639281..55ac3c7a 100644 --- a/plugins/mod_httpserver.lua +++ b/plugins/mod_httpserver.lua @@ -11,14 +11,19 @@ local httpserver = require "net.httpserver"; local open = io.open; local t_concat = table.concat; +local check_http_path; local http_base = "www_files"; +local response_403 = { status = "403 Forbidden", body = "

Invalid URL

Sorry, we couldn't find what you were looking for :(" }; local response_404 = { status = "404 Not Found", body = "

Page Not Found

Sorry, we couldn't find what you were looking for :(" }; local http_path = { http_base }; local function handle_request(method, body, request) - local path = request.url.path:gsub("%.%.%/", ""):gsub("^/[^/]+", ""); + 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 @@ -29,3 +34,22 @@ end 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; + end + + local level = 0; + for part in url:gmatch("%/([^/]+)") do + if part == ".." then + level = level - 1; + elseif part ~= "." then + level = level + 1; + end + if level < 0 then + return nil; + end + end + return url; +end -- cgit v1.2.3