Skip to content

Commit 385d2ca

Browse files
committed
stress-tests: Check if ssl-scheme is not set before setting it in the params (neo4j#895)
This changes enables run `stress-tests` to clusters with self-signed certificates.
1 parent 4080b19 commit 385d2ca

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

packages/neo4j-driver/test/stress-test.js

+20-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,11 @@ export default async function execute () {
6565
const LOGGING_ENABLED = fromEnvOrDefault('STRESS_TEST_LOGGING_ENABLED', false)
6666

6767
const config = {
68-
logging: neo4j.logging.console(LOGGING_ENABLED ? 'debug' : 'info'),
69-
encrypted: isRemoteCluster()
68+
logging: neo4j.logging.console(LOGGING_ENABLED ? 'debug' : 'info')
69+
}
70+
71+
if (isSslSchemeNotSet()) {
72+
config.encrypted = isRemoteCluster()
7073
}
7174

7275
const driver = neo4j.driver(
@@ -134,6 +137,21 @@ function isRemoteCluster () {
134137
return fromEnvOrDefault('STRESS_TEST_DATABASE_URI') !== undefined
135138
}
136139

140+
function isSslSchemeNotSet (uri) {
141+
function extractScheme (scheme) {
142+
if (scheme) {
143+
scheme = scheme.trim()
144+
if (scheme.charAt(scheme.length - 1) === ':') {
145+
scheme = scheme.substring(0, scheme.length - 1)
146+
}
147+
return scheme
148+
}
149+
return null
150+
}
151+
const scheme = extractScheme(uri)
152+
return scheme === null || scheme === 'bolt' || scheme === 'neo4j'
153+
}
154+
137155
function isCluster () {
138156
return sharedNeo4j.cluster || isRemoteCluster()
139157
}

0 commit comments

Comments
 (0)