From 0c8968fb8df4ce302c928118cd81e75f5bef2861 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 30 Jan 2018 17:23:00 -0600 Subject: unnamed return (#8170) --- model/config.go | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'model/config.go') diff --git a/model/config.go b/model/config.go index 60a6d1983..525fc71ed 100644 --- a/model/config.go +++ b/model/config.go @@ -1681,12 +1681,8 @@ func (o *Config) Clone() *Config { } func (o *Config) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func (o *Config) GetSSOService(service string) *SSOSettings { @@ -1703,14 +1699,9 @@ func (o *Config) GetSSOService(service string) *SSOSettings { } func ConfigFromJson(data io.Reader) *Config { - decoder := json.NewDecoder(data) - var o Config - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Config + json.NewDecoder(data).Decode(&o) + return o } func (o *Config) SetDefaults() { -- cgit v1.2.3-1-g7c22 From 1262d254736229618582f0963c9c30c4e66efb98 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 31 Jan 2018 09:49:15 -0800 Subject: User based rate limiting (#8152) --- model/config.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'model/config.go') diff --git a/model/config.go b/model/config.go index 525fc71ed..b7888ab13 100644 --- a/model/config.go +++ b/model/config.go @@ -802,7 +802,8 @@ type RateLimitSettings struct { PerSec *int MaxBurst *int MemoryStoreSize *int - VaryByRemoteAddr bool + VaryByRemoteAddr *bool + VaryByUser *bool VaryByHeader string } @@ -822,6 +823,14 @@ func (s *RateLimitSettings) SetDefaults() { if s.MemoryStoreSize == nil { s.MemoryStoreSize = NewInt(10000) } + + if s.VaryByRemoteAddr == nil { + s.VaryByRemoteAddr = NewBool(true) + } + + if s.VaryByUser == nil { + s.VaryByUser = NewBool(false) + } } type PrivacySettings struct { -- cgit v1.2.3-1-g7c22