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

diff --git a/libs/web/luasrc/sauth.lua b/libs/web/luasrc/sauth.lua
index 7c483119c..894732dfa 100644
--- 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()
@@ -57,19 +57,24 @@ end
 -- @param id	Session identifier
 -- @return		Session data
 function read(id)
-	if not id or not sane() then
+	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()
-	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