diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index 38d0668b..1af0634c 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -12,17 +12,12 @@ var CdbRequest = require('./models/cdb_request'); var REQUEST_QUERY_PARAMS_WHITELIST = [ 'user', 'sql', - 'geom_type', 'cache_buster', 'cache_policy', 'callback', - 'interactivity', 'map_key', 'api_key', 'auth_token', - 'style', - 'style_version', - 'style_convert', 'config', 'scale_factor' ]; @@ -531,9 +526,6 @@ module.exports = function(redisPool) { if ( req.query.lzma ) { - // TODO: check ? - //console.log("type of req.query.lzma is " + typeof(req.query.lzma)); - // Decode (from base64) var lzma = new Buffer(req.query.lzma, 'base64') .toString('binary') diff --git a/test/unit/cartodb/req2params.test.js b/test/unit/cartodb/req2params.test.js index 90b96169..7e2c1360 100644 --- a/test/unit/cartodb/req2params.test.js +++ b/test/unit/cartodb/req2params.test.js @@ -1,8 +1,6 @@ -var assert = require('assert') - , _ = require('underscore') - , redis = require('redis') - , test_helper = require('../../support/test_helper') - , tests = module.exports = {}; +var assert = require('assert'); +var _ = require('underscore'); +var test_helper = require('../../support/test_helper'); suite('req2params', function() { @@ -65,23 +63,35 @@ suite('req2params', function() { }); test('it should extend params with decoded lzma', function(done) { - var qo = { - style: 'test', - style_version: '2.1.0', - cache_buster: 5 - }; - test_helper.lzma_compress_to_base64(JSON.stringify(qo), 1, function(err, data) { - opts.req2params({ headers: { host:'localhost' }, query: { non_included: 'toberemoved', api_key: 'test', style: 'override', lzma: data }}, function(err, req) { - if ( err ) { done(err); return; } - var query = req.params - assert.equal(qo.style, query.style) - assert.equal(qo.style_version, query.style_version) - assert.equal(qo.cache_buster, query.cache_buster) - assert.equal('test', query.api_key) - assert.equal(undefined, query.non_included) - done(); + var qo = { + style: 'test', + style_version: '2.1.0', + cache_buster: 5 + }; + test_helper.lzma_compress_to_base64(JSON.stringify(qo), 1, function(err, data) { + console.log(data); + var req = { + headers: { + host:'localhost' + }, + query: { + non_included: 'toberemoved', + api_key: 'test', + style: 'override', + lzma: data + } + }; + opts.req2params(req, function(err, req) { + if ( err ) { + return done(err); + } + var query = req.params; + assert.equal(qo.cache_buster, query.cache_buster); + assert.equal('test', query.api_key); + assert.equal(undefined, query.non_included); + done(); + }); }); - }); }); - + });