@wireapp/core 20.0.0 → 20.1.1

package/CHANGELOG.md

@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.1.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.1.0...@wireapp/core@20.1.1) (2021-12-14)
+
+
+### Bug Fixes
+
+* **core:** Call message send success callback after mismatch handling ([ada3fd1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/ada3fd1378a7c5fecddd03db9547a89f90a7a174))
+
+
+
+
+
+# [20.1.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.0.2...@wireapp/core@20.1.0) (2021-12-14)
+
+
+### Features
+
+* **core:** Add tweet metadata on linkPreview when needed ([dc84806](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/dc848068e155aed22415827f3dcbeb3992e9c790))
+
+
+
+
+
+## [20.0.2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.0.1...@wireapp/core@20.0.2) (2021-12-09)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+## [20.0.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.0.0...@wireapp/core@20.0.1) (2021-12-09)
+
+
+### Bug Fixes
+
+* **core:** Generate new session and reencrypt payload when sessionIds are missing ([#4200](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4200)) ([07eab82](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/07eab82ee7512bb4eba71adf20c13c5609dbc024))
+
+
+
+
+
 # [20.0.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@19.0.0...@wireapp/core@20.0.0) (2021-12-08)
 
 

package/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "16.0.0",
+    "@wireapp/api-client": "16.1.0",
     "@wireapp/cryptobox": "12.7.1",
     "bazinga64": "5.10.0",
     "hash.js": "1.1.7",
@@ -69,6 +69,6 @@
     "test:project": "yarn dist && yarn test",
     "test:node": "nyc jasmine --config=jasmine.json"
   },
-  "version": "20.0.0",
-  "gitHead": "43fa0f4292ed1379349812589900944b22a1afb8"
+  "version": "20.1.1",
+  "gitHead": "746f0e8bfe633138756d1497a068bc5214084b9a"
 }

package/src/main/conversation/ConversationService.js

@@ -686,11 +686,11 @@ class ConversationService {
             onClientMismatch: callbacks === null || callbacks === void 0 ? void 0 : callbacks.onClientMismatch,
         });
         if (!response.errored) {
-            (_b = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onSuccess) === null || _b === void 0 ? void 0 : _b.call(callbacks, genericMessage, response.time);
             if (!this.isClearFromMismatch(response)) {
                 // We warn the consumer that there is a mismatch that did not prevent message sending
-                (_c = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onClientMismatch) === null || _c === void 0 ? void 0 : _c.call(callbacks, response, true);
+                (_b = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onClientMismatch) === null || _b === void 0 ? void 0 : _b.call(callbacks, response, true);
             }
+            (_c = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onSuccess) === null || _c === void 0 ? void 0 : _c.call(callbacks, genericMessage, response.time);
         }
         return Object.assign(Object.assign({}, payloadBundle), { content: processedContent || payloadBundle.content, messageTimer: ((_d = genericMessage.ephemeral) === null || _d === void 0 ? void 0 : _d.expireAfterMillis) || 0, state: response.errored ? conversation_2.PayloadBundleState.CANCELLED : conversation_2.PayloadBundleState.OUTGOING_SENT });
     }

package/src/main/conversation/message/MessageService.js

@@ -59,7 +59,10 @@ class MessageService {
             plainTextPayload = externalPayload.text;
             cipherText = externalPayload.cipherText;
         }
-        const encryptedPayload = await this.cryptographyService.encrypt(plainTextPayload, recipients);
+        const { encrypted, missing } = await this.cryptographyService.encrypt(plainTextPayload, recipients);
+        const encryptedPayload = Object.keys(missing).length
+            ? await this.reencryptAfterMismatch({ missing, deleted: {} }, encrypted, plainText)
+            : encrypted;
         const send = (payload) => {
             return options.sendAsProtobuf
                 ? this.sendOTRProtobufMessage(sendingClientId, payload, Object.assign(Object.assign({}, options), { assetData: cipherText }))
@@ -97,7 +100,10 @@ class MessageService {
         const send = (payload) => {
             return this.sendFederatedOtrMessage(sendingClientId, payload, options);
         };
-        const encryptedPayload = await this.cryptographyService.encryptQualified(plainText, recipients);
+        const { encrypted, missing } = await this.cryptographyService.encryptQualified(plainText, recipients);
+        const encryptedPayload = Object.keys(missing).length
+            ? await this.reencryptAfterFederatedMismatch({ missing, deleted: {} }, encrypted, plainText)
+            : encrypted;
         try {
             return await send(encryptedPayload);
         }
@@ -216,8 +222,8 @@ class MessageService {
         deleted.forEach(({ userId, data }) => data.forEach(clientId => delete recipients[userId.id][clientId]));
         if (missing.length) {
             const missingPreKeyBundles = await this.apiClient.user.api.postMultiPreKeyBundles(mismatch.missing);
-            const reEncrypted = await this.cryptographyService.encrypt(plainText, missingPreKeyBundles);
-            const reEncryptedPayloads = (0, UserClientsUtil_1.flattenUserClients)(reEncrypted);
+            const { encrypted } = await this.cryptographyService.encrypt(plainText, missingPreKeyBundles);
+            const reEncryptedPayloads = (0, UserClientsUtil_1.flattenUserClients)(encrypted);
             // add missing clients to the recipients
             reEncryptedPayloads.forEach(({ data, userId }) => (recipients[userId.id] = Object.assign(Object.assign({}, recipients[userId.id]), data)));
         }
@@ -238,8 +244,8 @@ class MessageService {
         deleted.forEach(({ userId, data }) => data.forEach(clientId => delete recipients[userId.domain][userId.id][clientId]));
         if (Object.keys(missing).length) {
             const missingPreKeyBundles = await this.apiClient.user.api.postQualifiedMultiPreKeyBundles(mismatch.missing);
-            const reEncrypted = await this.cryptographyService.encryptQualified(plainText, missingPreKeyBundles);
-            const reEncryptedPayloads = (0, UserClientsUtil_1.flattenQualifiedUserClients)(reEncrypted);
+            const { encrypted } = await this.cryptographyService.encryptQualified(plainText, missingPreKeyBundles);
+            const reEncryptedPayloads = (0, UserClientsUtil_1.flattenQualifiedUserClients)(encrypted);
             reEncryptedPayloads.forEach(({ data, userId }) => (recipients[userId.domain][userId.id] = Object.assign(Object.assign({}, recipients[userId.domain][userId.id]), data)));
         }
         return recipients;

package/src/main/conversation/message/MessageToProtoMapper.js

@@ -37,6 +37,7 @@ class MessageToProtoMapper {
                     author: linkPreview.tweet.author,
                     username: linkPreview.tweet.username,
                 });
+                linkPreviewMessage.metaData = 'tweet';
             }
             if (linkPreview.imageUploaded) {
                 const { asset, image } = linkPreview.imageUploaded;

package/src/main/cryptography/CryptographyService.d.ts

@@ -29,9 +29,14 @@ export declare class CryptographyService {
     static convertBase64RecipientsToArray(recipients: OTRRecipients<string>): OTRRecipients<Uint8Array>;
     createCryptobox(): Promise<SerializedPreKey[]>;
     decrypt(sessionId: string, encodedCiphertext: string): Promise<Uint8Array>;
-    private static dismantleSessionId;
-    encryptQualified(plainText: Uint8Array, preKeyBundles: QualifiedUserPreKeyBundleMap | QualifiedUserClients): Promise<QualifiedOTRRecipients>;
-    encrypt(plainText: Uint8Array, users: UserPreKeyBundleMap | UserClients, domain?: string): Promise<OTRRecipients<Uint8Array>>;
+    encryptQualified(plainText: Uint8Array, preKeyBundles: QualifiedUserPreKeyBundleMap | QualifiedUserClients): Promise<{
+        missing: QualifiedUserClients;
+        encrypted: QualifiedOTRRecipients;
+    }>;
+    encrypt(plainText: Uint8Array, users: UserPreKeyBundleMap | UserClients, domain?: string): Promise<{
+        missing: UserClients;
+        encrypted: OTRRecipients<Uint8Array>;
+    }>;
     private encryptPayloadForSession;
     initCryptobox(): Promise<void>;
     deleteCryptographyStores(): Promise<boolean[]>;

package/src/main/cryptography/CryptographyService.js

@@ -81,41 +81,39 @@ class CryptographyService {
         const messageBytes = bazinga64_1.Decoder.fromBase64(encodedCiphertext).asBytes;
         return this.cryptobox.decrypt(sessionId, messageBytes.buffer);
     }
-    static dismantleSessionId(sessionId) {
-        // see https://regex101.com/r/c8FtCw/1
-        const regex = /((?<domain>.+)@)?(?<userId>.+)@(?<clientId>.+)$/g;
-        const match = regex.exec(sessionId);
-        const { domain, userId, clientId } = (match === null || match === void 0 ? void 0 : match.groups) || {};
-        return { clientId, domain, userId };
-    }
     async encryptQualified(plainText, preKeyBundles) {
         const qualifiedOTRRecipients = {};
+        const missing = {};
         for (const [domain, preKeyBundleMap] of Object.entries(preKeyBundles)) {
-            qualifiedOTRRecipients[domain] = await this.encrypt(plainText, preKeyBundleMap, domain);
+            const result = await this.encrypt(plainText, preKeyBundleMap, domain);
+            qualifiedOTRRecipients[domain] = result.encrypted;
+            missing[domain] = result.missing;
         }
-        return qualifiedOTRRecipients;
+        return {
+            encrypted: qualifiedOTRRecipients,
+            missing,
+        };
     }
     async encrypt(plainText, users, domain) {
-        const bundles = [];
+        const encrypted = {};
+        const missing = {};
         for (const userId in users) {
             const clientIds = (0, util_1.isUserClients)(users) ? users[userId] : Object.keys(users[userId]);
             for (const clientId of clientIds) {
                 const base64PreKey = (0, util_1.isUserClients)(users) ? undefined : users[userId][clientId].key;
                 const sessionId = CryptographyService.constructSessionId(userId, clientId, domain || null);
-                bundles.push(this.encryptPayloadForSession(sessionId, plainText, base64PreKey));
+                const result = await this.encryptPayloadForSession(sessionId, plainText, base64PreKey);
+                if (result) {
+                    encrypted[userId] || (encrypted[userId] = {});
+                    encrypted[userId][clientId] = result.encryptedPayload;
+                }
+                else {
+                    missing[userId] || (missing[userId] = []);
+                    missing[userId].push(clientId);
+                }
             }
         }
-        const payloads = await Promise.all(bundles);
-        return payloads.reduce((recipients, payload) => {
-            if (!payload) {
-                return recipients;
-            }
-            const { encryptedPayload, sessionId } = payload;
-            const { userId, clientId } = CryptographyService.dismantleSessionId(sessionId);
-            recipients[userId] || (recipients[userId] = {});
-            recipients[userId][clientId] = encryptedPayload;
-            return recipients;
-        }, {});
+        return { encrypted, missing };
     }
     async encryptPayloadForSession(sessionId, plainText, base64EncodedPreKey) {
         this.logger.log(`Encrypting payload for session ID "${sessionId}"`);