git724/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

#1891 attempt to fix expected invalid CSRF token

Browse source 
- Remove unused config settings `[picture] service`
This commit is contained in:
Unknwon 2016-03-03 15:09:43 -05:00
parent 434614506e
commit f946040fa9
10 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/middleware/auth.go
View file

@ -109,17 +109,11 @@ func Toggle(options *ToggleOptions) macaron.Handler {
}
}
// Try auto-signin when not signed in.
if !options.SignOutRequire && !ctx.IsSigned && !auth.IsAPIPath(ctx.Req.URL.Path) {
succeed, err := AutoSignIn(ctx)
if err != nil {
ctx.Handle(500, "AutoSignIn", err)
return
} else if succeed {
log.Trace("Auto-login succeed: %s", ctx.Session.Get("uname"))
ctx.Redirect(setting.AppSubUrl + ctx.Req.RequestURI)
return
}
// Auto-signin info is provided and has not signed in.
if !options.SignOutRequire && !ctx.IsSigned && !auth.IsAPIPath(ctx.Req.URL.Path) &&
len(ctx.GetCookie(setting.CookieUserName)) > 0 {
ctx.SetCookie("redirect_to", url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI), 0, setting.AppSubUrl)
ctx.Redirect(setting.AppSubUrl + ctx.Req.RequestURI)
}
if options.AdminRequire {