mirror of
https://github.com/go-gitea/gitea
synced 2024-12-25 08:04:19 +01:00
parent
683b95f0da
commit
2165729d16
5 changed files with 6 additions and 14 deletions
|
@ -275,9 +275,6 @@ func ActiveSources(tp Type) ([]*Source, error) {
|
||||||
// IsSSPIEnabled returns true if there is at least one activated login
|
// IsSSPIEnabled returns true if there is at least one activated login
|
||||||
// source of type LoginSSPI
|
// source of type LoginSSPI
|
||||||
func IsSSPIEnabled() bool {
|
func IsSSPIEnabled() bool {
|
||||||
if !db.HasEngine {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
sources, err := ActiveSources(SSPI)
|
sources, err := ActiveSources(SSPI)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("ActiveSources: %v", err)
|
log.Error("ActiveSources: %v", err)
|
||||||
|
|
|
@ -27,9 +27,6 @@ var (
|
||||||
x *xorm.Engine
|
x *xorm.Engine
|
||||||
tables []any
|
tables []any
|
||||||
initFuncs []func() error
|
initFuncs []func() error
|
||||||
|
|
||||||
// HasEngine specifies if we have a xorm.Engine
|
|
||||||
HasEngine bool
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Engine represents a xorm engine or session.
|
// Engine represents a xorm engine or session.
|
||||||
|
|
|
@ -343,8 +343,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
|
||||||
LandingPageURL = LandingPageOrganizations
|
LandingPageURL = LandingPageOrganizations
|
||||||
case "login":
|
case "login":
|
||||||
LandingPageURL = LandingPageLogin
|
LandingPageURL = LandingPageLogin
|
||||||
case "":
|
case "", "home":
|
||||||
case "home":
|
|
||||||
LandingPageURL = LandingPageHome
|
LandingPageURL = LandingPageHome
|
||||||
default:
|
default:
|
||||||
LandingPageURL = LandingPage(landingPage)
|
LandingPageURL = LandingPage(landingPage)
|
||||||
|
|
|
@ -37,7 +37,6 @@ func InitDBEngine(ctx context.Context) (err error) {
|
||||||
log.Info("Backing off for %d seconds", int64(setting.Database.DBConnectBackoff/time.Second))
|
log.Info("Backing off for %d seconds", int64(setting.Database.DBConnectBackoff/time.Second))
|
||||||
time.Sleep(setting.Database.DBConnectBackoff)
|
time.Sleep(setting.Database.DBConnectBackoff)
|
||||||
}
|
}
|
||||||
db.HasEngine = true
|
|
||||||
config.SetDynGetter(system_model.NewDatabaseDynKeyGetter())
|
config.SetDynGetter(system_model.NewDatabaseDynKeyGetter())
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,10 +45,6 @@ const (
|
||||||
|
|
||||||
// AutoSignIn reads cookie and try to auto-login.
|
// AutoSignIn reads cookie and try to auto-login.
|
||||||
func AutoSignIn(ctx *context.Context) (bool, error) {
|
func AutoSignIn(ctx *context.Context) (bool, error) {
|
||||||
if !db.HasEngine {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
uname := ctx.GetSiteCookie(setting.CookieUserName)
|
uname := ctx.GetSiteCookie(setting.CookieUserName)
|
||||||
if len(uname) == 0 {
|
if len(uname) == 0 {
|
||||||
return false, nil
|
return false, nil
|
||||||
|
@ -130,7 +126,11 @@ func checkAutoLogin(ctx *context.Context) bool {
|
||||||
|
|
||||||
if isSucceed {
|
if isSucceed {
|
||||||
middleware.DeleteRedirectToCookie(ctx.Resp)
|
middleware.DeleteRedirectToCookie(ctx.Resp)
|
||||||
ctx.RedirectToFirst(redirectTo, setting.AppSubURL+string(setting.LandingPageURL))
|
nextRedirectTo := setting.AppSubURL + string(setting.LandingPageURL)
|
||||||
|
if setting.LandingPageURL == setting.LandingPageLogin {
|
||||||
|
nextRedirectTo = setting.AppSubURL + "/" // do not cycle-redirect to the login page
|
||||||
|
}
|
||||||
|
ctx.RedirectToFirst(redirectTo, nextRedirectTo)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue