admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add omitempty option to LoginHistoryMaximumEntries field to avoid it being set to 0

Browse Source
This commit is contained in:
Xinzhao Xu
2022-03-28 16:51:33 +08:00
parent 7bd9120e43
commit 28f260e244
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/authentication/options.go
View File

@@ -51,7 +51,7 @@ type Options struct {
LoginHistoryRetentionPeriod time.Duration `json:"loginHistoryRetentionPeriod" yaml:"loginHistoryRetentionPeriod"` LoginHistoryRetentionPeriod time.Duration `json:"loginHistoryRetentionPeriod" yaml:"loginHistoryRetentionPeriod"`
// retention login history, records beyond this amount will be deleted // retention login history, records beyond this amount will be deleted
// LoginHistoryMaximumEntries restricts for all kubesphere accounts and must be greater than AuthenticateRateLimiterMaxTries // LoginHistoryMaximumEntries restricts for all kubesphere accounts and must be greater than AuthenticateRateLimiterMaxTries
LoginHistoryMaximumEntries int `json:"loginHistoryMaximumEntries" yaml:"loginHistoryMaximumEntries"` LoginHistoryMaximumEntries int `json:"loginHistoryMaximumEntries,omitempty" yaml:"loginHistoryMaximumEntries,omitempty"`
// allow multiple users login from different location at the same time // allow multiple users login from different location at the same time
MultipleLogin bool `json:"multipleLogin" yaml:"multipleLogin"` MultipleLogin bool `json:"multipleLogin" yaml:"multipleLogin"`
// secret to sign jwt token // secret to sign jwt token

1
pkg/apiserver/config/config_test.go
View File

@@ -151,6 +151,7 @@ func newTestConfig() (*Config, error) {
AuthenticateRateLimiterMaxTries: 5, AuthenticateRateLimiterMaxTries: 5,
AuthenticateRateLimiterDuration: 30 * time.Minute, AuthenticateRateLimiterDuration: 30 * time.Minute,
JwtSecret: "xxxxxx", JwtSecret: "xxxxxx",
LoginHistoryMaximumEntries: 100,
MultipleLogin: false, MultipleLogin: false,
OAuthOptions: &oauth.Options{ OAuthOptions: &oauth.Options{
Issuer: oauth.DefaultIssuer, Issuer: oauth.DefaultIssuer,