luci-0.9: merge r4886-r4890

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

diff --git a/libs/web/luasrc/sauth.lua b/libs/web/luasrc/sauth.lua
index c43117f..e5cb178 100644 (file)
--- a/libs/web/luasrc/sauth.lua
+++ b/libs/web/luasrc/sauth.lua
@@ -19,11 +19,13 @@ require("luci.fs")
 require("luci.util")
 require("luci.sys")
 require("luci.config")
+local nixio = require "nixio", require "nixio.util"
+local fs = require "nixio.fs"
 
 
 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()
@@ -37,7 +39,7 @@ function clean()
        for i, file in pairs(files) do
                local fname = sessionpath .. "/" .. file
                local stat = luci.fs.stat(fname)
-               if stat and stat.type == "regular" and stat.atime + sessiontime < now then
+               if stat and stat.type == "reg" and stat.mtime + sessiontime < now then
                        luci.fs.unlink(fname)
                end 
        end
@@ -45,8 +47,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
+       fs.mkdir(sessionpath, 700)
+        
+       if not sane() then
                error("Security Exception: Session path is not sane!")
        end
 end
@@ -55,19 +58,28 @@ 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
+       luci.fs.utime(sessionpath .. "/" .. id)
        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, "modestr")
+                       == (file and "rw-------" or "rwx------")
 end
 
 
@@ -78,6 +90,21 @@ function write(id, data)
        if not sane() then
                prepare()
        end
-       luci.fs.writefile(sessionpath .. "/" .. id, data)
-       luci.fs.chmod(sessionpath .. "/" .. id, "a-rwx,u+rw")
+       if not id:match("^%w+$") then
+               error("Session ID is not sane!")
+       end
+       
+       local f = nixio.open(sessionpath .. "/" .. id, "w", 600)
+       f:writeall(data)
+       f:close()
+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