Avoid cycle-redirecting user/login page (#28636) (#28658)

Backport #28636

Fix #28231, and remove some unused code.

diff --git a/models/auth/source.go b/models/auth/source.go
index 6fdd2006fe4421ec21090d3bcf1226f7f6deea19..88253a4b39b15eaf0131cd13bb577e8e29609cae 100644 (file)
--- 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 182d8cd9936963f0eff4676c8750ddbb6aacfa99..99906813ca8707af74667f5c1ce0ddf2b929a408 100755 (executable)
--- 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 08eb82fb3dece4e3bc305aa214221f01feefd0a3..6c65fc1b9e694c006b6764d407504d865ca00b7e 100644 (file)
--- 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 547f727ce24783fe0b357f4e3b60af1000aa3d9c..a67c9582fa3872047eabccf5ad8631376717b7b8 100644 (file)
--- 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 8017602d9902654fb74641dd7bf7905a4f3b304d..007e790b8edda485d8306159172598c8c134cc78 100644 (file)
--- 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
@@ -130,7 +126,11 @@ func checkAutoLogin(ctx *context.Context) bool {
 
        if isSucceed {
                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
        }