Merge pull request #273 from mattermost/mm-1355

Fixes mm-1355 adds rate limiting apis

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 {