Merge pull request #152 from pontusmelke/1.0-unsupported-configuration

Don't rely on unsupported configuration

Author: pontusmelke

driver/src/test/java/org/neo4j/driver/v1/integration/CredentialsIT.java

@@ -34,10 +34,9 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-
 import static org.neo4j.driver.v1.AuthTokens.basic;
-import static org.neo4j.driver.v1.Values.parameters;
 import static org.neo4j.driver.v1.Values.ofValue;
+import static org.neo4j.driver.v1.Values.parameters;
 
 public class CredentialsIT
 {
@@ -90,7 +89,7 @@ private void enableAuth( String password ) throws Exception
     {
         neo4j.restartServerOnEmptyDatabase( Neo4jSettings.DEFAULT
                 .updateWith( Neo4jSettings.AUTH_ENABLED, "true" )
-                .updateWith( Neo4jSettings.AUTH_FILE, tempDir.newFile( "auth" ).getAbsolutePath() ));
+                .updateWith( Neo4jSettings.DATA_DIR, tempDir.getRoot().getAbsolutePath() ));
 
         Driver setPassword = GraphDatabase.driver( neo4j.address(), new InternalAuthToken(
                 parameters(

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

@@ -21,6 +21,7 @@
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -41,12 +42,10 @@
 import org.neo4j.driver.v1.GraphDatabase;
 import org.neo4j.driver.v1.StatementResult;
 import org.neo4j.driver.v1.util.CertificateToolTest;
-import org.neo4j.driver.v1.util.Neo4jInstaller;
 import org.neo4j.driver.v1.util.Neo4jRunner;
 import org.neo4j.driver.v1.util.Neo4jSettings;
 import org.neo4j.driver.v1.util.TestNeo4j;
 
-import static java.io.File.createTempFile;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -60,6 +59,9 @@ public class TLSSocketChannelIT
     @Rule
     public TestNeo4j neo4j = new TestNeo4j();
 
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder(  );
+
     @BeforeClass
     public static void setup() throws IOException, InterruptedException
     {
@@ -94,31 +96,24 @@ private void performTLSHandshakeUsingKnownCerts( File knownCerts ) throws Throwa
         verify( logger, atLeastOnce() ).debug( "TLS connection closed" );
     }
 
-    private File tempFile(String prefix, String suffix) throws Throwable
-    {
-        File file = createTempFile( prefix, suffix );
-        file.deleteOnExit();
-        return file;
-    }
-
     @Test
     public void shouldPerformTLSHandshakeWithTrustedCert() throws Throwable
     {
         try
         {
             // Given
             // Create root certificate
-            File rootCert = tempFile( "temp_root_cert", ".cert" );
-            File rootKey = tempFile( "temp_root_key", ".key" );
+            File rootCert = folder.newFile( "temp_root_cert.cert" );
+            File rootKey = folder.newFile( "temp_root_key.key" );
 
             CertificateToolTest.SelfSignedCertificateGenerator
                     certGenerator = new CertificateToolTest.SelfSignedCertificateGenerator();
             certGenerator.saveSelfSignedCertificate( rootCert );
             certGenerator.savePrivateKey( rootKey );
 
             // Generate certificate signing request and get a certificate signed by the root private key
-            File cert = tempFile( "temp_cert", ".cert" );
-            File key = tempFile( "temp_key", ".key" );
+            File cert = folder.newFile( "temp_cert.cert" );
+            File key = folder.newFile( "temp_key.key" );
             CertificateToolTest.CertificateSigningRequestGenerator
                     csrGenerator = new CertificateToolTest.CertificateSigningRequestGenerator();
             X509Certificate signedCert = certGenerator.sign(
@@ -127,9 +122,7 @@ public void shouldPerformTLSHandshakeWithTrustedCert() throws Throwable
             CertificateTool.saveX509Cert( signedCert, cert );
 
             // Give the server certs to database
-            neo4j.restartServerOnEmptyDatabase(
-                    Neo4jSettings.DEFAULT
-                            .usingEncryptionKeyAndCert( key, cert ) );
+            neo4j.updateEncryptionKeyAndCert( key, cert );
 
             Logger logger = mock( Logger.class );
             SocketChannel channel = SocketChannel.open();
@@ -208,10 +201,10 @@ private void createFakeServerCertPairInKnownCerts( String host, int port, File k
     public void shouldFailTLSHandshakeDueToServerCertNotSignedByKnownCA() throws Throwable
     {
         // Given
+        neo4j.restartServerOnEmptyDatabase( Neo4jSettings.DEFAULT.updateWith( Neo4jSettings.CERT_DIR, folder.getRoot().getAbsolutePath() ) );
         SocketChannel channel = SocketChannel.open();
         channel.connect( new InetSocketAddress( "localhost", 7687 ) );
-        File trustedCertFile = File.createTempFile( "neo4j_trusted_cert", ".tmp" );
-        trustedCertFile.deleteOnExit();
+        File trustedCertFile = folder.newFile( "neo4j_trusted_cert.tmp" );
         X509Certificate aRandomCert = CertificateToolTest.generateSelfSignedCertificate();
         CertificateTool.saveX509Cert( aRandomCert, trustedCertFile );
 
@@ -249,7 +242,7 @@ public void shouldPerformTLSHandshakeWithTheSameTrustedServerCert() throws Throw
         // When
         TLSSocketChannel sslChannel = new TLSSocketChannel( "localhost", 7687, channel, logger,
                 Config.TrustStrategy.trustSignedBy(
-                        new File( Neo4jInstaller.neo4jHomeDir, "conf/ssl/snakeoil.cert") ) );
+                       Neo4jSettings.DEFAULT_TLS_CERT_FILE ) );
         sslChannel.close();
 
         // Then

driver/src/test/java/org/neo4j/driver/v1/tck/DriverComplianceIT.java

@@ -20,12 +20,12 @@
 
 import cucumber.api.CucumberOptions;
 import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 
-import java.io.File;
 import java.io.IOException;
 
-import org.neo4j.driver.v1.util.Neo4jSettings;
 import org.neo4j.driver.v1.util.TestNeo4j;
 
 /**
@@ -35,21 +35,13 @@
 @CucumberOptions( features = {"target/resources/features"}, strict=true, tags={"~@in_dev", "~@db"}, format = {"pretty"})
 public class DriverComplianceIT
 {
+    @Rule
+    TemporaryFolder folder = new TemporaryFolder(  );
+
     @ClassRule
     public static TestNeo4j neo4j = new TestNeo4j();
 
     public DriverComplianceIT() throws IOException
     {
     }
-
-    public static void updateEncryptionKeyAndCert( File key, File cert ) throws Exception
-    {
-        neo4j.restartServerOnEmptyDatabase(
-                Neo4jSettings.DEFAULT.usingEncryptionKeyAndCert( key, cert ) );
-    }
-
-    public static void useDefaultEncryptionKeyAndCert() throws Exception
-    {
-        neo4j.restartServerOnEmptyDatabase( Neo4jSettings.DEFAULT );
-    }
 }

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

@@ -31,8 +31,8 @@
 import org.neo4j.driver.v1.Config.EncryptionLevel;
 import org.neo4j.driver.v1.Driver;
 import org.neo4j.driver.v1.GraphDatabase;
-import org.neo4j.driver.v1.StatementResult;
 import org.neo4j.driver.v1.Session;
+import org.neo4j.driver.v1.StatementResult;
 import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.util.CertificateToolTest.CertificateSigningRequestGenerator;
 import org.neo4j.driver.v1.util.CertificateToolTest.SelfSignedCertificateGenerator;
@@ -48,8 +48,7 @@
 import static org.neo4j.driver.internal.util.CertificateTool.saveX509Cert;
 import static org.neo4j.driver.v1.Config.TrustStrategy.trustOnFirstUse;
 import static org.neo4j.driver.v1.Config.TrustStrategy.trustSignedBy;
-import static org.neo4j.driver.v1.tck.DriverComplianceIT.updateEncryptionKeyAndCert;
-import static org.neo4j.driver.v1.tck.DriverComplianceIT.useDefaultEncryptionKeyAndCert;
+import static org.neo4j.driver.v1.tck.DriverComplianceIT.neo4j;
 import static org.neo4j.driver.v1.util.CertificateToolTest.generateSelfSignedCertificate;
 
 public class DriverSecurityComplianceSteps
@@ -117,7 +116,7 @@ public void theDatabaseHasChangedWhichCertificateItUses() throws Throwable
         generator.saveSelfSignedCertificate( cert );
         generator.savePrivateKey( key );
 
-        updateEncryptionKeyAndCert( key, cert );
+        neo4j.updateEncryptionKeyAndCert( key, cert );
 
     }
 
@@ -211,7 +210,7 @@ public void aRunningNeo4jDatabaseUsingACertificateSignedByTheSameTrustedCertific
         csrGenerator.savePrivateKey( key );
         saveX509Cert( signedCert, cert );
 
-        updateEncryptionKeyAndCert( key, cert );
+        neo4j.updateEncryptionKeyAndCert( key, cert );
     }
 
     @When( "^I connect via a TLS-enabled transport$" )
@@ -269,7 +268,7 @@ public void clearAfterEachScenario() throws Throwable
     @After("@modifies_db_config")
     public void resetDbWithDefaultSettings() throws Throwable
     {
-        useDefaultEncryptionKeyAndCert();
+        neo4j.useDefaultEncryptionKeyAndCert();
     }
 
     private File tempFile(String prefix, String suffix) throws Throwable

driver/src/test/java/org/neo4j/driver/v1/util/Neo4jInstaller.java

@@ -18,12 +18,12 @@
  */
 package org.neo4j.driver.v1.util;
 
+import org.rauschig.jarchivelib.Archiver;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 
-import org.rauschig.jarchivelib.Archiver;
-
 import static org.neo4j.driver.v1.util.FileTools.extractTarball;
 import static org.neo4j.driver.v1.util.FileTools.streamFileTo;
 
@@ -49,7 +49,7 @@ public static boolean isWindows()
     public static final File neo4jDir = new File( "../target/neo4j" );
 
     public static final File neo4jHomeDir = new File( neo4jDir, version );
-    public static final File dbDir = new File( neo4jHomeDir, "data/graph.db" );
+    public static final File dbDir = new File( neo4jHomeDir, "data/databases/graph.db" );
 
     /**
      * download, untar/unzip

driver/src/test/java/org/neo4j/driver/v1/util/Neo4jSettings.java

@@ -27,22 +27,21 @@
 public class Neo4jSettings
 {
     public static final String AUTH_ENABLED = "dbms.security.auth_enabled";
-    public static final String AUTH_FILE = "unsupported.dbms.security.auth_store.location";
+    public static final String DATA_DIR = "dbms.directories.data";
+    public static final String CERT_DIR = "dbms.directories.certificates";
 
-    private static final String TLS_CERT_KEY = "dbms.security.tls_certificate_file";
-    private static final String TLS_KEY_KEY = "dbms.security.tls_key_file";
-
-    private static final String DEFAULT_TLS_CERT_PATH = "conf/ssl/snakeoil.cert";
-    private static final String DEFAULT_TLS_KEY_PATH = "conf/ssl/snakeoil.key";
+    private static final String DEFAULT_CERT_DIR = "certificates";
+    private static final String DEFAULT_TLS_CERT_PATH = DEFAULT_CERT_DIR + "/neo4j.cert";
+    private static final String DEFAULT_TLS_KEY_PATH = DEFAULT_CERT_DIR + "/neo4j.key";
 
+    public static final File DEFAULT_TLS_KEY_FILE = new File( Neo4jInstaller.neo4jHomeDir, DEFAULT_TLS_KEY_PATH );
     public static final File DEFAULT_TLS_CERT_FILE = new File( Neo4jInstaller.neo4jHomeDir, DEFAULT_TLS_CERT_PATH );
 
 
     private final Map<String, String> settings;
 
     public static Neo4jSettings DEFAULT = new Neo4jSettings( map(
-            TLS_CERT_KEY, DEFAULT_TLS_CERT_PATH,
-            TLS_KEY_KEY, DEFAULT_TLS_KEY_PATH,
+            CERT_DIR, DEFAULT_CERT_DIR,
             AUTH_ENABLED, "false" ) );
 
     private Neo4jSettings( Map<String, String> settings )
@@ -86,14 +85,6 @@ public boolean equals( Object o )
         return settings.equals( that.settings );
     }
 
-    public Neo4jSettings usingEncryptionKeyAndCert( File key, File cert )
-    {
-        return updateWith( map(
-                TLS_CERT_KEY, cert.getAbsolutePath().replaceAll("\\\\", "/"),
-                TLS_KEY_KEY, key.getAbsolutePath().replaceAll("\\\\", "/")
-        ));
-    }
-
     @Override
     public int hashCode()
     {

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

@@ -26,6 +26,8 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 
 import org.neo4j.driver.v1.Driver;
 import org.neo4j.driver.v1.Session;
@@ -102,4 +104,16 @@ public TestNeo4j withSettings( Neo4jSettings settings )
         this.settings = settings;
         return this;
     }
+
+    public void updateEncryptionKeyAndCert( File key, File cert ) throws Exception
+    {
+        Files.copy( key.toPath(), Neo4jSettings.DEFAULT_TLS_KEY_FILE.toPath(), StandardCopyOption.REPLACE_EXISTING );
+        Files.copy( cert.toPath(), Neo4jSettings.DEFAULT_TLS_CERT_FILE.toPath(), StandardCopyOption.REPLACE_EXISTING );
+        restartServerOnEmptyDatabase( Neo4jSettings.DEFAULT );
+    }
+
+    public void useDefaultEncryptionKeyAndCert() throws Exception
+    {
+        restartServerOnEmptyDatabase( Neo4jSettings.DEFAULT );
+    }
 }