Добавлена проверка прав, чтобы не пытаться читать недоступный каталог.

[lua-filemanager.git] / www / cgi-bin / fs

diff --git a/www/cgi-bin/fs b/www/cgi-bin/fs
index 6e7d57219c539e78f6e6237f26763325a81c1c5b..cee5f0f88942f7f038739d2e3d2092c08378983b 100755 (executable)
--- a/www/cgi-bin/fs
+++ b/www/cgi-bin/fs
@@ -91,26 +91,29 @@ if action == "list" then
 
   path = fs.realpath(basepath..'/'..params["path"])
   
 
   path = fs.realpath(basepath..'/'..params["path"])
   

-  if is_in_dir(path,basepath) then
+  if path and is_in_dir(path,basepath) and fs.access(path,"r") then

     files = {}
     local rec
     for name in fs.dir(path) do
     files = {}
     local rec
     for name in fs.dir(path) do

-      fstat=fs.stat(fs.realpath(path..'/'..name))
-      if fstat["type"]=="reg" then
-        ftype="file"
-      elseif fstat["type"]=="dir" then
-        ftype="dir"
-      else
-        ftype=""
-      end      
-      if ftype then
-        rec={name=name,rights=fstat["modestr"],size=fstat["size"],type=ftype,date=os.date('%Y-%m-%d %H:%M:%S',fstat["mtime"])}
-        table.insert(files,rec)
-      end  
+      basename=fs.realpath(path..'/'..name)
+      if basename then
+        fstat=fs.stat(fs.realpath(path..'/'..name))
+        if fstat["type"]=="reg" then
+          ftype="file"
+        elseif fstat["type"]=="dir" then
+          ftype="dir"
+        else
+          ftype=""
+        end      
+        if ftype then
+          rec={name=name,rights=fstat["modestr"],size=fstat["size"],type=ftype,date=os.date('%Y-%m-%d %H:%M:%S',fstat["mtime"])}
+          table.insert(files,rec)
+        end
+      end    

     end
     result = { result = files }
   else
     end
     result = { result = files }
   else

-    result = { result = { success=false, error="Invalid path request" } }
+    result = { result = {} }

   end
 
 elseif action == "rename" then
   end
 
 elseif action == "rename" then