From d1518f823343d749396ddd225f98288ecdc15a87 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 11 Jun 2020 08:55:10 +1000
Subject: [PATCH] add new handling of session request message

---
 libtextsecure/message_receiver.js             | 47 ++++++++++++-------
 preload.js                                    |  1 +
 protos/SignalService.proto                    |  2 +-
 .../ciphers/FallBackSessionCipherStub.ts      |  2 +-
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 95581ad2c..079dd30a0 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -20,6 +20,7 @@
 /* global ConversationController: false */
 /* global Signal: false */
 /* global log: false */
+/* global session: false */
 
 /* eslint-disable more/no-then */
 /* eslint-disable no-unreachable */
@@ -1545,24 +1546,42 @@ MessageReceiver.prototype.extend({
       window.log.info('Error getting conversation: ', envelope.source);
     }
   },
+  async handleSessionRequestMessage(envelope, content) {
+    const shouldProcessSessionRequest = await session.Protocols.SessionProtocol.shouldProcessSessionRequest(
+      envelope.source,
+      envelope.timestamp
+    );
+
+    if (shouldProcessSessionRequest) {
+      if (content.preKeyBundleMessage) {
+        await this.savePreKeyBundleMessage(
+          envelope.source,
+          content.preKeyBundleMessage
+        );
+      }
+      await session.Protocols.SessionProtocol.onSessionRequestProcessed(
+        envelope.source
+      );
+      window.log.info('sending session established to', envelope.source);
+      // We don't need to await the call below because we just want to send it off
+      window.libloki.api.sendSessionEstablishedMessage(envelope.source);
+    }
+  },
   async innerHandleContentMessage(envelope, plaintext) {
     const content = textsecure.protobuf.Content.decode(plaintext);
+    const { SESSION_REQUEST } = textsecure.protobuf.Envelope.Type;
 
-    if (content.preKeyBundleMessage) {
-      await this.savePreKeyBundleMessage(
-        envelope.source,
-        content.preKeyBundleMessage
+    if (envelope.type === SESSION_REQUEST) {
+      await this.handleSessionRequestMessage(envelope, content);
+    } else {
+      await session.Protocols.SessionProtocol.onSessionEstablished(
+        envelope.source
       );
+      // TODO process sending queue for this device now that we have a session
     }
 
     this.handleFriendRequestAcceptIfNeeded(envelope, content);
 
-    if (content.lokiAddressMessage) {
-      return this.handleLokiAddressMessage(
-        envelope,
-        content.lokiAddressMessage
-      );
-    }
     if (content.pairingAuthorisation) {
       return this.handlePairingAuthorisationMessage(envelope, content);
     }
@@ -1660,14 +1679,6 @@ MessageReceiver.prototype.extend({
     return this.dispatchEvent(ev);
   },
   handleNullMessage(envelope) {
-    // Loki - Temp hack for new protocl backward compatibility
-    // This should be removed once we add the new protocol
-    if (envelope.type === textsecure.protobuf.Envelope.Type.FRIEND_REQUEST) {
-      window.log.info('sent session established to', envelope.source);
-      // We don't need to await the call below because we just want to send it off
-      window.libloki.api.sendSessionEstablishedMessage(envelope.source);
-    }
-
     window.log.info('null message from', this.getEnvelopeId(envelope));
     this.removeFromCache(envelope);
   },
diff --git a/preload.js b/preload.js
index fe447f886..2d23e7278 100644
--- a/preload.js
+++ b/preload.js
@@ -159,6 +159,7 @@ window.setPassword = (passPhrase, oldPhrase) =>
   });
 
 window.passwordUtil = require('./app/password_util');
+window.session = require('./ts/session');
 
 // We never do these in our code, so we'll prevent it everywhere
 window.open = () => null;
diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index ba7375657..69be6de73 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -13,7 +13,7 @@ message Envelope {
     RECEIPT       = 5;
     UNIDENTIFIED_SENDER = 6;
     MEDIUM_GROUP_CIPHERTEXT = 7;
-    FRIEND_REQUEST = 101; // contains prekeys + message and is using simple encryption
+    SESSION_REQUEST = 101; // contains prekeys and is using simple encryption
   }
 
   optional Type   type            = 1;
diff --git a/ts/test/test-utils/stubs/ciphers/FallBackSessionCipherStub.ts b/ts/test/test-utils/stubs/ciphers/FallBackSessionCipherStub.ts
index 22aba7b01..cbc6f1785 100644
--- a/ts/test/test-utils/stubs/ciphers/FallBackSessionCipherStub.ts
+++ b/ts/test/test-utils/stubs/ciphers/FallBackSessionCipherStub.ts
@@ -4,7 +4,7 @@ import { SignalService } from '../../../../protobuf';
 export class FallBackSessionCipherStub {
   public async encrypt(buffer: ArrayBuffer): Promise<CipherTextObject> {
     return {
-      type: SignalService.Envelope.Type.FRIEND_REQUEST,
+      type: SignalService.Envelope.Type.SESSION_REQUEST,
       body: Buffer.from(buffer).toString('binary'),
     };
   }