From b0d63b2ec0df5bf0deac71ad9b39ae17d2e73274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Tue, 27 Feb 2018 16:52:27 +0100 Subject: [PATCH] changing module exports and middleware name --- lib/cartodb/controllers/layergroup.js | 25 +++++++++++---------- lib/cartodb/controllers/map.js | 11 ++++----- lib/cartodb/controllers/named_maps.js | 7 +++--- lib/cartodb/controllers/named_maps_admin.js | 13 ++++++----- lib/cartodb/middleware/rate-limit.js | 6 ++--- test/acceptance/rate-limit.test.js | 8 ++----- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/lib/cartodb/controllers/layergroup.js b/lib/cartodb/controllers/layergroup.js index 76647f53..5549a5c2 100644 --- a/lib/cartodb/controllers/layergroup.js +++ b/lib/cartodb/controllers/layergroup.js @@ -5,7 +5,8 @@ var cors = require('../middleware/cors'); var userMiddleware = require('../middleware/user'); var allowQueryParams = require('../middleware/allow-query-params'); var vectorError = require('../middleware/vector-error'); -const { rateLimitMiddleware, RATE_LIMIT_ENDPOINTS_GROUPS } = require('../middleware/rate-limit'); +const rateLimit = require('../middleware/rate-limit'); +const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit; var DataviewBackend = require('../backends/dataview'); var AnalysisStatusBackend = require('../backends/analysis-status'); @@ -63,7 +64,7 @@ LayergroupController.prototype.register = function(app) { app.base_url_mapconfig + '/:token/:z/:x/:y@:scale_factor?x.:format', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_8), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_8), this.prepareContext, this.tile.bind(this), vectorError() @@ -73,7 +74,7 @@ LayergroupController.prototype.register = function(app) { app.base_url_mapconfig + '/:token/:z/:x/:y.:format', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_8), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_8), this.prepareContext, this.tile.bind(this), vectorError() @@ -83,7 +84,7 @@ LayergroupController.prototype.register = function(app) { app.base_url_mapconfig + '/:token/:layer/:z/:x/:y.(:format)', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_8), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_8), validateLayerRouteMiddleware, this.prepareContext, this.layer.bind(this), @@ -94,7 +95,7 @@ LayergroupController.prototype.register = function(app) { app.base_url_mapconfig + '/:token/:layer/attributes/:fid', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_9), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_9), this.prepareContext, this.attributes.bind(this) ); @@ -103,7 +104,7 @@ LayergroupController.prototype.register = function(app) { app.base_url_mapconfig + '/static/center/:token/:z/:lat/:lng/:width/:height.:format', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_2), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_2), allowQueryParams(['layer']), this.prepareContext, this.center.bind(this) @@ -113,7 +114,7 @@ LayergroupController.prototype.register = function(app) { app.base_url_mapconfig + '/static/bbox/:token/:west,:south,:east,:north/:width/:height.:format', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_2), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_2), allowQueryParams(['layer']), this.prepareContext, this.bbox.bind(this) @@ -141,7 +142,7 @@ LayergroupController.prototype.register = function(app) { app.base_url_mapconfig + '/:token/dataview/:dataviewName', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_5), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_5), allowQueryParams(allowedDataviewQueryParams), this.prepareContext, this.dataview.bind(this) @@ -151,7 +152,7 @@ LayergroupController.prototype.register = function(app) { app.base_url_mapconfig + '/:token/:layer/widget/:dataviewName', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_5), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_5), allowQueryParams(allowedDataviewQueryParams), this.prepareContext, this.dataview.bind(this) @@ -161,7 +162,7 @@ LayergroupController.prototype.register = function(app) { app.base_url_mapconfig + '/:token/dataview/:dataviewName/search', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_6), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_6), allowQueryParams(allowedDataviewQueryParams), this.prepareContext, this.dataviewSearch.bind(this) @@ -171,7 +172,7 @@ LayergroupController.prototype.register = function(app) { app.base_url_mapconfig + '/:token/:layer/widget/:dataviewName/search', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_6), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_6), allowQueryParams(allowedDataviewQueryParams), this.prepareContext, this.dataviewSearch.bind(this) @@ -181,7 +182,7 @@ LayergroupController.prototype.register = function(app) { app.base_url_mapconfig + '/:token/analysis/node/:nodeId', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_7), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_7), this.prepareContext, this.analysisNodeStatus.bind(this) ); diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index f07e6399..8a119ef6 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -7,7 +7,8 @@ var ResourceLocator = require('../models/resource-locator'); var cors = require('../middleware/cors'); var userMiddleware = require('../middleware/user'); const allowQueryParams = require('../middleware/allow-query-params'); -const { rateLimitMiddleware, RATE_LIMIT_ENDPOINTS_GROUPS } = require('../middleware/rate-limit'); +const rateLimit = require('../middleware/rate-limit'); +const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit; var MapConfig = windshaft.model.MapConfig; var Datasource = windshaft.model.Datasource; @@ -58,28 +59,28 @@ MapController.prototype.register = function(app) { base_url_mapconfig, cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_1), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_1), this.composeCreateMapMiddleware() ); app.post( base_url_mapconfig, cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_1), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_1), this.composeCreateMapMiddleware() ); app.get( `${base_url_templated}/:template_id/jsonp`, cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_13), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_13), this.composeCreateMapMiddleware(useTemplate) ); app.post( `${base_url_templated}/:template_id`, cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_13), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_13), this.composeCreateMapMiddleware(useTemplate) ); app.options( diff --git a/lib/cartodb/controllers/named_maps.js b/lib/cartodb/controllers/named_maps.js index 80f32748..5ee82611 100644 --- a/lib/cartodb/controllers/named_maps.js +++ b/lib/cartodb/controllers/named_maps.js @@ -3,7 +3,8 @@ const cors = require('../middleware/cors'); const userMiddleware = require('../middleware/user'); const allowQueryParams = require('../middleware/allow-query-params'); const vectorError = require('../middleware/vector-error'); -const { rateLimitMiddleware, RATE_LIMIT_ENDPOINTS_GROUPS } = require('../middleware/rate-limit'); +const rateLimit = require('../middleware/rate-limit'); +const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit; const DEFAULT_ZOOM_CENTER = { zoom: 1, @@ -46,7 +47,7 @@ NamedMapsController.prototype.register = function(app) { app.base_url_templated + '/:template_id/:layer/:z/:x/:y.(:format)', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_17), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_17), this.prepareContext, this.getNamedMapProvider('NAMED_MAP_TILE'), this.getAffectedTables(), @@ -64,7 +65,7 @@ NamedMapsController.prototype.register = function(app) { app.base_url_mapconfig + '/static/named/:template_id/:width/:height.:format', cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_3), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_3), allowQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']), this.prepareContext, this.getNamedMapProvider('STATIC_VIZ_MAP'), diff --git a/lib/cartodb/controllers/named_maps_admin.js b/lib/cartodb/controllers/named_maps_admin.js index 88caf741..7dd10e75 100644 --- a/lib/cartodb/controllers/named_maps_admin.js +++ b/lib/cartodb/controllers/named_maps_admin.js @@ -1,7 +1,8 @@ const { templateName } = require('../backends/template_maps'); const cors = require('../middleware/cors'); const userMiddleware = require('../middleware/user'); -const { rateLimitMiddleware, RATE_LIMIT_ENDPOINTS_GROUPS } = require('../middleware/rate-limit'); +const rateLimit = require('../middleware/rate-limit'); +const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimit; /** * @param {AuthApi} authApi @@ -24,7 +25,7 @@ NamedMapsAdminController.prototype.register = function (app) { `${base_url_templated}/`, cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_11), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_11), this.checkContentType('POST', 'POST TEMPLATE'), this.authorizedByAPIKey('create', 'POST TEMPLATE'), this.create() @@ -34,7 +35,7 @@ NamedMapsAdminController.prototype.register = function (app) { `${base_url_templated}/:template_id`, cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_14), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_14), this.checkContentType('PUT', 'PUT TEMPLATE'), this.authorizedByAPIKey('update', 'PUT TEMPLATE'), this.update() @@ -44,7 +45,7 @@ NamedMapsAdminController.prototype.register = function (app) { `${base_url_templated}/:template_id`, cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_12), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_12), this.authorizedByAPIKey('get', 'GET TEMPLATE'), this.retrieve() ); @@ -53,7 +54,7 @@ NamedMapsAdminController.prototype.register = function (app) { `${base_url_templated}/:template_id`, cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_15), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_15), this.authorizedByAPIKey('delete', 'DELETE TEMPLATE'), this.destroy() ); @@ -62,7 +63,7 @@ NamedMapsAdminController.prototype.register = function (app) { `${base_url_templated}/`, cors(), userMiddleware, - rateLimitMiddleware(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_10), + rateLimit(this.metadataBackend, RATE_LIMIT_ENDPOINTS_GROUPS.ENDPOINT_10), this.authorizedByAPIKey('list', 'GET TEMPLATE LIST'), this.list() ); diff --git a/lib/cartodb/middleware/rate-limit.js b/lib/cartodb/middleware/rate-limit.js index 3c63acbe..bffba8ce 100644 --- a/lib/cartodb/middleware/rate-limit.js +++ b/lib/cartodb/middleware/rate-limit.js @@ -20,8 +20,8 @@ const RATE_LIMIT_ENDPOINTS_GROUPS = { ENDPOINT_17: 'named_tiles' }; -function rateLimitMiddleware(metadataBackend, endpointGroup = null) { - return function rateLimit(req, res, next) { +function rateLimit(metadataBackend, endpointGroup = null) { + return function rateLimitMiddleware(req, res, next) { if (!global.environment.enabledFeatures.rateLimitsEnabled) { return next(); } @@ -180,7 +180,7 @@ function isRateLimitEnabledByEndpoint(endpointGroup) { } -module.exports.rateLimitMiddleware = rateLimitMiddleware; +module.exports = rateLimit; module.exports.RATE_LIMIT_ENDPOINTS_GROUPS = RATE_LIMIT_ENDPOINTS_GROUPS; module.exports.getStoreKey = getStoreKey; module.exports.getLowerRateLimit = getLowerRateLimit; diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit.test.js index 3aaee94e..7b211f03 100644 --- a/test/acceptance/rate-limit.test.js +++ b/test/acceptance/rate-limit.test.js @@ -5,12 +5,8 @@ const redis = require('redis'); const RedisPool = require('redis-mpool'); const cartodbRedis = require('cartodb-redis'); const TestClient = require('../support/test-client'); -const { - rateLimitMiddleware, - RATE_LIMIT_ENDPOINTS_GROUPS, - getStoreKey -} = require('../../lib/cartodb/middleware/rate-limit'); - +const rateLimitMiddleware = require('../../lib/cartodb/middleware/rate-limit'); +const { RATE_LIMIT_ENDPOINTS_GROUPS, getStoreKey } = rateLimitMiddleware; let rateLimit; let redisClient;