Skip to content

Commit 1656cb4

Browse files
technigetechnige
committed
Default test runner should use auth
1 parent f64df75 commit 1656cb4

14 files changed

+43
-19
lines changed

‎driver/src/test/java/org/neo4j/driver/v1/integration/BookmarkIT.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.HashSet;
2727

2828
import org.neo4j.driver.v1.AccessMode;
29+
import org.neo4j.driver.v1.AuthTokens;
2930
import org.neo4j.driver.v1.Driver;
3031
import org.neo4j.driver.v1.GraphDatabase;
3132
import org.neo4j.driver.v1.Session;
@@ -34,6 +35,7 @@
3435
import org.neo4j.driver.v1.exceptions.ClientException;
3536
import org.neo4j.driver.v1.exceptions.TransientException;
3637
import org.neo4j.driver.v1.util.ServerVersion;
38+
import org.neo4j.driver.v1.util.TestNeo4j;
3739
import org.neo4j.driver.v1.util.TestNeo4jSession;
3840

3941
import static java.util.Arrays.asList;
@@ -73,8 +75,8 @@ public void assumeBookmarkSupport()
7375
public void shouldConnectIPv6Uri()
7476
{
7577
// Given
76-
try( Driver driver = GraphDatabase.driver( "bolt://[::1]:7687" );
77-
Session session = driver.session() )
78+
try(Driver driver = GraphDatabase.driver( "bolt://[::1]:7687", AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD) );
79+
Session session = driver.session() )
7880
{
7981
// When
8082
StatementResult result = session.run( "RETURN 1" );

‎driver/src/test/java/org/neo4j/driver/v1/integration/ConnectionHandlingIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public class ConnectionHandlingIT
8080
public void createDriver()
8181
{
8282
DriverFactoryWithConnector driverFactory = new DriverFactoryWithConnector();
83-
AuthToken auth = AuthTokens.none();
83+
AuthToken auth = neo4j.authToken();
8484
RoutingSettings routingSettings = new RoutingSettings( 1, 1 );
8585
RetrySettings retrySettings = RetrySettings.DEFAULT;
8686
driver = driverFactory.newInstance( neo4j.uri(), auth, routingSettings, retrySettings, defaultConfig() );

‎driver/src/test/java/org/neo4j/driver/v1/integration/DriverCloseIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import org.neo4j.driver.internal.logging.ConsoleLogging;
3232
import org.neo4j.driver.v1.AccessMode;
33+
import org.neo4j.driver.v1.AuthTokens;
3334
import org.neo4j.driver.v1.Config;
3435
import org.neo4j.driver.v1.Driver;
3536
import org.neo4j.driver.v1.GraphDatabase;
@@ -123,7 +124,7 @@ public static class DirectDriverCloseIT extends DriverCloseITBase
123124
@Override
124125
protected Driver createDriver()
125126
{
126-
return GraphDatabase.driver( neo4j.uri() );
127+
return GraphDatabase.driver( neo4j.uri(), neo4j.authToken() );
127128
}
128129

129130
@Test
@@ -173,7 +174,7 @@ protected Driver createDriver()
173174
.withLogging( new ConsoleLogging( Level.OFF ) )
174175
.toConfig();
175176

176-
return GraphDatabase.driver( "bolt+routing://127.0.0.1:9001", config );
177+
return GraphDatabase.driver( "bolt+routing://127.0.0.1:9001", AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), config );
177178
}
178179

179180
@Test

‎driver/src/test/java/org/neo4j/driver/v1/integration/EncryptionIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class EncryptionIT
3737
public void shouldOperateWithNoEncryption() throws Exception
3838
{
3939
// Given
40-
Driver driver = GraphDatabase.driver( neo4j.uri(), Config.build().withEncryptionLevel( NONE ).toConfig() );
40+
Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), Config.build().withEncryptionLevel( NONE ).toConfig() );
4141

4242
// Then
4343
assertThat( driver.isEncrypted(), equalTo( false ) );
@@ -60,7 +60,7 @@ public void shouldOperateWithNoEncryption() throws Exception
6060
public void shouldOperateWithRequiredEncryption() throws Exception
6161
{
6262
// Given
63-
Driver driver = GraphDatabase.driver( neo4j.uri(), Config.build().withEncryptionLevel( REQUIRED ).toConfig() );
63+
Driver driver = GraphDatabase.driver( neo4j.uri(), neo4j.authToken(), Config.build().withEncryptionLevel( REQUIRED ).toConfig() );
6464

6565
// Then
6666
assertThat( driver.isEncrypted(), equalTo( true ) );

‎driver/src/test/java/org/neo4j/driver/v1/integration/LoadCSVIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import java.io.IOException;
2525

26+
import org.neo4j.driver.v1.AuthTokens;
2627
import org.neo4j.driver.v1.Driver;
2728
import org.neo4j.driver.v1.GraphDatabase;
2829
import org.neo4j.driver.v1.Session;
@@ -43,8 +44,8 @@ public class LoadCSVIT
4344
@Test
4445
public void shouldLoadCSV() throws Throwable
4546
{
46-
try( Driver driver = GraphDatabase.driver( neo4j.uri() );
47-
Session session = driver.session() )
47+
try( Driver driver = GraphDatabase.driver( neo4j.uri(), AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD) );
48+
Session session = driver.session() )
4849
{
4950
String csvFileUrl = createLocalIrisData( session );
5051

‎driver/src/test/java/org/neo4j/driver/v1/integration/LoggingIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import java.net.URI;
2525

26+
import org.neo4j.driver.v1.AuthTokens;
2627
import org.neo4j.driver.v1.Config;
2728
import org.neo4j.driver.v1.Driver;
2829
import org.neo4j.driver.v1.GraphDatabase;
@@ -52,6 +53,7 @@ public void logShouldRecordDebugAndTraceInfo() throws Exception
5253

5354
try( Driver driver = GraphDatabase.driver(
5455
Neo4jRunner.DEFAULT_URI,
56+
AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD),
5557
Config.build().withLogging( logging ).toConfig() ) )
5658
{
5759
// When

‎driver/src/test/java/org/neo4j/driver/v1/integration/ServerKilledIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void shouldRecoverFromServerRestart() throws Throwable
8181
// config with sessionLivenessCheckTimeout not set, i.e. turned off
8282
Config config = Config.build().withEncryptionLevel( encryptionLevel ).toConfig();
8383

84-
try ( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, config ) )
84+
try ( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), config ) )
8585
{
8686
acquireAndReleaseConnections( 4, driver );
8787

@@ -158,7 +158,7 @@ private static void acquireAndReleaseConnections( int count, Driver driver )
158158
private static Driver createDriver( Clock clock, Config config )
159159
{
160160
DriverFactory factory = new DriverFactoryWithClock( clock );
161-
AuthToken auth = AuthTokens.none();
161+
AuthToken auth = AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD);
162162
RoutingSettings routingSettings = new RoutingSettings( 1, 1 );
163163
RetrySettings retrySettings = RetrySettings.DEFAULT;
164164
return factory.newInstance( Neo4jRunner.DEFAULT_URI, auth, routingSettings, retrySettings, config );

‎driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,13 +1341,13 @@ private Driver newDriverWithFixedRetries( int maxRetriesCount )
13411341
{
13421342
DriverFactory driverFactory = new DriverFactoryWithFixedRetryLogic( maxRetriesCount );
13431343
RoutingSettings routingConf = new RoutingSettings( 1, 1 );
1344-
AuthToken auth = AuthTokens.none();
1344+
AuthToken auth = AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD);
13451345
return driverFactory.newInstance( neo4j.uri(), auth, routingConf, RetrySettings.DEFAULT, noLoggingConfig() );
13461346
}
13471347

13481348
private Driver newDriver()
13491349
{
1350-
return GraphDatabase.driver( neo4j.uri(), noLoggingConfig() );
1350+
return GraphDatabase.driver( neo4j.uri(), AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), noLoggingConfig() );
13511351
}
13521352

13531353
private Driver newDriverWithLimitedRetries( int maxTxRetryTime, TimeUnit unit )
@@ -1356,7 +1356,7 @@ private Driver newDriverWithLimitedRetries( int maxTxRetryTime, TimeUnit unit )
13561356
.withLogging( DevNullLogging.DEV_NULL_LOGGING )
13571357
.withMaxTransactionRetryTime( maxTxRetryTime, unit )
13581358
.toConfig();
1359-
return GraphDatabase.driver( neo4j.uri(), config );
1359+
return GraphDatabase.driver( neo4j.uri(), AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), config );
13601360
}
13611361

13621362
private static Config noLoggingConfig()

‎driver/src/test/java/org/neo4j/driver/v1/integration/TLSSocketChannelIT.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.neo4j.driver.internal.security.SecurityPlan;
3636
import org.neo4j.driver.internal.security.TLSSocketChannel;
3737
import org.neo4j.driver.internal.util.CertificateTool;
38+
import org.neo4j.driver.v1.AuthTokens;
3839
import org.neo4j.driver.v1.Config;
3940
import org.neo4j.driver.v1.Driver;
4041
import org.neo4j.driver.v1.GraphDatabase;
@@ -300,7 +301,7 @@ public void shouldEstablishTLSConnection() throws Throwable
300301

301302
Config config = Config.build().withEncryptionLevel( Config.EncryptionLevel.REQUIRED ).toConfig();
302303

303-
try( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, config );
304+
try( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), config );
304305
Session session = driver.session() )
305306
{
306307
StatementResult result = session.run( "RETURN 1" );
@@ -328,8 +329,8 @@ public void shouldWarnIfUsingDeprecatedTLSOption() throws Throwable
328329
.toConfig();
329330

330331
// When
331-
try ( Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, config );
332-
Session session = driver.session() )
332+
try (Driver driver = GraphDatabase.driver( Neo4jRunner.DEFAULT_URI, AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD), config );
333+
Session session = driver.session() )
333334
{
334335
session.run( "RETURN 1" ).consume();
335336
}

‎driver/src/test/java/org/neo4j/driver/v1/stress/SessionPoolingStressIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.concurrent.atomic.AtomicBoolean;
3333
import java.util.concurrent.atomic.AtomicReference;
3434

35+
import org.neo4j.driver.v1.AuthTokens;
3536
import org.neo4j.driver.v1.Config;
3637
import org.neo4j.driver.v1.Driver;
3738
import org.neo4j.driver.v1.Session;
@@ -83,7 +84,7 @@ public void shouldWorkFine() throws Throwable
8384
.withEncryptionLevel( Config.EncryptionLevel.NONE )
8485
.toConfig();
8586

86-
driver = driver( neo4j.uri(), config );
87+
driver = driver( neo4j.uri(), neo4j.authToken(), config );
8788

8889
AtomicBoolean stop = new AtomicBoolean();
8990
AtomicReference<Throwable> failureReference = new AtomicReference<>();

‎driver/src/test/java/org/neo4j/driver/v1/tck/DriverSecurityComplianceSteps.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.io.File;
2828
import java.security.cert.X509Certificate;
2929

30+
import org.neo4j.driver.v1.AuthTokens;
3031
import org.neo4j.driver.v1.Config;
3132
import org.neo4j.driver.v1.Config.EncryptionLevel;
3233
import org.neo4j.driver.v1.Driver;
@@ -37,6 +38,7 @@
3738
import org.neo4j.driver.v1.util.CertificateToolTest.CertificateSigningRequestGenerator;
3839
import org.neo4j.driver.v1.util.CertificateToolTest.SelfSignedCertificateGenerator;
3940
import org.neo4j.driver.v1.util.Neo4jRunner;
41+
import org.neo4j.driver.v1.util.TestNeo4j;
4042

4143
import static java.io.File.createTempFile;
4244
import static org.hamcrest.CoreMatchers.containsString;
@@ -72,6 +74,7 @@ public void firstUseConnect() throws Throwable
7274
knownHostsFile = tempFile( "known_hosts", ".tmp" );
7375
driver = GraphDatabase.driver(
7476
Neo4jRunner.DEFAULT_URI,
77+
Neo4jRunner.DEFAULT_AUTH_TOKEN,
7578
Config.build().withEncryptionLevel( EncryptionLevel.REQUIRED )
7679
.withTrustStrategy( trustOnFirstUse( knownHostsFile ) ).toConfig() );
7780

@@ -101,6 +104,7 @@ public void iConnectViaATlsEnabledTransportAgain() throws Throwable
101104
{
102105
driver = GraphDatabase.driver(
103106
Neo4jRunner.DEFAULT_URI,
107+
AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD),
104108
Config.build().withEncryptionLevel( EncryptionLevel.REQUIRED )
105109
.withTrustStrategy( trustOnFirstUse( knownHostsFile ) ).toConfig() );
106110
}
@@ -166,6 +170,7 @@ public void twoDriversWithDifferentKnownHostsFiles() throws Throwable
166170
File tempFile = tempFile( "known_hosts", ".tmp" );
167171
driverKitten = GraphDatabase.driver(
168172
Neo4jRunner.DEFAULT_URI,
173+
AuthTokens.basic(TestNeo4j.USER, TestNeo4j.PASSWORD),
169174
Config.build().withEncryptionLevel( EncryptionLevel.REQUIRED )
170175
.withTrustStrategy( trustOnFirstUse( tempFile ) ).toConfig() );
171176
}

‎driver/src/test/java/org/neo4j/driver/v1/util/Neo4jRunner.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.Map;
2929

3030
import org.neo4j.driver.internal.net.BoltServerAddress;
31+
import org.neo4j.driver.v1.AuthToken;
3132
import org.neo4j.driver.v1.Driver;
3233
import org.neo4j.driver.v1.GraphDatabase;
3334

@@ -53,6 +54,7 @@ public class Neo4jRunner
5354
private static final String DEFAULT_NEOCTRL_ARGS = "-e 3.1.2";
5455
public static final String NEOCTRL_ARGS = System.getProperty( "neoctrl.args", DEFAULT_NEOCTRL_ARGS );
5556
public static final URI DEFAULT_URI = URI.create( "bolt://localhost:7687" );
57+
public static final AuthToken DEFAULT_AUTH_TOKEN = basic(TestNeo4j.USER, TestNeo4j.PASSWORD);
5658
public static final BoltServerAddress DEFAULT_ADDRESS = BoltServerAddress.from( DEFAULT_URI );
5759
private Driver driver;
5860
private Neo4jSettings currentSettings = Neo4jSettings.TEST_SETTINGS;
@@ -105,7 +107,7 @@ public Driver driver()
105107
{
106108
if ( driver == null )
107109
{
108-
driver = GraphDatabase.driver( DEFAULT_URI, basic(TestNeo4j.USER, TestNeo4j.PASSWORD) );
110+
driver = GraphDatabase.driver( DEFAULT_URI, DEFAULT_AUTH_TOKEN );
109111
}
110112
return driver;
111113
}

‎driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4j.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@
2929
import java.net.URL;
3030

3131
import org.neo4j.driver.internal.net.BoltServerAddress;
32+
import org.neo4j.driver.v1.AuthToken;
33+
import org.neo4j.driver.v1.AuthTokens;
3234
import org.neo4j.driver.v1.Driver;
3335
import org.neo4j.driver.v1.Session;
3436

37+
import static org.neo4j.driver.v1.AuthTokens.basic;
3538
import static org.neo4j.driver.v1.util.Neo4jRunner.*;
3639
import static org.neo4j.driver.v1.util.Neo4jSettings.DEFAULT_TLS_CERT_PATH;
3740
import static org.neo4j.driver.v1.util.Neo4jSettings.DEFAULT_TLS_KEY_PATH;
@@ -109,6 +112,11 @@ public URI uri()
109112
return DEFAULT_URI;
110113
}
111114

115+
public AuthToken authToken()
116+
{
117+
return AuthTokens.basic(USER, PASSWORD);
118+
}
119+
112120
public BoltServerAddress address()
113121
{
114122
return DEFAULT_ADDRESS;

‎driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterRule.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.neo4j.driver.v1.AuthTokens;
2828
import org.neo4j.driver.v1.util.Neo4jRunner;
2929
import org.neo4j.driver.v1.util.ServerVersion;
30+
import org.neo4j.driver.v1.util.TestNeo4j;
3031

3132
import static org.junit.Assume.assumeTrue;
3233
import static org.neo4j.driver.v1.util.Neo4jRunner.TARGET_DIR;

0 commit comments

Comments
 (0)