fix(config): update name values for ip ban

mozilla · Apr 3, 2016 · 92a0008 · 92a0008
1 parent 5ca3052
commit 92a0008
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/lib/bans/handler.js b/lib/bans/handler.js
@@ -7,8 +7,8 @@ var config = require('../config').root()
 var LIFETIME = config.memcache.recordLifetimeSeconds
 var BLOCK_INTERVAL_MS = config.limits.blockIntervalSeconds * 1000
 var RATE_LIMIT_INTERVAL_MS = config.limits.rateLimitIntervalSeconds * 1000
-var IP_RATE_LIMIT_INTERVAL_MS = config.limits.maxBadLoginsIntervalSeconds * 1000
-var IP_RATE_LIMIT_BAN_DURATION_MS = config.limits.maxBadLoginsBanDurationSeconds * 1000
+var IP_RATE_LIMIT_INTERVAL_MS = config.limits.ipRateLimitIntervalSeconds * 1000
+var IP_RATE_LIMIT_BAN_DURATION_MS = config.limits.ipRateLimitBanDurationSeconds * 1000
 var MAX_EMAILS = config.limits.emails
 var BAD_LOGIN_LOCKOUT = config.limits.badLoginLockout
 var BAD_LOGIN_LOCKOUT_INTERVAL_MS = config.limits.badLoginLockoutIntervalSeconds * 1000

diff --git a/lib/config/config.js b/lib/config/config.js
@@ -67,13 +67,13 @@ module.exports = function (fs, path, url, convict) {
         format: 'nat',
         env: 'MAX_BAD_LOGINS_PER_IP'
       },
-      maxBadLoginsIntervalSeconds: {
+      ipRateLimitIntervalSeconds: {
         doc: 'Duration of automatic throttling for IPs',
         default: 60 * 15,
         format: 'nat',
         env: 'IP_RATE_LIMIT_INTERVAL_SECONDS'
       },
-      maxBadLoginsBanDurationSeconds: {
+      ipRateLimitBanDurationSeconds: {
         doc: 'Duration of automatic ban for throttled IPs',
         default: 60 * 15,
         format: 'nat',

diff --git a/lib/server.js b/lib/server.js
@@ -19,8 +19,8 @@ module.exports = function createServer(config, log) {
   var LIFETIME = config.memcache.recordLifetimeSeconds
   var BLOCK_INTERVAL_MS = config.limits.blockIntervalSeconds * 1000
   var RATE_LIMIT_INTERVAL_MS = config.limits.rateLimitIntervalSeconds * 1000
-  var IP_RATE_LIMIT_INTERVAL_MS = config.limits.maxBadLoginsIntervalSeconds * 1000
-  var IP_RATE_LIMIT_BAN_DURATION_MS = config.limits.maxBadLoginsBanDurationSeconds * 1000
+  var IP_RATE_LIMIT_INTERVAL_MS = config.limits.ipRateLimitIntervalSeconds * 1000
+  var IP_RATE_LIMIT_BAN_DURATION_MS = config.limits.ipRateLimitBanDurationSeconds * 1000
   var BAD_LOGIN_LOCKOUT_INTERVAL_MS = config.limits.badLoginLockoutIntervalSeconds * 1000
   var MAX_BAD_LOGINS = config.limits.maxBadLogins
   var MAX_BAD_LOGINS_PER_IP = config.limits.maxBadLoginsPerIp

diff --git a/test/memcache-helper.js b/test/memcache-helper.js
@@ -16,8 +16,8 @@ var config = {
     maxEmails: 3,
     maxBadLogins: 2,
     maxBadLoginsPerIp: Number(process.env.MAX_BAD_LOGINS_PER_IP) || 3,
-    maxBadLoginsIntervalSeconds: Number(process.env.IP_RATE_LIMIT_INTERVAL_SECONDS) || 60 * 15,
-    maxBadLoginsBanDurationSeconds: Number(process.env.IP_RATE_LIMIT_BAN_DURATION_SECONDS) || 60 * 15,
+    ipRateLimitIntervalSeconds: Number(process.env.IP_RATE_LIMIT_INTERVAL_SECONDS) || 60 * 15,
+    ipRateLimitBanDurationSeconds: Number(process.env.IP_RATE_LIMIT_BAN_DURATION_SECONDS) || 60 * 15,
     badLoginLockout: 3,
     badLoginLockoutIntervalSeconds: 20
   }
@@ -44,8 +44,8 @@ var EmailRecord = require('../lib/email_record')(config.limits.rateLimitInterval
 var IpEmailRecord = require('../lib/ip_email_record')(config.limits.rateLimitIntervalSeconds * 1000, config.limits.maxBadLogins)
 var IpRecord = require('../lib/ip_record')(
   config.limits.blockIntervalSeconds * 1000,
-  config.limits.maxBadLoginsIntervalSeconds * 1000,
-  config.limits.maxBadLoginsBanDurationSeconds * 1000,
+  config.limits.ipRateLimitIntervalSeconds * 1000,
+  config.limits.ipRateLimitBanDurationSeconds * 1000,
   config.limits.maxBadLoginsPerIp,
   config.limits.maxAccountStatusCheck)