feat: Expose function to calculate private address from public keys

relaycorp · Aug 6, 2020 · 90ed9fe · 90ed9fe
1 parent bf26960
commit 90ed9fe
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/src/main/kotlin/tech/relaycorp/relaynet/pki.kt b/src/main/kotlin/tech/relaycorp/relaynet/pki.kt
@@ -2,6 +2,7 @@
 
 package tech.relaycorp.relaynet
 
+import tech.relaycorp.relaynet.wrappers.privateAddress
 import tech.relaycorp.relaynet.wrappers.x509.Certificate
 import java.security.PrivateKey
 import java.security.PublicKey
@@ -25,7 +26,7 @@ fun issueGatewayCertificate(
 ): Certificate {
     val isSelfIssued = issuerCertificate == null
     return Certificate.issue(
-        computePrivateAddress(subjectPublicKey),
+        subjectPublicKey.privateAddress,
         subjectPublicKey,
         issuerPrivateKey,
         validityEndDate,
@@ -53,7 +54,7 @@ fun issueEndpointCertificate(
     validityStartDate: ZonedDateTime = ZonedDateTime.now()
 ): Certificate {
     return Certificate.issue(
-        computePrivateAddress(subjectPublicKey),
+        subjectPublicKey.privateAddress,
         subjectPublicKey,
         issuerPrivateKey,
         validityEndDate,
@@ -80,7 +81,7 @@ fun issueParcelDeliveryAuthorization(
     issuerCertificate: Certificate,
     validityStartDate: ZonedDateTime = ZonedDateTime.now()
 ): Certificate = Certificate.issue(
-    computePrivateAddress(subjectPublicKey),
+    subjectPublicKey.privateAddress,
     subjectPublicKey,
     issuerPrivateKey,
     validityEndDate,
@@ -89,6 +90,3 @@ fun issueParcelDeliveryAuthorization(
     0,
     validityStartDate
 )
-
-private fun computePrivateAddress(subjectPublicKey: PublicKey) =
-    "0${getSHA256DigestHex(subjectPublicKey.encoded)}"
diff --git a/src/main/kotlin/tech/relaycorp/relaynet/wrappers/Keys.kt b/src/main/kotlin/tech/relaycorp/relaynet/wrappers/Keys.kt
@@ -1,5 +1,6 @@
 package tech.relaycorp.relaynet.wrappers
 
+import tech.relaycorp.relaynet.getSHA256DigestHex
 import java.security.KeyFactory
 import java.security.KeyPair
 import java.security.KeyPairGenerator
@@ -35,3 +36,9 @@ fun ByteArray.deserializeRSAPublicKey(): PublicKey {
         throw KeyException("Value is not a valid RSA public key", exc)
     }
 }
+
+/**
+ * Derive private address for Relaynet node from its public key.
+ */
+val PublicKey.privateAddress: String
+    get() = "0${getSHA256DigestHex(this.encoded)}"
diff --git a/src/test/kotlin/tech/relaycorp/relaynet/wrappers/KeysTest.kt b/src/test/kotlin/tech/relaycorp/relaynet/wrappers/KeysTest.kt
@@ -3,6 +3,7 @@ package tech.relaycorp.relaynet.wrappers
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
+import tech.relaycorp.relaynet.sha256Hex
 import java.security.interfaces.RSAPrivateKey
 import java.security.interfaces.RSAPublicKey
 import java.security.spec.InvalidKeySpecException
@@ -65,4 +66,16 @@ class KeysTest {
             assertEquals(publicKeySerialized.asList(), publicKeyDeserialized.encoded.asList())
         }
     }
+
+    @Nested
+    inner class PrivateAddress {
+        @Test
+        fun `Private node address should be calculated`() {
+            val keyPair = generateRSAKeyPair()
+
+            val privateAddress = keyPair.public.privateAddress
+
+            assertEquals("0${sha256Hex(keyPair.public.encoded)}", privateAddress)
+        }
+    }
 }