From ad04faca6f789080d922c4be7d2776e3cc889fd9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 7 Sep 2022 12:16:04 +1000
Subject: [PATCH] fix: increment bad snode if we timeout of guard node

---
 ts/session/apis/snode_api/SNodeAPI.ts |  1 +
 ts/session/apis/snode_api/onions.ts   | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts
index 6b21fd9a7..6be2c8246 100644
--- a/ts/session/apis/snode_api/SNodeAPI.ts
+++ b/ts/session/apis/snode_api/SNodeAPI.ts
@@ -582,6 +582,7 @@ export const getNetworkTime = async (snode: Snode): Promise<string | number> =>
   if (!timestamp) {
     throw new Error(`getNetworkTime returned invalid timestamp: ${timestamp}`);
   }
+  handleTimestampOffset('getNetworkTime', timestamp);
   return timestamp;
 };
 
diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts
index 5180debe7..a1672b480 100644
--- a/ts/session/apis/snode_api/onions.ts
+++ b/ts/session/apis/snode_api/onions.ts
@@ -567,6 +567,23 @@ async function processOnionResponse({
   }
 }
 
+async function processNoSymmetricKeyError(
+  guardNode: Snode,
+  symmetricKey?: ArrayBuffer
+): Promise<ArrayBuffer> {
+  if (!symmetricKey) {
+    const errorMsg =
+      'No symmetric key to decode response, probably a time out on the onion request itself';
+
+    window?.log?.error(errorMsg);
+
+    await incrementBadPathCountOrDrop(guardNode.pubkey_ed25519);
+
+    throw new Error(errorMsg);
+  }
+  return symmetricKey;
+}
+
 async function processOnionResponseV4({
   response,
   symmetricKey,
@@ -583,11 +600,8 @@ async function processOnionResponseV4({
   associatedWith?: string;
 }): Promise<SnodeResponseV4 | undefined> {
   processAbortedRequest(abortSignal);
+  const validSymmetricKey = await processNoSymmetricKeyError(guardNode, symmetricKey);
 
-  if (!symmetricKey) {
-    window?.log?.error('No symmetric key to decode response.');
-    return undefined;
-  }
   const cipherText = (await response?.arrayBuffer()) || new ArrayBuffer(0);
 
   if (!cipherText) {
@@ -610,7 +624,7 @@ async function processOnionResponseV4({
 
   const plaintextBuffer = await callUtilsWorker(
     'DecryptAESGCM',
-    new Uint8Array(symmetricKey),
+    new Uint8Array(validSymmetricKey),
     new Uint8Array(cipherText)
   );