From 385d2ca3ca80386c919964ca96ef3e828b6d5de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Barc=C3=A9los?= Date: Thu, 10 Mar 2022 12:41:15 -0300 Subject: [PATCH 1/2] stress-tests: Check if ssl-scheme is not set before setting it in the params (#895) This changes enables run `stress-tests` to clusters with self-signed certificates. --- packages/neo4j-driver/test/stress-test.js | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/packages/neo4j-driver/test/stress-test.js b/packages/neo4j-driver/test/stress-test.js index 4da7f9c97..b93c9e402 100644 --- a/packages/neo4j-driver/test/stress-test.js +++ b/packages/neo4j-driver/test/stress-test.js @@ -65,8 +65,11 @@ export default async function execute () { const LOGGING_ENABLED = fromEnvOrDefault('STRESS_TEST_LOGGING_ENABLED', false) const config = { - logging: neo4j.logging.console(LOGGING_ENABLED ? 'debug' : 'info'), - encrypted: isRemoteCluster() + logging: neo4j.logging.console(LOGGING_ENABLED ? 'debug' : 'info') + } + + if (isSslSchemeNotSet()) { + config.encrypted = isRemoteCluster() } const driver = neo4j.driver( @@ -134,6 +137,21 @@ function isRemoteCluster () { return fromEnvOrDefault('STRESS_TEST_DATABASE_URI') !== undefined } +function isSslSchemeNotSet (uri) { + function extractScheme (scheme) { + if (scheme) { + scheme = scheme.trim() + if (scheme.charAt(scheme.length - 1) === ':') { + scheme = scheme.substring(0, scheme.length - 1) + } + return scheme + } + return null + } + const scheme = extractScheme(uri) + return scheme === null || scheme === 'bolt' || scheme === 'neo4j' +} + function isCluster () { return sharedNeo4j.cluster || isRemoteCluster() } From 2c3b8ee63bee629d20dceea2f94d035ec7fdc075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Barc=C3=A9los?= Date: Fri, 11 Mar 2022 06:39:52 -0300 Subject: [PATCH 2/2] stress-test: fix scheme check (#898) --- packages/neo4j-driver/test/stress-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/neo4j-driver/test/stress-test.js b/packages/neo4j-driver/test/stress-test.js index b93c9e402..06ad8aa92 100644 --- a/packages/neo4j-driver/test/stress-test.js +++ b/packages/neo4j-driver/test/stress-test.js @@ -68,7 +68,7 @@ export default async function execute () { logging: neo4j.logging.console(LOGGING_ENABLED ? 'debug' : 'info') } - if (isSslSchemeNotSet()) { + if (isSslSchemeNotSet(DATABASE_URI)) { config.encrypted = isRemoteCluster() }