public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Sunset non-duration based login lifetime config (#49944) (#49990)

Browse Source 
(cherry picked from commit 39096208ed)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
This commit is contained in:
Grot (@grafanabot)
2022-06-01 12:46:25 +02:00
committed by GitHub
co-authored by Emil Tullstedt
parent 4371c45dff
commit a4431a7cbf
4 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/setting/setting_test.go
+2 -8
View File
@@ -301,9 +301,7 @@ func TestAuthDurationSettings(t *testing.T) {
cfg := NewCfg()
sec, err := f.NewSection("auth")
require.NoError(t, err)
_, err = sec.NewKey("login_maximum_inactive_lifetime_days", "10")
require.NoError(t, err)
_, err = sec.NewKey("login_maximum_inactive_lifetime_duration", "")
_, err = sec.NewKey("login_maximum_inactive_lifetime_duration", "10d")
require.NoError(t, err)
err = readAuthSettings(f, cfg)
require.NoError(t, err)
@@ -323,9 +321,7 @@ func TestAuthDurationSettings(t *testing.T) {
f = ini.Empty()
sec, err = f.NewSection("auth")
require.NoError(t, err)
_, err = sec.NewKey("login_maximum_lifetime_days", "24")
require.NoError(t, err)
_, err = sec.NewKey("login_maximum_lifetime_duration", "")
_, err = sec.NewKey("login_maximum_lifetime_duration", "24d")
require.NoError(t, err)
maxLifetimeDaysTest, err := time.ParseDuration("576h")
require.NoError(t, err)
@@ -347,8 +343,6 @@ func TestAuthDurationSettings(t *testing.T) {
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")