fix(security): Remove vulnerable hoek from transitive dev dependencies

instana · Apr 27, 2018 · d42e7e7 · d42e7e7
1 parent 9ecea35
commit d42e7e7
Show file tree

Hide file tree

Showing 22 changed files with 474 additions and 698 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,9 +76,9 @@
  "mysql2": "^1.5.1",
  "proxyquire": "1.7.3",
  "redis": "^2.8.0",
- "request": "2.74.0",
- "request-promise": "4.1.1",
- "request-promise-native": "1.0.3",
+ "request": "^2.85.0",
+ "request-promise": "^4.1.1",
+ "request-promise-native": "^1.0.3",
  "sinon": "1.17.1",
  "underscore": "^1.8.3",
  "uuid": "^3.2.1"

diff --git a/test/actions/profiling/cpu_test.js b/test/actions/profiling/cpu_test.js
@@ -5,9 +5,7 @@ var semver = require('semver');
 var path = require('path');
 var fs = require('fs');
 
-var expressElasticsearchControls = require('../../apps/expressElasticsearchControls');
 var supportedVersion = require('../../../src/tracing/index').supportedVersion;
-var agentStubControls = require('../../apps/agentStubControls');
 var cpu = require('../../../src/actions/profiling/cpu');
 var config = require('../../config');
 var utils = require('../../utils');
@@ -18,6 +16,10 @@ describe('actions/profiling/cpu', function() {
  return;
  }
 
+ // controls require features that aren't available in early Node.js versions
+ var expressElasticsearchControls = require('../../apps/expressElasticsearchControls');
+ var agentStubControls = require('../../apps/agentStubControls');
+
  describe('toTreeWithTiming', function() {
  var rawCpuProfile;
 

diff --git a/test/actions/source_test.js b/test/actions/source_test.js
@@ -1,16 +1,23 @@
 'use strict';
 
 var expect = require('chai').expect;
+var semver = require('semver');
 var path = require('path');
 
 var supportedVersion = require('../../src/tracing/index').supportedVersion;
-var expressControls = require('../apps/expressElasticsearchControls');
-var agentStubControls = require('../apps/agentStubControls');
 var config = require('../config');
 var utils = require('../utils');
 
 
 describe('actions/source', function() {
+ if (semver.satisfies(process.versions.node, '<4')) {
+ return;
+ }
+
+ // controls require features that aren't available in early Node.js versions
+ var expressControls = require('../apps/expressElasticsearchControls');
+ var agentStubControls = require('../apps/agentStubControls');
+
  this.timeout(config.getTestTimeout());
 
  agentStubControls.registerTestHooks();

diff --git a/test/agentCommunication_test.js b/test/agentCommunication_test.js
@@ -1,13 +1,20 @@
 'use strict';
 
 var expect = require('chai').expect;
+var semver = require('semver');
 
-var agentStubControls = require('./apps/agentStubControls');
-var expressControls = require('./apps/expressControls');
 var config = require('./config');
 var utils = require('./utils');
 
 describe('agentCommunication', function() {
+ if (semver.satisfies(process.versions.node, '<4')) {
+ return;
+ }
+
+ // controls require features that aren't available in early Node.js versions
+ var agentStubControls = require('./apps/agentStubControls');
+ var expressControls = require('./apps/expressControls');
+
  this.timeout(config.getTestTimeout());
 
  agentStubControls.registerTestHooks();

diff --git a/test/apps/agentStub_test.js b/test/apps/agentStub_test.js
@@ -2,12 +2,18 @@
 
 'use strict';
 
+var supportedVersion = require('../../src/tracing/index').supportedVersion;
 var config = require('../config');
-var agentStubControls = require('./agentStubControls');
 var expect = require('chai').expect;
 
-
 describe('agentStub', function() {
+ if (!supportedVersion(process.versions.node)) {
+ return;
+ }
+
+ // controls require features that aren't available in early Node.js versions
+ var agentStubControls = require('./agentStubControls');
+
  this.timeout(config.getTestTimeout());
 
  agentStubControls.registerTestHooks();

diff --git a/test/disabledTracing_test.js b/test/disabledTracing_test.js
@@ -4,8 +4,6 @@ var expect = require('chai').expect;
 var Promise = require('bluebird');
 
 var supportedVersion = require('../src/tracing/index').supportedVersion;
-var agentStubControls = require('./apps/agentStubControls');
-var expressControls = require('./apps/expressControls');
 var config = require('./config');
 var utils = require('./utils');
 
@@ -14,6 +12,10 @@ describe('disabled tracing', function() {
  return;
  }
 
+ // controls require features that aren't available in early Node.js versions
+ var agentStubControls = require('./apps/agentStubControls');
+ var expressControls = require('./apps/expressControls');
+
  this.timeout(config.getTestTimeout());
 
  agentStubControls.registerTestHooks();

diff --git a/test/metrics/healthchecks_test.js b/test/metrics/healthchecks_test.js
@@ -2,9 +2,6 @@
 
 var expect = require('chai').expect;
 var semver = require('semver');
-
-var agentStubControls = require('../apps/agentStubControls');
-var expressControls = require('../apps/expressControls');
 var config = require('../config');
 var utils = require('../utils');
 
@@ -14,6 +11,11 @@ describe('metrics/healthchecks', function() {
  if (!semver.satisfies(process.versions.node, '>=6.0.0')) {
  return;
  }
+
+ // require controls at this place, because the modules themselves aren't compatible with Node.js 0.12
+ var agentStubControls = require('../apps/agentStubControls');
+ var expressControls = require('../apps/expressControls');
+
  this.timeout(config.getTestTimeout());
 
  var start = new Date().getTime();

diff --git a/test/tracing/asyncAwait_test.js b/test/tracing/asyncAwait_test.js
@@ -3,9 +3,6 @@
 var expect = require('chai').expect;
 var semver = require('semver');
 
-var expressAsyncAwaitControls = require('../apps/expressAsyncAwaitControls');
-var agentStubControls = require('../apps/agentStubControls');
-var expressControls = require('../apps/expressControls');
 var config = require('../config');
 var utils = require('../utils');
 
@@ -14,6 +11,11 @@ describe('tracing', function() {
  return;
  }
 
+ // controls require features that aren't available in early Node.js versions
+ var expressAsyncAwaitControls = require('../apps/expressAsyncAwaitControls');
+ var agentStubControls = require('../apps/agentStubControls');
+ var expressControls = require('../apps/expressControls');
+
  this.timeout(config.getTestTimeout());
 
  agentStubControls.registerTestHooks();

diff --git a/test/tracing/bluebird/test.js b/test/tracing/bluebird/test.js
@@ -3,15 +3,18 @@
 var expect = require('chai').expect;
 
 var supportedVersion = require('../../../src/tracing/index').supportedVersion;
-var agentControls = require('../../apps/agentStubControls');
-var BluebirdControls = require('./controls');
 var config = require('../../config');
 var utils = require('../../utils');
 
 describe('tracing/bluebird', function() {
  if (!supportedVersion(process.versions.node)) {
  return;
  }
+
+ // controls require features that aren't available in early Node.js versions
+ var agentControls = require('../../apps/agentStubControls');
+ var BluebirdControls = require('./controls');
+
  this.timeout(config.getTestTimeout());
 
  agentControls.registerTestHooks();

diff --git a/test/tracing/elasticsearch_test.js b/test/tracing/elasticsearch_test.js
@@ -2,9 +2,7 @@
 
 var expect = require('chai').expect;
 
-var expressElasticsearchControls = require('../apps/expressElasticsearchControls');
 var supportedVersion = require('../../src/tracing/index').supportedVersion;
-var agentStubControls = require('../apps/agentStubControls');
 var config = require('../config');
 var utils = require('../utils');
 
@@ -13,6 +11,10 @@ describe('tracing/elasticsearch', function() {
  return;
  }
 
+ // controls require features that aren't available in early Node.js versions
+ var expressElasticsearchControls = require('../apps/expressElasticsearchControls');
+ var agentStubControls = require('../apps/agentStubControls');
+
  this.timeout(config.getTestTimeout());
 
  agentStubControls.registerTestHooks();

diff --git a/test/tracing/express_uncaughtErrors/test.js b/test/tracing/express_uncaughtErrors/test.js
@@ -3,15 +3,18 @@
 var expect = require('chai').expect;
 
 var supportedVersion = require('../../../src/tracing/index').supportedVersion;
-var agentControls = require('../../apps/agentStubControls');
-var ExpressUncaughtErrorsControls = require('./controls');
 var config = require('../../config');
 var utils = require('../../utils');
 
 describe('tracing/express with uncaught errors', function() {
  if (!supportedVersion(process.versions.node)) {
  return;
  }
+
+ // controls require features that aren't available in early Node.js versions
+ var agentControls = require('../../apps/agentStubControls');
+ var ExpressUncaughtErrorsControls = require('./controls');
+
  this.timeout(config.getTestTimeout());
 
  agentControls.registerTestHooks();

diff --git a/test/tracing/https_test.js b/test/tracing/https_test.js
@@ -3,8 +3,6 @@
 var expect = require('chai').expect;
 
 var supportedVersion = require('../../src/tracing/index').supportedVersion;
-var agentStubControls = require('../apps/agentStubControls');
-var expressControls = require('../apps/expressControls');
 var config = require('../config');
 var utils = require('../utils');
 
@@ -13,6 +11,10 @@ describe('tracing/https', function() {
  return;
  }
 
+ // controls require features that aren't available in early Node.js versions
+ var agentStubControls = require('../apps/agentStubControls');
+ var expressControls = require('../apps/expressControls');
+
  this.timeout(config.getTestTimeout());
 
  agentStubControls.registerTestHooks();

diff --git a/test/tracing/ioredis/test.js b/test/tracing/ioredis/test.js
@@ -3,15 +3,18 @@
 var expect = require('chai').expect;
 
 var supportedVersion = require('../../../src/tracing/index').supportedVersion;
-var agentControls = require('../../apps/agentStubControls');
-var IoRedisControls = require('./controls');
 var config = require('../../config');
 var utils = require('../../utils');
 
 describe('tracing/ioredis', function() {
  if (!supportedVersion(process.versions.node)) {
  return;
  }
+
+ // controls require features that aren't available in early Node.js versions
+ var agentControls = require('../../apps/agentStubControls');
+ var IoRedisControls = require('./controls');
+
  this.timeout(config.getTestTimeout());
 
  agentControls.registerTestHooks();

diff --git a/test/tracing/kafka_test.js b/test/tracing/kafka_test.js
@@ -2,10 +2,7 @@
 
 var expect = require('chai').expect;
 
-var expressKafkaProducerControls = require('../apps/expressKafkaProducerControls');
 var supportedVersion = require('../../src/tracing/index').supportedVersion;
-var kafkaConsumerControls = require('../apps/kafkaConsumerControls');
-var agentStubControls = require('../apps/agentStubControls');
 var config = require('../config');
 var utils = require('../utils');
 
@@ -14,6 +11,11 @@ describe('tracing/kafka', function() {
  return;
  }
 
+ // controls require features that aren't available in early Node.js versions
+ var expressKafkaProducerControls = require('../apps/expressKafkaProducerControls');
+ var kafkaConsumerControls = require('../apps/kafkaConsumerControls');
+ var agentStubControls = require('../apps/agentStubControls');
+
  // Too many moving parts with Kafka involed. Increase the default timeout.
  // This is especially important since the Kafka client has an
  // exponential backoff implemented.

diff --git a/test/tracing/mongodb_test.js b/test/tracing/mongodb_test.js
@@ -5,8 +5,6 @@ var Promise = require('bluebird');
 var _ = require('lodash');
 
 var supportedVersion = require('../../src/tracing/index').supportedVersion;
-var expressMongodbControls = require('../apps/expressMongodbControls');
-var agentStubControls = require('../apps/agentStubControls');
 var config = require('../config');
 var utils = require('../utils');
 
@@ -15,6 +13,10 @@ describe('tracing/mongodb', function() {
  return;
  }
 
+ // controls require features that aren't available in early Node.js versions
+ var expressMongodbControls = require('../apps/expressMongodbControls');
+ var agentStubControls = require('../apps/agentStubControls');
+
  this.timeout(config.getTestTimeout());
 
  agentStubControls.registerTestHooks();

diff --git a/test/tracing/mongoose/test.js b/test/tracing/mongoose/test.js
@@ -4,15 +4,18 @@ var expect = require('chai').expect;
 var uuid = require('uuid/v4');
 
 var supportedVersion = require('../../../src/tracing/index').supportedVersion;
-var agentControls = require('../../apps/agentStubControls');
-var MongooseControls = require('./controls');
 var config = require('../../config');
 var utils = require('../../utils');
 
 describe('tracing/mongoose', function() {
  if (!supportedVersion(process.versions.node)) {
  return;
  }
+
+ // controls require features that aren't available in early Node.js versions
+ var agentControls = require('../../apps/agentStubControls');
+ var MongooseControls = require('./controls');
+
  this.timeout(config.getTestTimeout());
 
  agentControls.registerTestHooks();

diff --git a/test/tracing/mysql_test.js b/test/tracing/mysql_test.js
@@ -3,8 +3,6 @@
 var expect = require('chai').expect;
 
 var supportedVersion = require('../../src/tracing/index').supportedVersion;
-var expressMysqlControls = require('../apps/expressMysqlControls');
-var agentStubControls = require('../apps/agentStubControls');
 var config = require('../config');
 var utils = require('../utils');
 
@@ -13,6 +11,10 @@ describe('tracing/mysql', function() {
  return;
  }
 
+ // controls require features that aren't available in early Node.js versions
+ var expressMysqlControls = require('../apps/expressMysqlControls');
+ var agentStubControls = require('../apps/agentStubControls');
+
  this.timeout(config.getTestTimeout());
 
  agentStubControls.registerTestHooks();

diff --git a/test/tracing/opentracing/integration_test.js b/test/tracing/opentracing/integration_test.js
@@ -1,14 +1,21 @@
 'use strict';
 
 var expect = require('chai').expect;
+var semver = require('semver');
 
 var supportedVersion = require('../../../src/tracing/index').supportedVersion;
-var expressOpentracingControls = require('../../apps/expressOpentracingControls');
-var agentStubControls = require('../../apps/agentStubControls');
 var config = require('../../config');
 var utils = require('../../utils');
 
 describe('tracing/opentracing/integration', function() {
+ if (semver.satisfies(process.versions.node, '<4')) {
+ return;
+ }
+
+ // controls require features that aren't available in early Node.js versions
+ var agentStubControls = require('../../apps/agentStubControls');
+ var expressOpentracingControls = require('../../apps/expressOpentracingControls');
+
  this.timeout(config.getTestTimeout());
 
  agentStubControls.registerTestHooks();