From 37e70e001b035d7d253ba73651760ff485debad4 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 30 Dec 2023 16:48:34 +0800 Subject: [PATCH] Avoid cycle-redirecting user/login page (#28636) --- models/auth/source.go | 3 --- models/db/engine.go | 3 --- modules/setting/server.go | 3 +-- routers/common/db.go | 1 - routers/web/auth/auth.go | 4 ---- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/models/auth/source.go b/models/auth/source.go index 6fdd2006fe442..88253a4b39b15 100644 --- a/models/auth/source.go +++ b/models/auth/source.go @@ -275,9 +275,6 @@ func ActiveSources(tp Type) ([]*Source, error) { // IsSSPIEnabled returns true if there is at least one activated login // source of type LoginSSPI func IsSSPIEnabled() bool { - if !db.HasEngine { - return false - } sources, err := ActiveSources(SSPI) if err != nil { log.Error("ActiveSources: %v", err) diff --git a/models/db/engine.go b/models/db/engine.go index 182d8cd993696..99906813ca870 100755 --- a/models/db/engine.go +++ b/models/db/engine.go @@ -27,9 +27,6 @@ var ( x *xorm.Engine tables []any initFuncs []func() error - - // HasEngine specifies if we have a xorm.Engine - HasEngine bool ) // Engine represents a xorm engine or session. diff --git a/modules/setting/server.go b/modules/setting/server.go index 08eb82fb3dece..6c65fc1b9e694 100644 --- a/modules/setting/server.go +++ b/modules/setting/server.go @@ -343,8 +343,7 @@ func loadServerFrom(rootCfg ConfigProvider) { LandingPageURL = LandingPageOrganizations case "login": LandingPageURL = LandingPageLogin - case "": - case "home": + case "", "home": LandingPageURL = LandingPageHome default: LandingPageURL = LandingPage(landingPage) diff --git a/routers/common/db.go b/routers/common/db.go index 547f727ce2478..a67c9582fa387 100644 --- a/routers/common/db.go +++ b/routers/common/db.go @@ -37,7 +37,6 @@ func InitDBEngine(ctx context.Context) (err error) { log.Info("Backing off for %d seconds", int64(setting.Database.DBConnectBackoff/time.Second)) time.Sleep(setting.Database.DBConnectBackoff) } - db.HasEngine = true config.SetDynGetter(system_model.NewDatabaseDynKeyGetter()) return nil } diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index 8017602d99026..32c90f46578f5 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -45,10 +45,6 @@ const ( // AutoSignIn reads cookie and try to auto-login. func AutoSignIn(ctx *context.Context) (bool, error) { - if !db.HasEngine { - return false, nil - } - uname := ctx.GetSiteCookie(setting.CookieUserName) if len(uname) == 0 { return false, nil