Move getIdentityKeyFingerprint to DirectoryAuthority

bisq-network · Jul 7, 2023 · 5d9eb10 · 5d9eb10
1 parent 6b19427
commit 5d9eb10
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 84 deletions.
diff --git a/...src/integrationTest/java/bisq/tor/local_network/DirectoryAuthorityKeyGenerationTests.java b/...src/integrationTest/java/bisq/tor/local_network/DirectoryAuthorityKeyGenerationTests.java
@@ -19,8 +19,6 @@
 
 import bisq.tor.local_network.da.DirectoryAuthority;
 import bisq.tor.local_network.da.keygen.process.DirectoryAuthorityKeyGenerator;
-import bisq.tor.local_network.da.keygen.process.DirectoryIdentityKeyGenProcess;
-import bisq.tor.local_network.da.keygen.RelayKeyGenProcess;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
@@ -37,19 +35,16 @@ public void generateKeys(@TempDir Path dataDir) throws IOException, InterruptedE
         assertThat(keysPath.toFile().mkdirs())
                 .isTrue();
 
-        var torDAKeyGenProcess = new DirectoryIdentityKeyGenProcess(keysPath, "127.0.0.1:8080");
-
         var directoryAuthority = DirectoryAuthority.builder()
                 .nickname("Nick")
                 .dataDir(dataDir)
                 .controlPort(1)
                 .orPort(2)
                 .dirPort(3)
                 .build();
-        RelayKeyGenProcess relayKeyGenProcess = new RelayKeyGenProcess(directoryAuthority);
 
-        var directoryAuthorityKeyGenerator = new DirectoryAuthorityKeyGenerator(torDAKeyGenProcess, relayKeyGenProcess);
-        directoryAuthorityKeyGenerator.generate("my_passphrase");
+        var directoryAuthorityKeyGenerator = new DirectoryAuthorityKeyGenerator();
+        directoryAuthorityKeyGenerator.generate(directoryAuthority, "my_passphrase");
 
         File dataDirFile = dataDir.toFile();
         assertThat(new File(dataDirFile, "fingerprint"))

diff --git a/network/tor-local-network/src/main/java/bisq/tor/local_network/da/DirectoryAuthority.java b/network/tor-local-network/src/main/java/bisq/tor/local_network/da/DirectoryAuthority.java
@@ -17,12 +17,16 @@
 
 package bisq.tor.local_network.da;
 
+import bisq.tor.local_network.KeyFingerprintReader;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.File;
 import java.nio.file.Path;
 import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
 
 @Getter
 public class DirectoryAuthority {
@@ -36,7 +40,8 @@ public class DirectoryAuthority {
 
     private final String exitPolicy = "ExitPolicy accept *:*";
 
-    @Setter
+    private final Path keysPath;
+
     private Optional<String> identityKeyFingerprint = Optional.empty();
     @Setter
     private Optional<String> relayKeyFingerprint = Optional.empty();
@@ -48,9 +53,24 @@ public DirectoryAuthority(String nickname, Path dataDir, int controlPort, int or
         this.controlPort = controlPort;
         this.orPort = orPort;
         this.dirPort = dirPort;
+        this.keysPath = dataDir.resolve("keys");
     }
 
     public Path getTorrcPath() {
         return dataDir.resolve("torrc");
     }
+
+    public Optional<String> getIdentityKeyFingerprint() {
+        if (identityKeyFingerprint.isPresent()) {
+            return identityKeyFingerprint;
+        }
+
+        File certificateFile = new File(keysPath.toFile(), "authority_certificate");
+        Predicate<String> lineMatcher = s -> s.startsWith("fingerprint ");
+        UnaryOperator<String> dataExtractor = s -> s.split(" ")[1].strip();
+
+        var keyFingerprintReader = new KeyFingerprintReader(certificateFile, lineMatcher, dataExtractor);
+        identityKeyFingerprint = keyFingerprintReader.read();
+        return identityKeyFingerprint;
+    }
 }
diff --git a/.../tor-local-network/src/main/java/bisq/tor/local_network/da/DirectoryAuthorityFactory.java b/.../tor-local-network/src/main/java/bisq/tor/local_network/da/DirectoryAuthorityFactory.java
@@ -18,8 +18,6 @@
 package bisq.tor.local_network.da;
 
 import bisq.tor.local_network.da.keygen.process.DirectoryAuthorityKeyGenerator;
-import bisq.tor.local_network.da.keygen.process.DirectoryIdentityKeyGenProcess;
-import bisq.tor.local_network.da.keygen.RelayKeyGenProcess;
 import lombok.Getter;
 
 import java.io.File;
@@ -44,16 +42,9 @@ public void createDirectoryAuthority(DirectoryAuthority directoryAuthority,
             throw new IllegalStateException("Couldn't create keys folder in data directory for directory authority.");
         }
 
-        var relayKeyGenProcess = new RelayKeyGenProcess(directoryAuthority);
-        String firstDirectoryAuthorityAddress = "127.0.0.1:" + directoryAuthority.getDirPort();
-        var torDAKeyGenProcess = new DirectoryIdentityKeyGenProcess(keysPath, firstDirectoryAuthorityAddress);
+        var directoryAuthorityKeyGenerator = new DirectoryAuthorityKeyGenerator();
+        directoryAuthorityKeyGenerator.generate(directoryAuthority, passphrase);
 
-        var directoryAuthorityKeyGenerator = new DirectoryAuthorityKeyGenerator(torDAKeyGenProcess, relayKeyGenProcess);
-        directoryAuthorityKeyGenerator.generate(passphrase);
-
-        directoryAuthority.setIdentityKeyFingerprint(
-                directoryAuthorityKeyGenerator.getIdentityKeyFingerprint()
-        );
         directoryAuthority.setRelayKeyFingerprint(
                 directoryAuthorityKeyGenerator.getRelayKeyFingerprint()
         );

diff --git a/...rc/main/java/bisq/tor/local_network/da/keygen/process/DirectoryAuthorityKeyGenerator.java b/...rc/main/java/bisq/tor/local_network/da/keygen/process/DirectoryAuthorityKeyGenerator.java
@@ -17,6 +17,7 @@
 
 package bisq.tor.local_network.da.keygen.process;
 
+import bisq.tor.local_network.da.DirectoryAuthority;
 import bisq.tor.local_network.da.keygen.RelayKeyGenProcess;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -26,25 +27,21 @@
 
 @Slf4j
 public class DirectoryAuthorityKeyGenerator {
-    private final DirectoryIdentityKeyGenProcess identityKeyGenProcess;
-    private final RelayKeyGenProcess relayKeyGenProcess;
-
-    @Getter
-    private Optional<String> identityKeyFingerprint = Optional.empty();
     @Getter
     private Optional<String> relayKeyFingerprint = Optional.empty();
 
-    public DirectoryAuthorityKeyGenerator(DirectoryIdentityKeyGenProcess identityKeyGenProcess,
-                                          RelayKeyGenProcess relayKeyGenProcess) {
-        this.identityKeyGenProcess = identityKeyGenProcess;
-        this.relayKeyGenProcess = relayKeyGenProcess;
-    }
+    public void generate(DirectoryAuthority directoryAuthority, String passphrase) throws IOException, InterruptedException {
+        var identityKeyGenProcess = new DirectoryIdentityKeyGenProcess(
+                directoryAuthority.getKeysPath(),
+                "127.0.0.1:" + directoryAuthority.getDirPort()
+        );
+        identityKeyGenProcess.generateKeys(passphrase);
 
-    public void generate(String passphrase) throws IOException, InterruptedException {
-        String identityKeyFingerprint = identityKeyGenProcess.generateKeys(passphrase);
-        this.identityKeyFingerprint = Optional.of(identityKeyFingerprint);
+        String identityKeyFingerprint = directoryAuthority.getIdentityKeyFingerprint().orElseThrow();
 
+        var relayKeyGenProcess = new RelayKeyGenProcess(directoryAuthority);
         String relayKeyFingerprint = relayKeyGenProcess.generateKeys(identityKeyFingerprint);
+
         this.relayKeyFingerprint = Optional.of(relayKeyFingerprint);
     }
 }
diff --git a/...rc/main/java/bisq/tor/local_network/da/keygen/process/DirectoryIdentityKeyGenProcess.java b/...rc/main/java/bisq/tor/local_network/da/keygen/process/DirectoryIdentityKeyGenProcess.java
@@ -18,18 +18,14 @@
 package bisq.tor.local_network.da.keygen.process;
 
 import bisq.tor.local_network.InputStreamWaiter;
-import bisq.tor.local_network.KeyFingerprintReader;
 import lombok.extern.slf4j.Slf4j;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
 
 @Slf4j
 public class DirectoryIdentityKeyGenProcess {
@@ -44,7 +40,7 @@ public DirectoryIdentityKeyGenProcess(Path torKeyDirPath, String directoryAddres
         this.directoryAddress = directoryAddress;
     }
 
-    public String generateKeys(String passphrase) throws IOException, InterruptedException {
+    public void generateKeys(String passphrase) throws IOException, InterruptedException {
         Process process = createAndStartKeygenProcess();
         InputStream inputStream = process.getInputStream();
         OutputStream outputStream = process.getOutputStream();
@@ -57,12 +53,7 @@ public String generateKeys(String passphrase) throws IOException, InterruptedExc
         inputStreamWaiter.waitForString(PEM_VERIFY_PASSPHRASE_PROMPT);
         enterPassphrase(outputStream, passphrase);
 
-        return getKeyFingerprint(process);
-    }
-
-    public String getKeyFingerprint(Process process) throws InterruptedException {
         process.waitFor(1, TimeUnit.MINUTES);
-        return readKeyFingerprint();
     }
 
     private Process createAndStartKeygenProcess() throws IOException {
@@ -78,14 +69,4 @@ private void enterPassphrase(OutputStream outputStream, String passphrase) throw
         outputStream.write(passphraseWithNewLine.getBytes(StandardCharsets.UTF_8));
         outputStream.flush();
     }
-
-    private String readKeyFingerprint() {
-        File certificateFile = new File(torKeyDirPath.toFile(), "authority_certificate");
-
-        Predicate<String> lineMatcher = s -> s.startsWith("fingerprint ");
-        UnaryOperator<String> dataExtractor = s -> s.split(" ")[1].strip();
-
-        var keyFingerprintReader = new KeyFingerprintReader(certificateFile, lineMatcher, dataExtractor);
-        return keyFingerprintReader.read().orElseThrow();
-    }
 }
diff --git a/...l-network/src/test/java/bisq/tor/local_network/DirectoryAuthorityTorrcGeneratorTests.java b/...l-network/src/test/java/bisq/tor/local_network/DirectoryAuthorityTorrcGeneratorTests.java
@@ -29,37 +29,49 @@
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
 
 public class DirectoryAuthorityTorrcGeneratorTests {
     @Test
     void basicTest(@TempDir Path tempDir) throws IOException {
         Path daAPath = tempDir.resolve("DA_A");
         assertThat(daAPath.toFile().mkdir()).isTrue();
 
-        DirectoryAuthority firstDirAuth = DirectoryAuthority.builder()
-                .nickname("A")
-                .dataDir(daAPath)
+        DirectoryAuthority firstDirAuth = spy(
+                DirectoryAuthority.builder()
+                        .nickname("A")
+                        .dataDir(daAPath)
 
-                .controlPort(1)
-                .orPort(2)
-                .dirPort(3)
+                        .controlPort(1)
+                        .orPort(2)
+                        .dirPort(3)
 
-                .build();
+                        .build()
+        );
+
+        doReturn(Optional.of("AAAA_fp"))
+                .when(firstDirAuth)
+                .getIdentityKeyFingerprint();
 
-        firstDirAuth.setIdentityKeyFingerprint(Optional.of("AAAA_fp"));
         firstDirAuth.setRelayKeyFingerprint(Optional.of("AAAA_v3"));
 
-        DirectoryAuthority secondDirAuth = DirectoryAuthority.builder()
-                .nickname("B")
-                .dataDir(tempDir.resolve("DA_B"))
+        DirectoryAuthority secondDirAuth = spy(
+                DirectoryAuthority.builder()
+                        .nickname("B")
+                        .dataDir(tempDir.resolve("DA_B"))
+
+                        .controlPort(1)
+                        .orPort(2)
+                        .dirPort(3)
 
-                .controlPort(1)
-                .orPort(2)
-                .dirPort(3)
+                        .build()
+        );
 
-                .build();
+        doReturn(Optional.of("BBBB_fp"))
+                .when(secondDirAuth)
+                .getIdentityKeyFingerprint();
 
-        secondDirAuth.setIdentityKeyFingerprint(Optional.of("BBBB_fp"));
         secondDirAuth.setRelayKeyFingerprint(Optional.of("BBBB_v3"));
 
         var torDaTorrcGenerator = new DirectoryAuthorityTorrcGenerator(firstDirAuth);

diff --git a/network/tor-local-network/src/test/java/bisq/tor/local_network/RelayTorrcGeneratorTests.java b/network/tor-local-network/src/test/java/bisq/tor/local_network/RelayTorrcGeneratorTests.java
@@ -29,37 +29,49 @@
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
 
 public class RelayTorrcGeneratorTests {
     @Test
     void basicTest(@TempDir Path tempDir) throws IOException {
         Path daAPath = tempDir.resolve("DA_A");
         assertThat(daAPath.toFile().mkdir()).isTrue();
 
-        DirectoryAuthority firstDirAuth = DirectoryAuthority.builder()
-                .nickname("A")
-                .dataDir(daAPath)
+        DirectoryAuthority firstDirAuth = spy(
+                DirectoryAuthority.builder()
+                        .nickname("A")
+                        .dataDir(daAPath)
 
-                .controlPort(1)
-                .orPort(2)
-                .dirPort(3)
+                        .controlPort(1)
+                        .orPort(2)
+                        .dirPort(3)
 
-                .build();
+                        .build()
+        );
+
+        doReturn(Optional.of("AAAA_fp"))
+                .when(firstDirAuth)
+                .getIdentityKeyFingerprint();
 
-        firstDirAuth.setIdentityKeyFingerprint(Optional.of("AAAA_fp"));
         firstDirAuth.setRelayKeyFingerprint(Optional.of("AAAA_v3"));
 
-        DirectoryAuthority secondDirAuth = DirectoryAuthority.builder()
-                .nickname("B")
-                .dataDir(tempDir.resolve("DA_B"))
+        DirectoryAuthority secondDirAuth = spy(
+                DirectoryAuthority.builder()
+                        .nickname("B")
+                        .dataDir(tempDir.resolve("DA_B"))
+
+                        .controlPort(1)
+                        .orPort(2)
+                        .dirPort(3)
 
-                .controlPort(1)
-                .orPort(2)
-                .dirPort(3)
+                        .build()
+        );
 
-                .build();
+        doReturn(Optional.of("BBBB_fp"))
+                .when(secondDirAuth)
+                .getIdentityKeyFingerprint();
 
-        secondDirAuth.setIdentityKeyFingerprint(Optional.of("BBBB_fp"));
         secondDirAuth.setRelayKeyFingerprint(Optional.of("BBBB_v3"));
 
         var relayTorrcGenerator = new RelayTorrcGenerator(firstDirAuth);