Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow Basic-Auth pass-through

Browse source
This commit is contained in:
Steven Barth 2009-07-25 10:47:26 +00:00
parent b8ab3b9dac
commit a77f1b91ae
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libs/lucid-http/luasrc/lucid/http/server.lua
View file

@ -132,6 +132,7 @@ function Handler.checkrestricted(self, request)
end end
if stat then if stat then
request.env.HTTP_AUTH_USER, request.env.HTTP_AUTH_PASS = user, pass
return return
end end
end end

8
libs/web/luasrc/dispatcher.lua
View file

@ -258,7 +258,7 @@ function dispatch(request)
local verifytoken = false local verifytoken = false
if not sess then if not sess then
sess = luci.http.getcookie("sysauth") sess = luci.http.getcookie("sysauth")
sess = sess and sess:match("^[a-f0-9]+$") sess = sess and sess:match("^[a-f0-9]*$")
verifytoken = true verifytoken = true
end end
@ -272,6 +272,12 @@ function dispatch(request)
if not verifytoken or ctx.urltoken.stok == sdat.token then if not verifytoken or ctx.urltoken.stok == sdat.token then
user = sdat.user user = sdat.user
end end
else
local eu = http.getenv("HTTP_AUTH_USER")
local ep = http.getenv("HTTP_AUTH_PASS")
if eu and ep and luci.sys.user.checkpasswd(eu, ep) then
authen = function() return eu end
end
end end
if not util.contains(accs, user) then if not util.contains(accs, user) then