Browse Source

#2748 fix redirect loop with auto-signin

pull/2685/merge
Unknwon 9 years ago
parent
commit
f6759a731a
  1. 2
      README.md
  2. 2
      gogs.go
  3. 3
      modules/middleware/auth.go
  4. 2
      templates/.VERSION

2
README.md

@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
##### Current version: 0.8.53 ##### Current version: 0.8.54
| Web | UI | Preview | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|

2
gogs.go

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.8.53.0303" const APP_VER = "0.8.54.0304"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

3
modules/middleware/auth.go

@ -113,7 +113,8 @@ func Toggle(options *ToggleOptions) macaron.Handler {
if !options.SignOutRequire && !ctx.IsSigned && !auth.IsAPIPath(ctx.Req.URL.Path) && if !options.SignOutRequire && !ctx.IsSigned && !auth.IsAPIPath(ctx.Req.URL.Path) &&
len(ctx.GetCookie(setting.CookieUserName)) > 0 { len(ctx.GetCookie(setting.CookieUserName)) > 0 {
ctx.SetCookie("redirect_to", url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI), 0, setting.AppSubUrl) ctx.SetCookie("redirect_to", url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI), 0, setting.AppSubUrl)
ctx.Redirect(setting.AppSubUrl + ctx.Req.RequestURI) ctx.Redirect(setting.AppSubUrl + "/user/login")
return
} }
if options.AdminRequire { if options.AdminRequire {

2
templates/.VERSION

@ -1 +1 @@
0.8.53.0303 0.8.54.0304
Loading…
Cancel
Save