summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-12-15 10:40:45 +0000
committerSteven Barth <steven@midlink.org>2008-12-15 10:40:45 +0000
commit1ee5ba632ab52b5d3af5c88803fee89c8eaf6fe1 (patch)
treec71bbbb5247bb5f2a48f1f5e78d90dfe71d424b3 /modules
parent73109f3e46bc112faa9ebac16417b423d8661645 (diff)
Refined urltokens and XSRF protection
Diffstat (limited to 'modules')
-rw-r--r--modules/admin-full/luasrc/controller/admin/index.lua3
-rw-r--r--modules/admin-mini/luasrc/controller/mini/index.lua3
-rw-r--r--modules/rpc/luasrc/controller/rpc.lua3
3 files changed, 6 insertions, 3 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index c0322d3a2e..e2b812e8c3 100644
--- a/modules/admin-full/luasrc/controller/admin/index.lua
+++ b/modules/admin-full/luasrc/controller/admin/index.lua
@@ -53,8 +53,9 @@ function action_logout()
local sauth = require "luci.sauth"
if dsp.context.authsession then
sauth.kill(dsp.context.authsession)
+ dsp.context.urltoken.stok = nil
end
- luci.http.header("Set-Cookie", "sysauth=; path=/")
+ luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url())
luci.http.redirect(luci.dispatcher.build_url())
end \ No newline at end of file
diff --git a/modules/admin-mini/luasrc/controller/mini/index.lua b/modules/admin-mini/luasrc/controller/mini/index.lua
index dad6ccfab3..acff55aabb 100644
--- a/modules/admin-mini/luasrc/controller/mini/index.lua
+++ b/modules/admin-mini/luasrc/controller/mini/index.lua
@@ -44,8 +44,9 @@ function action_logout()
local sauth = require "luci.sauth"
if dsp.context.authsession then
sauth.kill(dsp.context.authsession)
+ dsp.context.urltoken.stok = nil
end
- luci.http.header("Set-Cookie", "sysauth=; path=/")
+ luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url())
luci.http.redirect(luci.dispatcher.build_url())
end \ No newline at end of file
diff --git a/modules/rpc/luasrc/controller/rpc.lua b/modules/rpc/luasrc/controller/rpc.lua
index d83c26d455..e0aeb3bf04 100644
--- a/modules/rpc/luasrc/controller/rpc.lua
+++ b/modules/rpc/luasrc/controller/rpc.lua
@@ -25,7 +25,8 @@ function index()
local function authenticator(validator, accs)
local auth = luci.http.formvalue("auth", true)
if auth then
- local user = luci.sauth.read(auth)
+ local sdat = luci.sauth.read(auth)
+ user = loadstring(sdat)().user
if user and luci.util.contains(accs, user) then
return user, auth
end