From fd1b2904cddab2acf3e12ae8f5d4138c17f814d4 Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Thu, 7 Jan 2021 09:58:46 +0200 Subject: [PATCH] Fix default maximum lifetime an authenticated user can be logged in (#30030) --- pkg/setting/setting.go | 2 +- pkg/setting/setting_test.go | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 3d4cbb56930..e65e57d59f1 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -1045,7 +1045,7 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) { maxLifetimeDaysVal = fmt.Sprintf("%sd", maxLifetimeDaysVal) cfg.Logger.Warn("[Deprecated] the configuration setting 'login_maximum_lifetime_days' is deprecated, please use 'login_maximum_lifetime_duration' instead") } else { - maxLifetimeDaysVal = "7d" + maxLifetimeDaysVal = "30d" } maxLifetimeDurationVal := valueAsString(auth, "login_maximum_lifetime_duration", maxLifetimeDaysVal) cfg.LoginMaxLifetime, err = gtime.ParseDuration(maxLifetimeDurationVal) diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go index 21d1caf7acc..ece5bb83978 100644 --- a/pkg/setting/setting_test.go +++ b/pkg/setting/setting_test.go @@ -375,4 +375,17 @@ func TestAuthDurationSettings(t *testing.T) { err = readAuthSettings(f, cfg) require.NoError(t, err) require.Equal(t, maxLifetimeDurationTest, cfg.LoginMaxLifetime) + + f = ini.Empty() + sec, err = f.NewSection("auth") + require.NoError(t, err) + _, err = sec.NewKey("login_maximum_lifetime_days", "") + require.NoError(t, err) + _, err = sec.NewKey("login_maximum_lifetime_duration", "") + require.NoError(t, err) + maxLifetimeDurationTest, err = time.ParseDuration("720h") + require.NoError(t, err) + err = readAuthSettings(f, cfg) + require.NoError(t, err) + require.Equal(t, maxLifetimeDurationTest, cfg.LoginMaxLifetime) }