Rework authentication system

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

diff --git a/libs/web/luasrc/sauth.lua b/libs/web/luasrc/sauth.lua
index b724bf2..ef9fa1e 100644 (file)
--- a/libs/web/luasrc/sauth.lua
+++ b/libs/web/luasrc/sauth.lua
@@ -15,53 +15,93 @@ $Id$
 
 --- LuCI session library.
 module("luci.sauth", package.seeall)
-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) or 15 * 60
 
---- Manually clean up expired sessions.
-function clean()
-       local now   = os.time()
-       local files = luci.fs.dir(sessionpath)
-       
-       if not files then
-               return nil
-       end
-       
-       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
-                       luci.fs.unlink(fname)
-               end 
-       end
-end
-
 --- Prepare session storage by creating the session directory.
 function prepare()
-       luci.fs.mkdir(sessionpath)
-       luci.fs.chmod(sessionpath, "a-rwx,u+rwx")
-        
+       fs.mkdir(sessionpath, 700)
        if not sane() then
                error("Security Exception: Session path is not sane!")
        end
 end
 
+function encode(t)
+       return luci.util.get_bytecode({
+               user=t.user,
+               token=t.token,
+               secret=t.secret,
+               atime=luci.sys.uptime()
+       })
+end
+
+function decode(blob)
+       local t = loadstring(blob)()
+       return {
+               user = t.user,
+               token = t.token,
+               secret = t.secret,
+               atime = t.atime
+       }
+end
+
 --- Read a session and return its content.
 -- @param id   Session identifier
 -- @return             Session data
+local function _read(id)
+       local blob = fs.readfile(sessionpath .. "/" .. id)
+       return blob
+end
+
+--- Write session data to a session file.
+-- @param id   Session identifier
+-- @param data Session data
+local function _write(id, data)
+       local f = nixio.open(sessionpath .. "/" .. id, "w", 600)
+       f:writeall(data)
+       f:close()
+end
+
+function write(id, data)
+       if not sane() then
+               prepare()
+       end
+
+       if not id or #id == 0 or not id:match("^%w+$") then
+               error("Session ID is not sane!")
+       end
+
+       _write(id, data)
+end
+
 function read(id)
-       clean()
-       if not id or not sane(sessionpath .. "/" .. id) then
+       if not id or #id == 0 then
+               return
+       end
+       if not id:match("^%w+$") then
+               error("Session ID is not sane!")
+       end
+       if not sane(sessionpath .. "/" .. id) then
+               return
+       end
+
+       local blob = _read(id)
+       if decode(blob).atime + sessiontime < luci.sys.uptime()then
+               fs.unlink(sessionpath .. "/" .. id)
                return
        end
-       return luci.fs.readfile(sessionpath .. "/" .. id)
+       -- refresh atime in session
+       refreshed = encode(decode(blob))
+       write(id, refreshed)
+       return blob
 end
 
 
@@ -69,19 +109,16 @@ end
 -- @return Boolean status
 function sane(file)
        return luci.sys.process.info("uid")
-                       == luci.fs.stat(file or sessionpath, "uid")
-               and luci.fs.stat(file or sessionpath, "mode")
+                       == fs.stat(file or sessionpath, "uid")
+               and fs.stat(file or sessionpath, "modestr")
                        == (file and "rw-------" or "rwx------")
 end
 
-
---- Write session data to a session file.
+--- Kills a session
 -- @param id   Session identifier
--- @param data Session data
-function write(id, data)
-       if not sane() then
-               prepare()
+function kill(id)
+       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
\ No newline at end of file
+       fs.unlink(sessionpath .. "/" .. id)
+end