X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fweb%2Fluasrc%2Fsauth.lua;h=894732dfaf9582dc871424ecd8b0d266b6cd980d;hb=c7a06b61c778a9e24b67a1a89992c1dd77886a21;hp=fc4942b97e8d969e2f9faa7784b9967732224742;hpb=e5df13e80e7b652492e6d2b26afca43e94262e29;p=project%2Fluci.git

diff --git a/libs/web/luasrc/sauth.lua b/libs/web/luasrc/sauth.lua
index fc4942b97..894732dfa 100644
--- a/libs/web/luasrc/sauth.lua
+++ b/libs/web/luasrc/sauth.lua
@@ -12,17 +12,20 @@ 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")
 
 
 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()
 	local now   = os.time()
 	local files = luci.fs.dir(sessionpath)
@@ -40,21 +43,46 @@ function clean()
 	end
 end
 
+--- Prepare session storage by creating the session directory.
 function prepare()
 	luci.fs.mkdir(sessionpath)
 	luci.fs.chmod(sessionpath, "a-rwx,u+rwx")
+	 
+	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)
 	if not id then
 		return
 	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(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
+
+
+--- 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)