cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #847 from CartoDB/fix-res-locals-named-maps

Browse Source 
Do not pass the entire res.locals to named maps provider cache
This commit is contained in:
Daniel 2018-01-15 19:02:01 +01:00 committed by GitHub
commit 128ab53c55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/cartodb/controllers/named_maps.js
View File

@ -16,6 +16,17 @@ function numMapper(n) {
return +n; return +n;
} }
function getRequestParams(locals) {
const params = Object.assign({}, locals);
delete params.template;
delete params.affectedTablesAndLastUpdate;
delete params.namedMapProvider;
delete params.allowedQueryParams;
return params;
}
function NamedMapsController(prepareContext, namedMapProviderCache, tileBackend, previewBackend, function NamedMapsController(prepareContext, namedMapProviderCache, tileBackend, previewBackend,
surrogateKeysCache, tablesExtentApi, metadataBackend) { surrogateKeysCache, tablesExtentApi, metadataBackend) {
this.namedMapProviderCache = namedMapProviderCache; this.namedMapProviderCache = namedMapProviderCache;
@ -74,8 +85,9 @@ NamedMapsController.prototype.getNamedMapProvider = function (label) {
const { user } = res.locals; const { user } = res.locals;
const { config, auth_token } = req.query; const { config, auth_token } = req.query;
const { template_id } = req.params; const { template_id } = req.params;
const params = getRequestParams(res.locals);
this.namedMapProviderCache.get(user, template_id, config, auth_token, res.locals, (err, namedMapProvider) => { this.namedMapProviderCache.get(user, template_id, config, auth_token, params, (err, namedMapProvider) => {
if (err) { if (err) {
err.label = label; err.label = label;
return next(err); return next(err);
@ -146,11 +158,13 @@ NamedMapsController.prototype.prepareLayerFilterFromPreviewLayers = function (la
return next(); return next();
} }
const params = getRequestParams(res.locals);
// overwrites 'all' default filter // overwrites 'all' default filter
res.locals.layer = layerVisibilityFilter.join(','); params.layer = layerVisibilityFilter.join(',');
// recreates the provider // recreates the provider
this.namedMapProviderCache.get(user, template_id, config, auth_token, res.locals, (err, provider) => { this.namedMapProviderCache.get(user, template_id, config, auth_token, params, (err, provider) => {
if (err) { if (err) {
err.label = label; err.label = label;
return next(err); return next(err);