libs/web: Fixed luci.template

[oweals/luci.git] / libs / web / luasrc / sauth.lua

diff --git a/libs/web/luasrc/sauth.lua b/libs/web/luasrc/sauth.lua
index c43117f3ae50ec4952a289e5403e4089f48ce571..0ac236753eaff905e6cee7d303cb6b327d3de6ea 100644 (file)
--- a/libs/web/luasrc/sauth.lua
+++ b/libs/web/luasrc/sauth.lua
@@ -46,7 +46,9 @@ end
 --- Prepare session storage by creating the session directory.
 function prepare()
        luci.fs.mkdir(sessionpath)
-       if not luci.fs.chmod(sessionpath, "a-rwx,u+rwx") then
+       luci.fs.chmod(sessionpath, "a-rwx,u+rwx")
+        
+       if not sane() then
                error("Security Exception: Session path is not sane!")
        end
 end
@@ -55,7 +57,7 @@ end
 -- @param id   Session identifier
 -- @return             Session data
 function read(id)
-       if not id or not sane() then
+       if not id or not sane(sessionpath .. "/" .. id) then
                return
        end
        clean()
@@ -65,9 +67,11 @@ end
 
 --- Check whether Session environment is sane.
 -- @return Boolean status
-function sane()
-       return luci.sys.process.info("uid") == luci.fs.stat(sessionpath, "uid")
-        and luci.fs.stat(sessionpath, "mode") == "rwx------"
+function sane(file)
+       return luci.sys.process.info("uid")
+                       == luci.fs.stat(file or sessionpath, "uid")
+               and luci.fs.stat(file or sessionpath, "mode")
+                       == (file and "rw-------" or "rwx------")
 end