IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

removes old cookie auth configuration

Browse Source
This commit is contained in:
bergquist 2019-01-24 10:55:10 +01:00
parent 56a521b264
commit ff483f3782
4 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/defaults.ini
View File

@ -116,9 +116,6 @@ cookie_name = grafana_session
# If you want login cookies to be https only. default is false # If you want login cookies to be https only. default is false
cookie_secure = false cookie_secure = false
# Logged in user name
cookie_username = grafana_user
# How many days an session can be unused before we inactivate it # How many days an session can be unused before we inactivate it
login_remember_days = 7 login_remember_days = 7
@ -198,11 +195,6 @@ admin_password = admin
# used for signing # used for signing
secret_key = SW2YcwTIb9zpOOhoPsMm secret_key = SW2YcwTIb9zpOOhoPsMm
# Auto-login remember days
login_remember_days = 7
cookie_username = grafana_user
cookie_remember_name = grafana_remember
# disable gravatar profile images # disable gravatar profile images
disable_gravatar = false disable_gravatar = false

8
conf/sample.ini
View File

@ -112,9 +112,6 @@ log_queries =
# If you want login cookies to be https only. default is false # If you want login cookies to be https only. default is false
;cookie_secure = false ;cookie_secure = false
# Logged in user name
;cookie_username = grafana_user
# How many days an session can be unused before we inactivate it # How many days an session can be unused before we inactivate it
;login_remember_days = 7 ;login_remember_days = 7
@ -184,11 +181,6 @@ log_queries =
# used for signing # used for signing
;secret_key = SW2YcwTIb9zpOOhoPsMm ;secret_key = SW2YcwTIb9zpOOhoPsMm
# Auto-login remember days
;login_remember_days = 7
;cookie_username = grafana_user
;cookie_remember_name = grafana_remember
# disable gravatar profile images # disable gravatar profile images
;disable_gravatar = false ;disable_gravatar = false

1
pkg/services/auth/auth_token_test.go
View File

@ -303,7 +303,6 @@ func createTestContext(t *testing.T) *testContext {
} }
UrgentRotateTime = time.Minute UrgentRotateTime = time.Minute
setting.LogInRememberDays = 7
return &testContext{ return &testContext{
sqlstore: sqlstore, sqlstore: sqlstore,

6
pkg/setting/setting.go
View File

@ -83,9 +83,6 @@ var (
// Security settings. // Security settings.
SecretKey string SecretKey string
LogInRememberDays int
CookieUserName string
CookieRememberName string
DisableGravatar bool DisableGravatar bool
EmailCodeValidMinutes int EmailCodeValidMinutes int
DataProxyWhiteList map[string]bool DataProxyWhiteList map[string]bool
@ -603,9 +600,6 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
// read security settings // read security settings
security := iniFile.Section("security") security := iniFile.Section("security")
SecretKey = security.Key("secret_key").String() SecretKey = security.Key("secret_key").String()
LogInRememberDays = security.Key("login_remember_days").MustInt()
CookieUserName = security.Key("cookie_username").String()
CookieRememberName = security.Key("cookie_remember_name").String()
DisableGravatar = security.Key("disable_gravatar").MustBool(true) DisableGravatar = security.Key("disable_gravatar").MustBool(true)
cfg.DisableBruteForceLoginProtection = security.Key("disable_brute_force_login_protection").MustBool(false) cfg.DisableBruteForceLoginProtection = security.Key("disable_brute_force_login_protection").MustBool(false)
DisableBruteForceLoginProtection = cfg.DisableBruteForceLoginProtection DisableBruteForceLoginProtection = cfg.DisableBruteForceLoginProtection