From df3ca5d38a2ab59c667c0aebdc84701444c5b18f Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 11 Feb 2021 14:33:55 +1100
Subject: [PATCH] add a sql function to check if a keypair is already saved in
 db

---
 app/sql.js                  | 13 +++++++++++++
 js/modules/data.d.ts        |  5 +++++
 js/modules/data.js          |  5 +++++
 ts/receiver/closedGroups.ts | 13 +++++--------
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/sql.js b/app/sql.js
index b9a1128ce..34aede29d 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -171,6 +171,7 @@ module.exports = {
   getAllEncryptionKeyPairsForGroup,
   getLatestClosedGroupEncryptionKeyPair,
   addClosedGroupEncryptionKeyPair,
+  isKeyPairAlreadySaved,
   removeAllClosedGroupEncryptionKeyPairs,
 };
 
@@ -3267,6 +3268,18 @@ async function addClosedGroupEncryptionKeyPair(
   );
 }
 
+async function isKeyPairAlreadySaved(
+  groupPublicKey,
+  newKeyPairInHex // : HexKeyPair
+) {
+  const allKeyPairs = await getAllEncryptionKeyPairsForGroup(groupPublicKey);
+  return (allKeyPairs || []).some(
+    k =>
+      newKeyPairInHex.publicHex === k.publicHex &&
+      newKeyPairInHex.privateHex === k.privateHex
+  );
+}
+
 async function removeAllClosedGroupEncryptionKeyPairs(groupPublicKey) {
   await db.run(
     `DELETE FROM ${CLOSED_GROUP_V2_KEY_PAIRS_TABLE} WHERE groupPublicKey = $groupPublicKey`,
diff --git a/js/modules/data.d.ts b/js/modules/data.d.ts
index 479f94611..87c242603 100644
--- a/js/modules/data.d.ts
+++ b/js/modules/data.d.ts
@@ -1,5 +1,6 @@
 import { KeyPair } from '../../libtextsecure/libsignal-protocol';
 import { HexKeyPair } from '../../ts/receiver/closedGroups';
+import { ECKeyPair } from '../../ts/receiver/keypairs';
 import { PubKey } from '../../ts/session/types';
 import { ConversationType } from '../../ts/state/ducks/conversations';
 import { Message } from '../../ts/types/Message';
@@ -401,6 +402,10 @@ export function removeAllClosedGroupRatchets(groupId: string): Promise<void>;
 export function getAllEncryptionKeyPairsForGroup(
   groupPublicKey: string | PubKey
 ): Promise<Array<HexKeyPair> | undefined>;
+export function isKeyPairAlreadySaved(
+  groupPublicKey: string,
+  keypair: HexKeyPair
+): Promise<boolean>;
 export function getLatestClosedGroupEncryptionKeyPair(
   groupPublicKey: string
 ): Promise<HexKeyPair | undefined>;
diff --git a/js/modules/data.js b/js/modules/data.js
index f3661b5fd..4f3690c4f 100644
--- a/js/modules/data.js
+++ b/js/modules/data.js
@@ -196,6 +196,7 @@ module.exports = {
   getAllEncryptionKeyPairsForGroup,
   getLatestClosedGroupEncryptionKeyPair,
   addClosedGroupEncryptionKeyPair,
+  isKeyPairAlreadySaved,
   removeAllClosedGroupEncryptionKeyPairs,
 };
 
@@ -723,6 +724,10 @@ async function addClosedGroupEncryptionKeyPair(groupPublicKey, keypair) {
   return channels.addClosedGroupEncryptionKeyPair(groupPublicKey, keypair);
 }
 
+async function isKeyPairAlreadySaved(groupPublicKey, keypair) {
+  return channels.isKeyPairAlreadySaved(groupPublicKey, keypair);
+}
+
 async function removeAllClosedGroupEncryptionKeyPairs(groupPublicKey) {
   return channels.removeAllClosedGroupEncryptionKeyPairs(groupPublicKey);
 }
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index d6375dfd4..33325a563 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -16,6 +16,7 @@ import {
   addClosedGroupEncryptionKeyPair,
   getAllEncryptionKeyPairsForGroup,
   getLatestClosedGroupEncryptionKeyPair,
+  isKeyPairAlreadySaved,
   removeAllClosedGroupEncryptionKeyPairs,
 } from '../../js/modules/data';
 import {
@@ -449,16 +450,12 @@ async function handleClosedGroupEncryptionKeyPair(
   // Store it if needed
   const newKeyPairInHex = keyPair.toHexKeyPair();
 
-  const keyPairsAlreadySaved = await getAllEncryptionKeyPairsForGroup(
-    groupPublicKey
-  );
-  const isKeyPairAlreadySaved = (keyPairsAlreadySaved || []).some(
-    k =>
-      newKeyPairInHex.publicHex === k.publicHex &&
-      newKeyPairInHex.privateHex === k.privateHex
+  const isKeyPairAlreadyHere = await isKeyPairAlreadySaved(
+    groupPublicKey,
+    newKeyPairInHex
   );
 
-  if (isKeyPairAlreadySaved) {
+  if (isKeyPairAlreadyHere) {
     window.log.info('Dropping already saved keypair for group', groupPublicKey);
     await removeFromCache(envelope);
     return;