libs/web: adapt dispatcher to sauth api changes

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 7c77f2e97a4c85c15154b4cb6757428391e95eb1..9c0bf60b880fe0cfbeb3b47eb728e28a257245b7 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -352,9 +352,6 @@ function dispatch(request)
                local user
 
                if sdat then
-                       sdat = loadstring(sdat)
-                       setfenv(sdat, {})
-                       sdat = sdat()
                        if not verifytoken or ctx.urltoken.stok == sdat.token then
                                user = sdat.user
                        end
@@ -376,11 +373,12 @@ function dispatch(request)
                                        local sid = sess or luci.sys.uniqueid(16)
                                        if not sess then
                                                local token = luci.sys.uniqueid(16)
-                                               sauth.write(sid, util.get_bytecode({
+                                               sauth.reap()
+                                               sauth.write(sid, {
                                                        user=user,
                                                        token=token,
                                                        secret=luci.sys.uniqueid(16)
-                                               }))
+                                               })
                                                ctx.urltoken.stok = token
                                        end
                                        luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path="..build_url())