Skip to content

stress-tests: Check if ssl-scheme is not set before setting it in the params #895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 10, 2022
Merged

stress-tests: Check if ssl-scheme is not set before setting it in the params #895

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions packages/neo4j-driver/test/stress-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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()
}
Expand Down