From 9677a9f71777d75f3def0b0cb238050a30ec6a67 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 29 Jul 2015 01:26:10 -0800 Subject: Fixes mm-1355 adds rate limiting apis --- config/config.json | 10 +++++++++- config/config_docker.json | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/config.json b/config/config.json index cfb3c2de8..40bb41e63 100644 --- a/config/config.json +++ b/config/config.json @@ -21,7 +21,8 @@ "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", "UseLocalStorage": true, - "StorageDirectory": "./data/" + "StorageDirectory": "./data/", + "AllowedLoginAttempts": 3 }, "SSOSettings": { "gitlab": { @@ -68,6 +69,13 @@ "ApplePushCertPublic": "", "ApplePushCertPrivate": "" }, + "RateLimitSettings": { + "UseRateLimiter": true, + "PerSec": 10, + "MemoryStoreSize": 10000, + "VaryByRemoteAddr": true, + "VaryByHeader": "" + }, "PrivacySettings": { "ShowEmailAddress": true, "ShowPhoneNumber": true, diff --git a/config/config_docker.json b/config/config_docker.json index 2d5a34539..e4f37976d 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -21,7 +21,8 @@ "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", "UseLocalStorage": true, - "StorageDirectory": "/mattermost/data/" + "StorageDirectory": "/mattermost/data/", + "AllowedLoginAttempts": 3 }, "SSOSettings": { "gitlab": { @@ -68,6 +69,13 @@ "ApplePushCertPublic": "", "ApplePushCertPrivate": "" }, + "RateLimitSettings": { + "UseRateLimiter": true, + "PerSec": 10, + "MemoryStoreSize": 10000, + "VaryByRemoteAddr": true, + "VaryByHeader": "" + }, "PrivacySettings": { "ShowEmailAddress": true, "ShowPhoneNumber": true, -- cgit v1.2.3-1-g7c22 From b4877c5d36569dae486a1e53f39c35d346e3d3d2 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 30 Jul 2015 00:46:17 -0800 Subject: Fixing code review feedback --- config/config.json | 2 +- config/config_docker.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/config.json b/config/config.json index 40bb41e63..121d5b3a4 100644 --- a/config/config.json +++ b/config/config.json @@ -22,7 +22,7 @@ "AnalyticsUrl": "", "UseLocalStorage": true, "StorageDirectory": "./data/", - "AllowedLoginAttempts": 3 + "AllowedLoginAttempts": 10 }, "SSOSettings": { "gitlab": { diff --git a/config/config_docker.json b/config/config_docker.json index e4f37976d..712551d1f 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -22,7 +22,7 @@ "AnalyticsUrl": "", "UseLocalStorage": true, "StorageDirectory": "/mattermost/data/", - "AllowedLoginAttempts": 3 + "AllowedLoginAttempts": 10 }, "SSOSettings": { "gitlab": { -- cgit v1.2.3-1-g7c22