diff options
| author | Corey Hulen <corey@hulen.com> | 2015-08-02 09:17:37 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-08-02 09:17:37 -0800 |
| commit | 4d1562c5de377741734a0ad4e8eb30a83d301262 (patch) | |
| tree | 74d1d7821b3863231c2d9429b6ccb48728661b30 /utils | |
| parent | adc8def9e06a7908d5f092088922dc26cbb277df (diff) | |
| parent | d93bf60248f066542d0851a7b6847f925975d77f (diff) | |
| download | chat-4d1562c5de377741734a0ad4e8eb30a83d301262.tar.gz chat-4d1562c5de377741734a0ad4e8eb30a83d301262.tar.bz2 chat-4d1562c5de377741734a0ad4e8eb30a83d301262.zip | |
Merge pull request #273 from mattermost/mm-1355
Fixes mm-1355 adds rate limiting apis
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/utils/config.go b/utils/config.go index ce8475894..8d9dd11e0 100644 --- a/utils/config.go +++ b/utils/config.go @@ -18,18 +18,19 @@ const ( ) type ServiceSettings struct { - SiteName string - Mode string - AllowTesting bool - UseSSL bool - Port string - Version string - InviteSalt string - PublicLinkSalt string - ResetSalt string - AnalyticsUrl string - UseLocalStorage bool - StorageDirectory string + SiteName string + Mode string + AllowTesting bool + UseSSL bool + Port string + Version string + InviteSalt string + PublicLinkSalt string + ResetSalt string + AnalyticsUrl string + UseLocalStorage bool + StorageDirectory string + AllowedLoginAttempts int } type SSOSetting struct { @@ -90,6 +91,14 @@ type EmailSettings struct { ApplePushCertPrivate string } +type RateLimitSettings struct { + UseRateLimiter bool + PerSec int + MemoryStoreSize int + VaryByRemoteAddr bool + VaryByHeader string +} + type PrivacySettings struct { ShowEmailAddress bool ShowPhoneNumber bool @@ -111,15 +120,16 @@ type TeamSettings struct { } type Config struct { - LogSettings LogSettings - ServiceSettings ServiceSettings - SqlSettings SqlSettings - AWSSettings AWSSettings - ImageSettings ImageSettings - EmailSettings EmailSettings - PrivacySettings PrivacySettings - TeamSettings TeamSettings - SSOSettings map[string]SSOSetting + LogSettings LogSettings + ServiceSettings ServiceSettings + SqlSettings SqlSettings + AWSSettings AWSSettings + ImageSettings ImageSettings + EmailSettings EmailSettings + RateLimitSettings RateLimitSettings + PrivacySettings PrivacySettings + TeamSettings TeamSettings + SSOSettings map[string]SSOSetting } func (o *Config) ToJson() string { |