X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Fweb%2Fluasrc%2Fsauth.lua;h=e5cb1784597d1891e327241fb5edb2f03a9a508e;hb=30b216f774c2404a965807ddb93a4a4b2aaeac04;hp=724e22d201a40dddceb6401482f5bcb5c5c0578b;hpb=289b8fc1b6b41829c6077893f9dd1d7181551332;p=project%2Fluci.git

diff --git a/libs/web/luasrc/sauth.lua b/libs/web/luasrc/sauth.lua
index 724e22d20..e5cb17845 100644
--- a/libs/web/luasrc/sauth.lua
+++ b/libs/web/luasrc/sauth.lua
@@ -12,16 +12,22 @@ You may obtain a copy of the License at
 $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 = luci.config.sauth.sessiontime
-
+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)
@@ -30,29 +36,75 @@ function clean()
 		return nil
 	end
 	
-	for i, file in files do
+	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
 end
 
+--- Prepare session storage by creating the session directory.
 function prepare()
-	luci.fs.mkdir(sessionpath)
-	luci.fs.chmod(sessionpath, "a-rwx,u+rw")
+	fs.mkdir(sessionpath, 700)
+	 
+	if not sane() then
+		error("Security Exception: Session path is not sane!")
+	end
 end
 
+--- Read a session and return its content.
+-- @param id	Session identifier
+-- @return		Session data
 function read(id)
-	cleansessions()
+	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(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
+
+
+--- Write session data to a session file.
+-- @param id	Session identifier
+-- @param data	Session data
 function write(id, data)
-	if not luci.fs.stat(sessionpath) then
+	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