cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use strict mode

Browse Source
This commit is contained in:
Daniel García Aubert 2018-10-24 15:42:33 +02:00
parent cf5ad64fd4
commit a616982ec3
116 changed files with 314 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.js
View File

@ -1,5 +1,7 @@
#!/usr/bin/env node
'use strict';
/*
* SQL API loader
* ===============

8
app/auth/apikey.js
View File

@ -1,3 +1,5 @@
'use strict';
/**
* this module allows to auth user using an pregenerated api key
*/
@ -32,7 +34,7 @@ ApikeyAuth.prototype.verifyCredentials = function (callback) {
return callback(usernameError);
}
if (!apikey.grantsSql) {
const forbiddenError = new Error('forbidden');
forbiddenError.http_status = 403;
@ -47,8 +49,8 @@ ApikeyAuth.prototype.verifyCredentials = function (callback) {
apiKeyNotFoundError.subtype = 'api-key-not-found';
apiKeyNotFoundError.http_status = 401;
return callback(apiKeyNotFoundError);
}
return callback(apiKeyNotFoundError);
}
});
};

2
app/auth/auth_api.js
View File

@ -1,3 +1,5 @@
'use strict';
var ApiKeyAuth = require('./apikey'),
OAuthAuth = require('./oauth');

2
app/auth/oauth.js
View File

@ -1,3 +1,5 @@
'use strict';
// too bound to the request object, but ok for now
var _ = require('underscore');
var OAuthUtil = require('oauth-client');

16
app/controllers/job_controller.js
View File

@ -1,3 +1,5 @@
'use strict';
const util = require('util');
const bodyParserMiddleware = require('../middlewares/body-parser');
@ -30,25 +32,25 @@ JobController.prototype.route = function (app) {
);
app.get(
`${base_url}/jobs-wip`,
`${base_url}/jobs-wip`,
bodyParserMiddleware(),
listWorkInProgressJobs(this.jobService),
sendResponse(),
listWorkInProgressJobs(this.jobService),
sendResponse(),
errorMiddleware()
);
app.post(
`${base_url}/sql/job`,
`${base_url}/sql/job`,
bodyParserMiddleware(),
checkBodyPayloadSize(),
checkBodyPayloadSize(),
jobMiddlewares('create', createJob, RATE_LIMIT_ENDPOINTS_GROUPS.JOB_CREATE)
);
app.get(
`${base_url}/sql/job/:job_id`,
`${base_url}/sql/job/:job_id`,
bodyParserMiddleware(),
jobMiddlewares('retrieve', getJob, RATE_LIMIT_ENDPOINTS_GROUPS.JOB_GET)
);
app.delete(
`${base_url}/sql/job/:job_id`,
`${base_url}/sql/job/:job_id`,
bodyParserMiddleware(),
jobMiddlewares('cancel', cancelJob, RATE_LIMIT_ENDPOINTS_GROUPS.JOB_DELETE)
);

2
app/middlewares/authorization.js
View File

@ -1,3 +1,5 @@
'use strict';
const AuthApi = require('../auth/auth_api');
const basicAuth = require('basic-auth');

1
app/middlewares/body-parser.js
View File

@ -1,3 +1,4 @@
'use strict';
/*!
* Connect - bodyParser

2
app/middlewares/connection-params.js
View File

@ -1,3 +1,5 @@
'use strict';
module.exports = function connectionParams (userDatabaseService) {
return function connectionParamsMiddleware (req, res, next) {
const { user, api_key: apikeyToken, authorizationLevel } = res.locals;

2
app/middlewares/db-quota.js
View File

@ -1,3 +1,5 @@
'use strict';
const PSQL = require('cartodb-psql');
const remainingQuotaQuery = 'SELECT _CDB_UserQuotaInBytes() - CDB_UserDataSize(current_schema()) AS remaining_quota';

2
app/middlewares/error.js
View File

@ -1,3 +1,5 @@
'use strict';
const errorHandlerFactory = require('../services/error_handler_factory');
module.exports = function error() {

2
app/middlewares/profiler.js
View File

@ -1,3 +1,5 @@
'use strict';
module.exports.initializeProfilerMiddleware = function initializeProfiler (label) {
return function initializeProfilerMiddleware (req, res, next) {
if (req.profiler) {

2
app/middlewares/timeout-limits.js
View File

@ -1,3 +1,5 @@
'use strict';
module.exports = function timeoutLimits (metadataBackend) {
return function timeoutLimitsMiddleware (req, res, next) {
const { user, authorizationLevel } = res.locals;

2
app/middlewares/user.js
View File

@ -1,3 +1,5 @@
'use strict';
const CdbRequest = require('../models/cartodb_request');
module.exports = function user(metadataBackend) {

3
app/models/bin_encoder.js
View File

@ -1,3 +1,4 @@
'use strict';
function ArrayBufferSer(type, data, options) {
if(type === undefined) {
@ -83,7 +84,7 @@ ArrayBufferSer.prototype = {
s = 0;
if(this.type === ArrayBufferSer.STRING) {
// calculate size with padding
t.forEach(function(arr) {
t.forEach(function(arr) {
var pad = self._paddingFor(offset, ArrayBufferSer.MAX_PADDING);
s += pad;
offset += pad;

2
app/models/cartodb_request.js
View File

@ -1,3 +1,5 @@
'use strict';
/**
* this module provides cartodb-specific interpretation
* of request headers

2
app/models/formats/index.js
View File

@ -1,3 +1,5 @@
'use strict';
var fs = require("fs");
var formats = {};

2
app/models/formats/ogr.js
View File

@ -1,3 +1,5 @@
'use strict';
var crypto = require('crypto');
var step = require('step');
var fs = require('fs');

2
app/models/formats/ogr/csv.js
View File

@ -1,3 +1,5 @@
'use strict';
var ogr = require('./../ogr');
function CsvFormat() {}

2
app/models/formats/ogr/geopackage.js
View File

@ -1,3 +1,5 @@
'use strict';
var ogr = require('./../ogr');
function GeoPackageFormat() {}

2
app/models/formats/ogr/kml.js
View File

@ -1,3 +1,5 @@
'use strict';
var ogr = require('./../ogr');
function KmlFormat() {}

2
app/models/formats/ogr/shp.js
View File

@ -1,3 +1,5 @@
'use strict';
var step = require('step');
var fs = require('fs');
var spawn = require('child_process').spawn;

2
app/models/formats/ogr/spatialite.js
View File

@ -1,3 +1,5 @@
'use strict';
var ogr = require('./../ogr');
function SpatiaLiteFormat() {}

2
app/models/formats/pg.js
View File

@ -1,3 +1,5 @@
'use strict';
var step = require('step');
var PSQL = require('cartodb-psql');
var assert = require('assert');

6
app/models/formats/pg/arraybuffer.js
View File

@ -1,3 +1,5 @@
'use strict';
var _ = require('underscore');
var pg = require('./../pg');
@ -22,7 +24,7 @@ BinaryFormat.prototype.transform = function(result, options, callback) {
var total_rows = result.rowCount;
var rows = result.rows;
// get headers
// get headers
if(!total_rows) {
callback(null, new Buffer(0));
return;
@ -62,7 +64,7 @@ BinaryFormat.prototype.transform = function(result, options, callback) {
var d = [];
var n = headersNames[i];
for(var r = 0; r < total_rows; ++r) {
var row = rows[r][n];
var row = rows[r][n];
if(headerTypes[i] > ArrayBufferSer.BUFFER) {
row = new ArrayBufferSer(headerTypes[i] - ArrayBufferSer.BUFFER, row);
}

2
app/models/formats/pg/geojson.js
View File

@ -1,3 +1,5 @@
'use strict';
var _ = require('underscore');
var pg = require('./../pg');

2
app/models/formats/pg/json.js
View File

@ -1,3 +1,5 @@
'use strict';
var _ = require('underscore');
var pg = require('./../pg');

2
app/models/formats/pg/svg.js
View File

@ -1,3 +1,5 @@
'use strict';
var pg = require('./../pg');
var svg_width = 1024.0;

2
app/models/formats/pg/topojson.js
View File

@ -1,3 +1,5 @@
'use strict';
var pg = require('./../pg');
var _ = require('underscore');
var geojson = require('./geojson');

2
app/monitoring/health_check.js
View File

@ -1,3 +1,5 @@
'use strict';
var step = require('step'),
fs = require('fs');

2
app/postgresql/error_codes.js
View File

@ -1,3 +1,5 @@
'use strict';
var _ = require('underscore');
// reference http://www.postgresql.org/docs/9.3/static/errcodes-appendix.html

2
app/server.js
View File

@ -1,3 +1,5 @@
'use strict';
// CartoDB SQL API
//
// all requests expect the following URL args:

2
app/services/cached-query-tables.js
View File

@ -1,3 +1,5 @@
'use strict';
var QueryTables = require('cartodb-query-tables');
var generateMD5 = require('../utils/md5');

2
app/services/error_handler.js
View File

@ -1,3 +1,5 @@
'use strict';
class ErrorHandler extends Error {
constructor({ message, context, detail, hint, http_status, name }) {
super(message);

2
app/services/error_handler_factory.js
View File

@ -1,3 +1,5 @@
'use strict';
const ErrorHandler = require('./error_handler');
const { codeToCondition } = require('../postgresql/error_codes');

4
app/services/pg-entities-access-validator.js
View File

@ -1,3 +1,5 @@
'use strict';
const FORBIDDEN_ENTITIES = {
carto: ['*'],
cartodb: [
@ -56,6 +58,6 @@ const Validator = {
return true;
}
};
};
module.exports = Validator;

2
app/services/stream_copy.js
View File

@ -1,3 +1,5 @@
'use strict';
const PSQL = require('cartodb-psql');
const copyTo = require('pg-copy-streams').to;
const copyFrom = require('pg-copy-streams').from;

2
app/services/stream_copy_metrics.js
View File

@ -1,3 +1,5 @@
'use strict';
const { getFormatFromCopyQuery } = require('../utils/query_info');
module.exports = class StreamCopyMetrics {

4
app/services/user_database_service.js
View File

@ -1,3 +1,5 @@
'use strict';
function isApiKeyFound(apikey) {
return apikey.type !== null &&
apikey.user !== null &&
@ -43,7 +45,7 @@ UserDatabaseService.prototype.getConnectionParams = function (username, apikeyTo
};
this.metadataBackend.getMasterApikey(username, (err, masterApikey) => {
if (err) {
err.http_status = 404;
err.message = errorUserNotFoundMessageTemplate(username);

6
app/services/user_limits.js
View File

@ -1,7 +1,9 @@
'use strict';
/**
* UserLimits
* @param {cartodb-redis} metadataBackend
* @param {object} options
* @param {cartodb-redis} metadataBackend
* @param {object} options
*/
class UserLimits {
constructor(metadataBackend, options = {}) {

4
app/stats/client.js
View File

@ -1,3 +1,5 @@
'use strict';
var _ = require('underscore');
var debug = require('debug')('windshaft:stats_client');
var StatsD = require('node-statsd').StatsD;
@ -70,4 +72,4 @@ module.exports = {
return this.instance;
}
};
};

2
app/stats/profiler-proxy.js
View File

@ -1,3 +1,5 @@
'use strict';
var Profiler = require('step-profiler');
/**

6
app/utils/query_info.js
View File

@ -1,3 +1,5 @@
'use strict';
const COPY_FORMATS = ['TEXT', 'CSV', 'BINARY'];
module.exports = {
@ -9,11 +11,11 @@ module.exports = {
if (!copyQuery.startsWith("COPY ")) {
return false;
}
if(copyQuery.includes(' WITH') && copyQuery.includes('FORMAT ')) {
const regex = /\bFORMAT\s+(\w+)/;
const result = regex.exec(copyQuery);
if (result && result.length === 2) {
if (COPY_FORMATS.includes(result[1])) {
format = result[1];

2
client/bin_decoder.js
View File

@ -1,4 +1,4 @@
'use strict';
function ArrayBufferSer(arrayBuffer) {
this.buffer = arrayBuffer;

2
test/acceptance/app-configuration.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

2
test/acceptance/app.auth.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

2
test/acceptance/app.test.js
View File

@ -1,3 +1,5 @@
'use strict';
/**
*
* Requires the database and tables setup in config/environments/test.js to exist

2
test/acceptance/auth-api.js
View File

@ -1,3 +1,5 @@
'use strict';
const assert = require('../support/assert');
const TestClient = require('../support/test-client');
const BatchTestClient = require('../support/batch-test-client');

2
test/acceptance/backend_crash.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var assert = require('../support/assert');

2
test/acceptance/batch/batch-drain.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');
var redisUtils = require('../../support/redis_utils');

2
test/acceptance/batch/batch-limits.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/batch/batch.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/batch/batch.wip.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/batch/job.callback-template.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/batch/job.fallback.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/batch/job.query.limit.test.js
View File

@ -1,3 +1,5 @@
'use strict';
/**
*
* Requires the database and tables setup in config/environments/test.js to exist

2
test/acceptance/batch/job.query.order.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/batch/job.query.timeout.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/batch/job.test.js
View File

@ -1,3 +1,5 @@
'use strict';
/**
*
* Requires the database and tables setup in config/environments/test.js to exist

2
test/acceptance/batch/job.timing.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var BatchTestClient = require('../../support/batch-test-client');

2
test/acceptance/batch/leader-multiple-users-query-order.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/batch/leader.job.query.order.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/batch/queued-jobs-limit.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/batch/scheduler-basic.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/batch/use-cases.test.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var assert = require('../../support/assert');

2
test/acceptance/cache.js
View File

@ -1,4 +1,4 @@
'use const';
'use strict';
var server = require('../../app/server')();
const assert = require('../support/assert');

2
test/acceptance/copy-abort.js
View File

@ -1,3 +1,5 @@
'use strict';
const querystring = require('querystring');
const StatsClient = require('../../app/stats/client');
const statsClient = StatsClient.getInstance(global.settings.statsd);

2
test/acceptance/copy-endpoints.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
const fs = require('fs');

2
test/acceptance/copy-statements.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

6
test/acceptance/error-handler.js
View File

@ -1,7 +1,9 @@
'use strict';
var server = require('../../app/server')();
var assert = require('../support/assert');
describe('error handler', function () {
describe('error handler', function () {
it('should returns a errors header', function (done) {
const errorHeader = {
detail: undefined,
@ -22,7 +24,7 @@ describe('error handler', function () {
'Content-Type': 'application/json; charset=utf-8',
'X-SQLAPI-Errors': JSON.stringify(errorHeader)
}
},
},
function(err){
assert.ifError(err);
done();

2
test/acceptance/export/arraybuffer.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
require('../../support/assert');

2
test/acceptance/export/csv.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
require('../../support/assert');

2
test/acceptance/export/folder.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
require('../../support/assert');

4
test/acceptance/export/geojson.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var server = require('../../../app/server')();
@ -34,7 +36,7 @@ it('GET /api/v1/sql with SQL parameter, ensuring content-disposition set to geoj
it('POST /api/v1/sql with SQL parameter, ensuring content-disposition set to geojson', function(done) {
assert.response(server, {
url: '/api/v1/sql',
url: '/api/v1/sql',
data: querystring.stringify({q: "SELECT * FROM untitle_table_4", format: 'geojson' }),
headers: {host: 'vizzuality.cartodb.com', 'Content-Type': 'application/x-www-form-urlencoded' },
method: 'POST'

2
test/acceptance/export/geopackage.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var server = require('../../../app/server')();

2
test/acceptance/export/kml.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var server = require('../../../app/server')();

2
test/acceptance/export/shapefile.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var server = require('../../../app/server')();

2
test/acceptance/export/spatialite.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var server = require('../../../app/server')();

2
test/acceptance/export/svg.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var server = require('../../../app/server')();

2
test/acceptance/export/timeout.js
View File

@ -1,3 +1,5 @@
'use strict';
const TestClient = require('../../support/test-client');
require('../../support/assert');

52
test/acceptance/export/topojson.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../../helper');
var server = require('../../../app/server')();
@ -46,7 +48,7 @@ it('GET two polygons sharing an edge as topojson', function(done){
var trans = topojson.transform;
assert.equal(_.keys(trans).length, 2); // only scale and translate
assert.equal(trans.scale.length, 2); // scalex, scaley
assert.equal(Math.round(trans.scale[0]*1e6), 1000);
assert.equal(Math.round(trans.scale[0]*1e6), 1000);
assert.equal(Math.round(trans.scale[1]*1e6), 1000);
assert.equal(trans.translate.length, 2); // translatex, translatey
assert.equal(trans.translate[0], -5);
@ -58,7 +60,7 @@ it('GET two polygons sharing an edge as topojson', function(done){
var obj = topojson.objects[0];
//console.dir(obj);
// Expected:
// Expected:
// { type: 'Polygon',
// arcs: [ [ 0, 1 ] ],
// properties: { gid: 1, nam: 'U' } }
@ -74,9 +76,9 @@ it('GET two polygons sharing an edge as topojson', function(done){
assert.equal(props.gid, 1);
assert.equal(props.name, 'U');
obj = topojson.objects[1];
obj = topojson.objects[1];
//console.dir(obj);
// Expected:
// Expected:
// { type: 'Polygon',
// arcs: [ [ 0, 2 ] ],
// properties: { gid: 2, nam: 'D' } }
@ -94,37 +96,37 @@ it('GET two polygons sharing an edge as topojson', function(done){
// Check arcs
assert.ok(topojson.hasOwnProperty('arcs'));
assert.equal(topojson.arcs.length, 3); // one shared, two non-shared
assert.equal(topojson.arcs.length, 3); // one shared, two non-shared
var arc = topojson.arcs[0]; // shared arc
assert.equal(arc.length, 2); // shared arc has two vertices
var p = arc[0];
assert.equal(Math.round(p[0]*trans.scale[0]), 0);
assert.equal(Math.round(p[1]*trans.scale[1]), 5);
assert.equal(Math.round(p[0]*trans.scale[0]), 0);
assert.equal(Math.round(p[1]*trans.scale[1]), 5);
p = arc[1];
assert.equal(Math.round(p[0]*trans.scale[0]), 5);
assert.equal(Math.round(p[1]*trans.scale[1]), 5);
assert.equal(Math.round(p[0]*trans.scale[0]), 5);
assert.equal(Math.round(p[1]*trans.scale[1]), 5);
arc = topojson.arcs[1]; // non shared arc
assert.equal(arc.length, 3); // non shared arcs have three vertices
p = arc[0];
assert.equal(Math.round(p[0]*trans.scale[0]), 5);
assert.equal(Math.round(p[1]*trans.scale[1]), 10);
assert.equal(Math.round(p[0]*trans.scale[0]), 5);
assert.equal(Math.round(p[1]*trans.scale[1]), 10);
p = arc[1];
assert.equal(Math.round(p[0]*trans.scale[0]), 5);
assert.equal(Math.round(p[1]*trans.scale[1]), -5);
assert.equal(Math.round(p[0]*trans.scale[0]), 5);
assert.equal(Math.round(p[1]*trans.scale[1]), -5);
p = arc[2];
assert.equal(Math.round(p[0]*trans.scale[0]), -10);
assert.equal(Math.round(p[1]*trans.scale[1]), 0);
assert.equal(Math.round(p[0]*trans.scale[0]), -10);
assert.equal(Math.round(p[1]*trans.scale[1]), 0);
arc = topojson.arcs[2]; // non shared arc
assert.equal(arc.length, 3); // non shared arcs have three vertices
p = arc[0];
assert.equal(Math.round(p[0]*trans.scale[0]), 5);
assert.equal(Math.round(p[1]*trans.scale[1]), 10);
assert.equal(Math.round(p[0]*trans.scale[0]), 5);
assert.equal(Math.round(p[1]*trans.scale[1]), 10);
p = arc[1];
assert.equal(Math.round(p[0]*trans.scale[0]), 0);
assert.equal(Math.round(p[1]*trans.scale[1]), -10);
assert.equal(Math.round(p[0]*trans.scale[0]), 0);
assert.equal(Math.round(p[1]*trans.scale[1]), -10);
p = arc[2];
assert.equal(Math.round(p[0]*trans.scale[0]), -5);
assert.equal(Math.round(p[1]*trans.scale[1]), 5);
assert.equal(Math.round(p[0]*trans.scale[0]), -5);
assert.equal(Math.round(p[1]*trans.scale[1]), 5);
done();
});
@ -151,7 +153,7 @@ it('null geometries', function(done){
var trans = topojson.transform;
assert.equal(_.keys(trans).length, 2); // only scale and translate
assert.equal(trans.scale.length, 2); // scalex, scaley
assert.equal(Math.round(trans.scale[0]*1e6), 1000);
assert.equal(Math.round(trans.scale[0]*1e6), 1000);
assert.equal(Math.round(trans.scale[1]*1e6), 500);
assert.equal(trans.translate.length, 2); // translatex, translatey
assert.equal(trans.translate[0], -5);
@ -163,7 +165,7 @@ it('null geometries', function(done){
var obj = topojson.objects[0];
//console.dir(obj);
// Expected:
// Expected:
// { type: 'Polygon',
// arcs: [ [ 0, 1 ] ],
// properties: { gid: 1, nam: 'U' } }
@ -180,8 +182,8 @@ it('null geometries', function(done){
// Check arcs
assert.ok(topojson.hasOwnProperty('arcs'));
assert.equal(topojson.arcs.length, 1);
var arc = topojson.arcs[0];
assert.equal(topojson.arcs.length, 1);
var arc = topojson.arcs[0];
assert.deepEqual(arc, [ [ 0, 0 ], [ 4999, 9999 ], [ 5000, -9999 ], [ -9999, 0 ] ]);
done();

2
test/acceptance/frontend_abort.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var assert = require('../support/assert');

2
test/acceptance/health_check.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
require('../support/assert');

2
test/acceptance/last-modified-header.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

2
test/acceptance/logging.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var appServer = require('../../app/server');

2
test/acceptance/pagination.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

18
test/acceptance/pg-entities-access-validator.js
View File

@ -1,3 +1,5 @@
'use strict';
const assert = require('../support/assert');
const TestClient = require('../support/test-client');
@ -26,25 +28,25 @@ describe('PG entities access validator', function () {
describe('validatePGEntitiesAccess enabled', function() {
before(function(){
global.settings.validatePGEntitiesAccess = true;
global.settings.validatePGEntitiesAccess = true;
});
forbiddenQueries.forEach(query => {
it(`testClientApiKey: query: ${query}`, function(done) {
assertQuery(query, testClientApiKey, done);
});
it(`testClientAuthorized: query: ${query}`, function(done) {
assertQuery(query, testClientAuthorized, done);
});
});
});
});
describe('validatePGEntitiesAccess disabled', function() {
before(function(){
global.settings.validatePGEntitiesAccess = false;
global.settings.validatePGEntitiesAccess = false;
});
forbiddenQueries.forEach(query => {
it(`testClientApiKey: query: ${query}`, function(done) {
testClientApiKey.getResult(query, err => {
@ -52,13 +54,13 @@ describe('PG entities access validator', function () {
done();
});
});
it(`testClientAuthorized: query: ${query}`, function(done) {
testClientAuthorized.getResult(query, err => {
assert.ifError(err);
done();
});
});
});
});
});
});

2
test/acceptance/query-float-values.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

2
test/acceptance/query-multipart.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
const server = require('../../app/server')();

2
test/acceptance/query-returning.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

2
test/acceptance/query-tables-api-cache.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var qs = require('querystring');

20
test/acceptance/rate-limit.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
const qs = require('querystring');
@ -30,7 +32,7 @@ function setLimit(count, period, burst) {
return;
}
const key = `limits:rate:store:${user}:sql:${RATE_LIMIT_ENDPOINTS_GROUPS.QUERY}`;
const key = `limits:rate:store:${user}:sql:${RATE_LIMIT_ENDPOINTS_GROUPS.QUERY}`;
redisClient.rpush(key, burst);
redisClient.rpush(key, count);
redisClient.rpush(key, period);
@ -40,9 +42,9 @@ function setLimit(count, period, burst) {
function assertRequest (status, limit, remaining, reset, retry, done = null) {
assert.response(
server,
request,
{ status },
server,
request,
{ status },
function(err, res) {
assert.ifError(err);
assert.equal(res.headers['carto-rate-limit-limit'], limit);
@ -53,10 +55,10 @@ function assertRequest (status, limit, remaining, reset, retry, done = null) {
assert.equal(res.headers['retry-after'], retry);
}
if(status === 429) {
const expectedResponse = {
if(status === 429) {
const expectedResponse = {
error: ["You are over platform\'s limits. Please contact us to know more details"],
context: "limit",
context: "limit",
detail: "rate-limit"
};
@ -74,7 +76,7 @@ describe('rate limit', function() {
before(function() {
global.settings.ratelimits.rateLimitsEnabled = true;
global.settings.ratelimits.endpoints.query = true;
server = app();
redisClient = redis.createClient(global.settings.redis_port);
@ -94,7 +96,7 @@ describe('rate limit', function() {
});
it("1 req/sec: 2 req/seg should be limited", function(done) {
assertRequest(200, 2, 1, 1);
assertRequest(200, 2, 1, 1);
setTimeout( () => assertRequest(200, 2, 0, 1, null), 250 );
setTimeout( () => assertRequest(429, 2, 0, 1, 1), 500 );
setTimeout( () => assertRequest(429, 2, 0, 1, 1), 750 );

2
test/acceptance/regressions.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

2
test/acceptance/skipfields.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

2
test/acceptance/stream-responses.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

4
test/acceptance/surrogate-key.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();
@ -64,7 +66,7 @@ describe('Surrogate-Key header', function() {
{dbname: 'cartodb_test_user_1_db', schema_name: 'public', table_name: 'untitle_table_4'}
], done));
});
it('supports explicit transactions', function(done) {
var sql = "BEGIN; SELECT * FROM untitle_table_4; COMMIT; BEGIN; SELECT * FROM private_table; COMMIT;";

2
test/acceptance/system-queries.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

2
test/acceptance/timeout.js
View File

@ -1,3 +1,5 @@
'use strict';
/**
*
* Requires the database and tables setup in config/environments/test.js to exist

2
test/acceptance/transaction.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var assert = require('../support/assert');

2
test/acceptance/x-cache-channel.js
View File

@ -1,3 +1,5 @@
'use strict';
require('../helper');
var server = require('../../app/server')();

2
test/helper.js
View File

@ -1,2 +1,4 @@
'use strict';
global.settings = require('../config/environments/test');
process.env.NODE_ENV = 'test';

Some files were not shown because too many files have changed in this diff Show More