@wireapp/core 38.0.0-beta.6 → 38.0.0-beta.7

package/lib/messagingProtocols/proteus/ProteusService/DecryptionErrorGenerator/DecryptionErrorGenerator.d.ts

@@ -4,6 +4,7 @@ export declare const ProteusErrors: {
     readonly InvalidMessage: 201;
     readonly RemoteIdentityChanged: 204;
     readonly InvalidSignature: 207;
+    readonly DuplicateMessage: 209;
     readonly Unknown: 999;
 };
 type SenderInfo = {

package/lib/messagingProtocols/proteus/ProteusService/DecryptionErrorGenerator/DecryptionErrorGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DecryptionErrorGenerator.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/DecryptionErrorGenerator/DecryptionErrorGenerator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,eAAe,EAAC,MAAM,oCAAoC,CAAC;AAEnE,eAAO,MAAM,aAAa;;;;;CAKhB,CAAC;AAoCX,KAAK,UAAU,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,CAAC;AAC1D,eAAO,MAAM,uBAAuB,eAAgB,UAAU,SAAS,GAAG,KAAG,eAO5E,CAAC"}
+{"version":3,"file":"DecryptionErrorGenerator.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/DecryptionErrorGenerator/DecryptionErrorGenerator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,eAAe,EAAC,MAAM,oCAAoC,CAAC;AAEnE,eAAO,MAAM,aAAa;;;;;;CAMhB,CAAC;AAwCX,KAAK,UAAU,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,CAAC;AAC1D,eAAO,MAAM,uBAAuB,eAAgB,UAAU,SAAS,GAAG,KAAG,eAO5E,CAAC"}

package/lib/messagingProtocols/proteus/ProteusService/DecryptionErrorGenerator/DecryptionErrorGenerator.js

@@ -24,19 +24,21 @@ exports.ProteusErrors = {
     InvalidMessage: 201,
     RemoteIdentityChanged: 204,
     InvalidSignature: 207,
+    DuplicateMessage: 209,
     Unknown: 999,
 };
 const CoreCryptoErrorMapping = {
     InvalidMessage: exports.ProteusErrors.InvalidMessage,
     RemoteIdentityChanged: exports.ProteusErrors.RemoteIdentityChanged,
     InvalidSignature: exports.ProteusErrors.InvalidSignature,
+    DuplicateMessage: exports.ProteusErrors.DuplicateMessage,
     Unknown: exports.ProteusErrors.Unknown,
 };
 const mapCoreCryptoError = (error) => {
     var _a;
     return (_a = CoreCryptoErrorMapping[error.message]) !== null && _a !== void 0 ? _a : exports.ProteusErrors.Unknown;
 };
-const getErrorMessage = (code, userId, clientId) => {
+const getErrorMessage = (code, userId, clientId, error) => {
     const sender = `${userId.id} (${clientId})`;
     switch (code) {
         case exports.ProteusErrors.InvalidMessage:
@@ -45,16 +47,18 @@ const getErrorMessage = (code, userId, clientId) => {
             return `Invalid signature from ${sender}`;
         case exports.ProteusErrors.RemoteIdentityChanged:
             return `Remote identity of ${sender} has changed`;
+        case exports.ProteusErrors.DuplicateMessage:
+            return `Message from ${sender} was decrypted twice`;
         case exports.ProteusErrors.Unknown:
-            return `Unknown decryption error from ${sender}`;
+            return `Unknown decryption error from ${sender} (${error.message})`;
         default:
-            return `Unhandled error code "${code}" from ${sender}`;
+            return `Unhandled error code "${code}" from ${sender} (${error.message})`;
     }
 };
 const generateDecryptionError = (senderInfo, error) => {
     const { clientId: remoteClientId, userId } = senderInfo;
     const code = mapCoreCryptoError(error);
-    const message = getErrorMessage(code, userId, remoteClientId);
+    const message = getErrorMessage(code, userId, remoteClientId, error);
     return new DecryptionError_1.DecryptionError(message, code);
 };
 exports.generateDecryptionError = generateDecryptionError;

package/lib/messagingProtocols/proteus/ProteusService/DecryptionErrorGenerator/DecryptionErrorGenerator.test.js

@@ -40,6 +40,12 @@ describe('generateDecryptionError', () => {
         expect(error.message).toBe('Invalid message from user1 (client1)');
         expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.InvalidMessage);
     });
+    it('handles duplicated message', () => {
+        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error('DuplicateMessage'));
+        expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
+        expect(error.message).toBe('Invalid message from user1 (client1)');
+        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.DuplicateMessage);
+    });
     it('handles invalid signature', () => {
         const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error('InvalidSignature'));
         expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);

package/package.json

@@ -59,6 +59,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "38.0.0-beta.6",
+  "version": "38.0.0-beta.7",
   "gitHead": "5339f01fe01ef0871da8c8bc8662fbe9e604754a"
 }