fix(PrivateKeyStore): Include nodeId in scope (#310)

relaycorp · Dec 18, 2023 · 7f89d2a · 7f89d2a
1 parent 90ccc4e
commit 7f89d2a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/main/kotlin/tech/relaycorp/relaynet/keystores/PrivateKeyStore.kt b/src/main/kotlin/tech/relaycorp/relaynet/keystores/PrivateKeyStore.kt
@@ -89,12 +89,15 @@ abstract class PrivateKeyStore {
     abstract suspend fun deleteKeys(nodeId: String)
 
     /**
-     * Delete the session keys for the peer identified by [peerId].
+     * Delete the session keys for node [nodeId] and peer [peerId].
      *
      * This is a no-op if the peer doesn't exist.
      */
     @Throws(KeyStoreBackendException::class)
-    abstract suspend fun deleteSessionKeysForPeer(peerId: String)
+    abstract suspend fun deleteBoundSessionKeys(
+        nodeId: String,
+        peerId: String,
+    )
 
     @Throws(KeyStoreBackendException::class)
     protected abstract suspend fun retrieveSessionKeySerialized(

diff --git a/src/test/kotlin/tech/relaycorp/relaynet/utils/MockPrivateKeyStore.kt b/src/test/kotlin/tech/relaycorp/relaynet/utils/MockPrivateKeyStore.kt
@@ -99,9 +99,10 @@ class MockPrivateKeyStore(
         sessionKeys.remove(nodeId)
     }
 
-    override suspend fun deleteSessionKeysForPeer(peerId: String) {
-        sessionKeys.values.forEach {
-            it.remove(peerId)
-        }
+    override suspend fun deleteBoundSessionKeys(
+        nodeId: String,
+        peerId: String,
+    ) {
+        sessionKeys[nodeId]?.remove(peerId)
     }
 }