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

Merge pull request #564 from CartoDB/audit-dependencies

Browse Source 
Fixed vulns automatically with 'npm audit fix'
This commit is contained in:
Daniel G. Aubert 2019-01-17 15:06:02 +01:00 committed by GitHub
commit 6ec6ccf0a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 1193 additions and 2371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,10 @@
'use strict';
var ogr = require('./../ogr');
var Ogr = require('./../ogr');
function CsvFormat() {}
CsvFormat.prototype = new ogr('csv');
CsvFormat.prototype = new Ogr('csv');
CsvFormat.prototype._contentType = "text/csv; charset=utf-8; header=present";
CsvFormat.prototype._fileExtension = "csv";

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

@ -1,10 +1,10 @@
'use strict';
var ogr = require('./../ogr');
var Ogr = require('./../ogr');
function GeoPackageFormat() {}
GeoPackageFormat.prototype = new ogr('gpkg');
GeoPackageFormat.prototype = new Ogr('gpkg');
GeoPackageFormat.prototype._contentType = "application/x-sqlite3; charset=utf-8";
GeoPackageFormat.prototype._fileExtension = "gpkg";

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

@ -1,10 +1,10 @@
'use strict';
var ogr = require('./../ogr');
var Ogr = require('./../ogr');
function KmlFormat() {}
KmlFormat.prototype = new ogr('kml');
KmlFormat.prototype = new Ogr('kml');
KmlFormat.prototype._contentType = "application/kml; charset=utf-8";
KmlFormat.prototype._fileExtension = "kml";

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

@ -4,12 +4,12 @@ var step = require('step');
var fs = require('fs');
var spawn = require('child_process').spawn;
var ogr = require('./../ogr');
var Ogr = require('./../ogr');
function ShpFormat() {
}
ShpFormat.prototype = new ogr('shp');
ShpFormat.prototype = new Ogr('shp');
ShpFormat.prototype._contentType = "application/zip; charset=utf-8";
ShpFormat.prototype._fileExtension = "zip";

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

@ -1,10 +1,10 @@
'use strict';
var ogr = require('./../ogr');
var Ogr = require('./../ogr');
function SpatiaLiteFormat() {}
SpatiaLiteFormat.prototype = new ogr('spatialite');
SpatiaLiteFormat.prototype = new Ogr('spatialite');
SpatiaLiteFormat.prototype._contentType = "application/x-sqlite3; charset=utf-8";
SpatiaLiteFormat.prototype._fileExtension = "sqlite";

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

@ -2,12 +2,12 @@
var _ = require('underscore');
var pg = require('./../pg');
var Pg = require('./../pg');
var ArrayBufferSer = require("../../bin_encoder");
function BinaryFormat() {}
BinaryFormat.prototype = new pg('arraybuffer');
BinaryFormat.prototype = new Pg('arraybuffer');
BinaryFormat.prototype._contentType = "application/octet-stream";
@ -40,6 +40,8 @@ BinaryFormat.prototype.transform = function(result, options, callback) {
try {
var i;
var r;
var n;
var t;
// get header types (and guess from name)
for(i = 0; i < headersNames.length; ++i) {
@ -62,8 +64,8 @@ BinaryFormat.prototype.transform = function(result, options, callback) {
var data = [header];
for(i = 0; i < headersNames.length; ++i) {
var d = [];
var n = headersNames[i];
for(var r = 0; r < total_rows; ++r) {
n = headersNames[i];
for(r = 0; r < total_rows; ++r) {
var row = rows[r][n];
if(headerTypes[i] > ArrayBufferSer.BUFFER) {
row = new ArrayBufferSer(headerTypes[i] - ArrayBufferSer.BUFFER, row);

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

@ -2,14 +2,14 @@
var _ = require('underscore');
var pg = require('./../pg');
var Pg = require('./../pg');
const errorHandlerFactory = require('../../../services/error_handler_factory');
function GeoJsonFormat() {
this.buffer = '';
}
GeoJsonFormat.prototype = new pg('geojson');
GeoJsonFormat.prototype = new Pg('geojson');
GeoJsonFormat.prototype._contentType = "application/json; charset=utf-8";

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

@ -2,7 +2,7 @@
var _ = require('underscore');
var pg = require('./../pg');
var Pg = require('./../pg');
const errorHandlerFactory = require('../../../services/error_handler_factory');
function JsonFormat() {
@ -10,7 +10,7 @@ function JsonFormat() {
this.lastKnownResult = {};
}
JsonFormat.prototype = new pg('json');
JsonFormat.prototype = new Pg('json');
JsonFormat.prototype._contentType = "application/json; charset=utf-8";

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

@ -1,6 +1,6 @@
'use strict';
var pg = require('./../pg');
var Pg = require('./../pg');
var svg_width = 1024.0;
var svg_height = 768.0;
@ -24,7 +24,7 @@ function SvgFormat() {
this._streamingStarted = false;
}
SvgFormat.prototype = new pg('svg');
SvgFormat.prototype = new Pg('svg');
SvgFormat.prototype._contentType = "image/svg+xml; charset=utf-8";
SvgFormat.prototype.getQuery = function(sql, options) {

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

@ -1,6 +1,6 @@
'use strict';
var pg = require('./../pg');
var Pg = require('./../pg');
var _ = require('underscore');
var geojson = require('./geojson');
var TopoJSON = require('topojson');
@ -9,7 +9,7 @@ function TopoJsonFormat() {
this.features = [];
}
TopoJsonFormat.prototype = new pg('topojson');
TopoJsonFormat.prototype = new Pg('topojson');
TopoJsonFormat.prototype.getQuery = function(sql, options) {
return geojson.prototype.getQuery(sql, options) + ' where ' + options.gn + ' is not null';

852
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

2648
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
package.json
View File

@ -24,8 +24,8 @@
"cartodb-psql": "0.13.1",
"cartodb-query-tables": "0.4.0",
"cartodb-redis": "2.1.0",
"debug": "2.2.0",
"express": "~4.13.3",
"debug": "^4.1.1",
"express": "^4.16.4",
"gc-stats": "1.2.1",
"log4js": "cartodb/log4js-node#cdb",
"lru-cache": "~2.5.0",
@ -39,7 +39,7 @@
"queue-async": "~1.0.7",
"redis-mpool": "0.7.0",
"redlock": "2.0.1",
"request": "~2.75.0",
"request": "^2.88.0",
"step": "~0.0.5",
"step-profiler": "~0.3.0",
"topojson": "0.0.8",
@ -48,17 +48,17 @@
},
"devDependencies": {
"istanbul": "0.4.5",
"jshint": "~2.6.0",
"jshint": "^2.9.7",
"libxmljs": "0.19.5",
"mocha": "3.2.0",
"mocha": "^5.2.0",
"mockdate": "^2.0.2",
"shapefile": "0.3.0",
"sqlite3": "4.0.0",
"zipfile": "0.5.11"
"zipfile": "0.5.12"
},
"scripts": {
"test": "make test-all",
"test:unit": "mocha test/unit/**/*.js",
"test:unit": "mocha test/unit/**/*.js --exit",
"test:unit:watch": "npm run test:unit -- -w",
"docker-test": "./docker-test.sh",
"docker-bash": "./docker-bash.sh"

4
test/run_tests.sh
View File

@ -148,10 +148,10 @@ echo
if test x"$OPT_COVERAGE" = xyes; then
echo "Running tests with coverage"
./node_modules/.bin/istanbul cover node_modules/.bin/_mocha -- -u tdd --trace -t 5000 ${TESTS}
./node_modules/.bin/istanbul cover node_modules/.bin/_mocha -- -u tdd --trace -t 5000 --exit ${TESTS}
else
echo "Running tests"
mocha -u tdd -t 5000 ${TESTS}
mocha -u tdd -t 5000 --exit ${TESTS}
fi
ret=$?