Enable stack tracebacks for 500 errors

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

diff --git a/libs/web/luasrc/sauth.lua b/libs/web/luasrc/sauth.lua
index c43117f3ae50ec4952a289e5403e4089f48ce571..5d3dc95ca38aad8ccdcd3792d08dc376c6729613 100644 (file)
--- a/libs/web/luasrc/sauth.lua
+++ b/libs/web/luasrc/sauth.lua
@@ -23,7 +23,7 @@ require("luci.config")
 
 luci.config.sauth = luci.config.sauth or {}
 sessionpath = luci.config.sauth.sessionpath
-sessiontime = tonumber(luci.config.sauth.sessiontime)
+sessiontime = tonumber(luci.config.sauth.sessiontime) or 15 * 60
 
 --- Manually clean up expired sessions.
 function clean()
@@ -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,19 +57,27 @@ end
 -- @param id   Session identifier
 -- @return             Session data
 function read(id)
-       if not id or not sane() then
+       if not id then
                return
        end
+       if not id:match("^%w+$") then
+               error("Session ID is not sane!")
+       end
        clean()
+       if not sane(sessionpath .. "/" .. id) then
+               return
+       end
        return luci.fs.readfile(sessionpath .. "/" .. id)
 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
 
 
@@ -78,6 +88,19 @@ function write(id, data)
        if not sane() then
                prepare()
        end
+       if not id:match("^%w+$") then
+               error("Session ID is not sane!")
+       end
        luci.fs.writefile(sessionpath .. "/" .. id, data)
        luci.fs.chmod(sessionpath .. "/" .. id, "a-rwx,u+rw")
+end
+
+
+--- Kills a session
+-- @param id   Session identifier
+function kill(id)
+       if not id:match("^%w+$") then
+               error("Session ID is not sane!")
+       end
+       luci.fs.unlink(sessionpath .. "/" .. id)
 end
\ No newline at end of file