* Introducing LuCI HTTPD as testing environment

[project/luci.git] / libs / httpd / luasrc / httpd / handler / file.lua

diff --git a/libs/httpd/luasrc/httpd/handler/file.lua b/libs/httpd/luasrc/httpd/handler/file.lua
index eb5aafd78926dd3ac98a40dfa4198718088de670..83549f33859591c31c087e8bd9ed99607a5a3e2d 100644 (file)
--- a/libs/httpd/luasrc/httpd/handler/file.lua
+++ b/libs/httpd/luasrc/httpd/handler/file.lua
@@ -12,11 +12,17 @@ function Simple.__init__(self, docroot)
 end
 
 function Simple.handle(self, request, sourcein, sinkerr)
-       local file = self.docroot .. request.env.REQUEST_URI:gsub("../", "")
-       local size = luci.fs.stat(file, "size")
-       if size then
-               return Response(200, {["Content-Length"] = size}), ltn12.source.file(io.open(file))
+       local uri  = request.env.PATH_INFO
+       local file = self.docroot .. uri:gsub("%.%./", "")
+       local stat = luci.fs.stat(file)
+
+       if stat then
+               if stat.type == "regular" then
+                       return Response(200, {["Content-Length"] = stat.size}), ltn12.source.file(io.open(file))
+               else
+                       return self:failure(403, "Unable to transmit " .. stat.type .. " " .. uri)
+               end
        else
-               return Response(404)
+               return self:failure(404, "No such file: " .. uri)
        end
 end
\ No newline at end of file