Merge pull request #4660 from withspectrum/revert-4647-node-rate-limits

Revert "Add request-level rate limiting"

Author: mxstbr

api/index.js

@@ -17,7 +17,6 @@ import { init as initPassport } from './authentication.js';
 import apolloServer from './apollo-server';
 import { corsOptions } from 'shared/middlewares/cors';
 import errorHandler from 'shared/middlewares/error-handler';
-import rateLimiter from 'shared/middlewares/rate-limiter';
 import middlewares from './routes/middlewares';
 import authRoutes from './routes/auth';
 import apiRoutes from './routes/api';
@@ -44,13 +43,6 @@ app.use(statsd);
 // Trust the now proxy
 app.set('trust proxy', true);
 app.use(toobusy);
-// Allow bursts of up to 40 req for initial page loads, but block more than 40 / 10s
-app.use(
-  rateLimiter({
-    max: 40,
-    duration: '10s',
-  })
-);
 
 // Security middleware.
 addSecurityMiddleware(app, { enableNonce: false, enableCSP: false });

api/package.json

@@ -92,7 +92,6 @@
     "pre-commit": "^1.2.2",
     "prismjs": "^1.15.0",
     "query-string": "5.1.1",
-    "ratelimiter": "^3.2.0",
     "raven": "^2.6.4",
     "react": "^15.4.1",
     "react-app-rewire-styled-components": "^3.0.2",

api/yarn.lock

@@ -7791,11 +7791,6 @@ range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
-ratelimiter@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ratelimiter/-/ratelimiter-3.2.0.tgz#ae74cf9629daae4cc8900ec126ab28d3794070f1"
-  integrity sha512-zMc9X4FNmOk3RBxV95lvp13sZRtf43UJJN1FficbYiusBB09zB6gcJtK2X18dKmH+Gq0C7W6qNCHE+UJx0YwVg==
-
 raven@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/raven/-/raven-2.6.4.tgz#458d4a380c8fbb59e0150c655625aaf60c167ea3"

flow-typed/npm/ratelimiter_vx.x.x.js

@@ -14,7 +14,6 @@ import path from 'path';
 import { getUserById } from 'shared/db/queries/user';
 import Raven from 'shared/raven';
 import toobusy from 'shared/middlewares/toobusy';
-import rateLimiter from 'shared/middlewares/rate-limiter';
 import addSecurityMiddleware from 'shared/middlewares/security';
 
 const PORT = process.env.PORT || 3006;
@@ -29,12 +28,6 @@ app.use(statsd);
 app.set('trust proxy', true);
 
 app.use(toobusy);
-app.use(
-  rateLimiter({
-    max: 5,
-    duration: '20s',
-  })
-);
 
 // Security middleware.
 addSecurityMiddleware(app, { enableNonce: true, enableCSP: true });

hyperion/index.js

@@ -149,7 +149,6 @@
     "prismjs": "^1.15.0",
     "query-string": "5.1.1",
     "raf": "^3.4.0",
-    "ratelimiter": "^3.2.0",
     "raven": "^2.6.4",
     "react": "^16.7.0-alpha.2",
     "react-apollo": "^2.3.2",
@@ -221,7 +220,7 @@
     "start:analytics": "cross-env NODE_ENV=production node build-analytics/main.js",
     "start:api": "cross-env NODE_ENV=production node build-api/main.js",
     "dev:web": "cross-env NODE_PATH=./ react-app-rewired start",
-    "dev:api": "cross-env FILE_STORAGE=local cross-env NODE_PATH=./ cross-env NODE_ENV=development cross-env DEBUG=build*,api*,shared:rethinkdb:db-query-cache,-api:resolvers,shared:middlewares:ratelimiter cross-env DIR=api backpack",
+    "dev:api": "cross-env FILE_STORAGE=local cross-env NODE_PATH=./ cross-env NODE_ENV=development cross-env DEBUG=build*,api*,shared:rethinkdb:db-query-cache,-api:resolvers cross-env DIR=api backpack",
     "dev:api:s3": "cross-env FILE_STORAGE=s3 cross-env NODE_PATH=./ cross-env NODE_ENV=development cross-env DEBUG=build*,api*,shared:rethinkdb:db-query-cache,-api:resolvers cross-env DIR=api backpack",
     "dev:athena": "cross-env NODE_PATH=./ cross-env NODE_ENV=development cross-env DEBUG=build*,athena*,shared:middlewares*,-athena:resolvers cross-env DIR=athena backpack",
     "dev:hermes": "cross-env NODE_PATH=./ cross-env NODE_ENV=development cross-env DEBUG=build*,hermes*,shared:middlewares*,-hermes:resolvers cross-env DIR=hermes backpack",

package.json

@@ -11773,11 +11773,6 @@ range-parser@^1.0.3, range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
-ratelimiter@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ratelimiter/-/ratelimiter-3.2.0.tgz#ae74cf9629daae4cc8900ec126ab28d3794070f1"
-  integrity sha512-zMc9X4FNmOk3RBxV95lvp13sZRtf43UJJN1FficbYiusBB09zB6gcJtK2X18dKmH+Gq0C7W6qNCHE+UJx0YwVg==
-
 raven@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/raven/-/raven-2.6.4.tgz#458d4a380c8fbb59e0150c655625aaf60c167ea3"