mod_http_files: Switch to use util.cache for cache

[prosody.git] / plugins / mod_http_files.lua

diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index dd04853beb4ecd8b38466a0a205d7acd4ebfd8bf..a710679b6a21d525381334fe190954dde1ce59f7 100644 (file)
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -14,8 +14,10 @@ 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_string("http_files_dir", module:get_option_string("http_path"));
+local cache_size = module:get_option_number("http_files_cache_size", 128);
 local dir_indices = module:get_option("http_index_files", { "index.html", "index.htm" });
 local directory_index = module:get_option_boolean("http_dir_listing");
 
@@ -48,7 +50,39 @@ if not mime_map then
        end
 end
 
-local cache = setmetatable({}, { __mode = "kv" }); -- Let the garbage collector have it if it wants to.
+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
@@ -59,9 +93,14 @@ function serve(opts)
        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);
+               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
@@ -71,7 +110,7 @@ function serve(opts)
                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);
+               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
@@ -81,7 +120,7 @@ function serve(opts)
                        return 304;
                end
 
-               local data = cache[orig_path];
+               local data = cache:get(orig_path);
                if data and data.etag == etag then
                        response_headers.content_type = data.content_type;
                        data = data.data;
@@ -119,7 +158,7 @@ function serve(opts)
                        end
                        local ext = full_path:match("%.([^./]+)$");
                        local content_type = ext and mime_map[ext];
-                       cache[orig_path] = { data = data; content_type = content_type; etag = etag };
+                       cache:set(orig_path, { data = data; content_type = content_type; etag = etag });
                        response_headers.content_type = content_type;
                end