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

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

@@ -1,9 +1,16 @@
 import { QualifiedId } from '@wireapp/api-client/lib/user';
-import logdown from 'logdown';
 import { DecryptionError } from '../../../../errors/DecryptionError';
-declare const generateDecryptionError: (senderInfo: {
+export declare const ProteusErrors: {
+    readonly InvalidMessage: 201;
+    readonly RemoteIdentityChanged: 204;
+    readonly InvalidSignature: 207;
+    readonly DuplicateMessage: 209;
+    readonly Unknown: 999;
+};
+type SenderInfo = {
     clientId: string;
     userId: QualifiedId;
-}, error: any, logger: logdown.Logger) => DecryptionError;
-export { generateDecryptionError };
+};
+export declare const generateDecryptionError: (senderInfo: SenderInfo, error: any) => DecryptionError;
+export {};
 //# sourceMappingURL=DecryptionErrorGenerator.d.ts.map

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;AACzD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAC,eAAe,EAAC,MAAM,oCAAoC,CAAC;AAKnE,QAAA,MAAM,uBAAuB,eACf;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,SAC5C,GAAG,UACF,QAAQ,MAAM,KACrB,eA6BF,CAAC;AAEF,OAAO,EAAC,uBAAuB,EAAC,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

@@ -18,32 +18,47 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDecryptionError = void 0;
+exports.generateDecryptionError = exports.ProteusErrors = void 0;
 const DecryptionError_1 = require("../../../../errors/DecryptionError");
-const hasErrorCode = (error) => error && error.code;
-const generateDecryptionError = (senderInfo, error, logger) => {
+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;
-    const errorCode = hasErrorCode(error) ? (_a = error.code) !== null && _a !== void 0 ? _a : 999 : 999;
-    let message = 'Unknown decryption error';
-    const { clientId: remoteClientId, userId } = senderInfo;
-    const { id: remoteUserId } = userId;
-    const isDuplicateMessage = false; // TODO when coreCrypto returns ganular errors
-    const isOutdatedMessage = false; // TODO when coreCrypto returns ganular errors
-    // We don't need to show these message errors to the user
-    if (isDuplicateMessage || isOutdatedMessage) {
-        message = `Message from user ID "${remoteUserId}" will not be handled because it is outdated or a duplicate.`;
-    }
-    const isInvalidMessage = false; // TODO when coreCrypto returns ganular errors
-    const isInvalidSignature = false; // TODO when coreCrypto returns ganular errors
-    const isRemoteIdentityChanged = false; // TODO when coreCrypto returns ganular errors
-    // Session is broken, let's see what's really causing it...
-    if (isInvalidMessage || isInvalidSignature) {
-        message = `Session with user '${remoteUserId}' (${remoteClientId}) is broken.\nReset the session for possible fix.`;
-    }
-    else if (isRemoteIdentityChanged) {
-        message = `Remote identity of client '${remoteClientId}' from user '${remoteUserId}' changed`;
+    return (_a = CoreCryptoErrorMapping[error.message]) !== null && _a !== void 0 ? _a : exports.ProteusErrors.Unknown;
+};
+const getErrorMessage = (code, userId, clientId, error) => {
+    const sender = `${userId.id} (${clientId})`;
+    switch (code) {
+        case exports.ProteusErrors.InvalidMessage:
+            return `Invalid message from ${sender}`;
+        case exports.ProteusErrors.InvalidSignature:
+            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} (${error.message})`;
+        default:
+            return `Unhandled error code "${code}" from ${sender} (${error.message})`;
     }
-    logger.warn(`Failed to decrypt event from client '${remoteClientId}' of user '${remoteUserId}'.\nError Code: '${errorCode}'\nError Message: ${error.message}`, error);
-    return new DecryptionError_1.DecryptionError(message, errorCode);
+};
+const generateDecryptionError = (senderInfo, error) => {
+    const { clientId: remoteClientId, userId } = senderInfo;
+    const code = mapCoreCryptoError(error);
+    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

@@ -20,14 +20,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const DecryptionErrorGenerator_1 = require("./DecryptionErrorGenerator");
 const DecryptionError_1 = require("../../../../errors/DecryptionError");
-const logger = {
-    warn: jest.fn(),
-};
 const basePayload = { userId: { id: 'user1', domain: 'domain' }, clientId: 'client1' };
 describe('generateDecryptionError', () => {
     it('returns a ProteusError.DecryptError', () => {
-        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error(), logger);
+        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error());
         expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
-        expect(error.message).toBe('Unknown decryption error');
+        expect(error.message).toBe('Unknown decryption error from user1 (client1)');
+        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.Unknown);
+    });
+    it('handles remote identity changed', () => {
+        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error('RemoteIdentityChanged'));
+        expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
+        expect(error.message).toBe('Remote identity of user1 (client1) has changed');
+        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.RemoteIdentityChanged);
+    });
+    it('handles invalid message', () => {
+        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error('InvalidMessage'));
+        expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
+        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);
+        expect(error.message).toBe('Invalid signature from user1 (client1)');
+        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.InvalidSignature);
     });
 });

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

@@ -162,7 +162,7 @@ class ProteusService {
             return decryptedMessage;
         }
         catch (error) {
-            throw (0, DecryptionErrorGenerator_1.generateDecryptionError)({ userId, clientId }, error, this.logger);
+            throw (0, DecryptionErrorGenerator_1.generateDecryptionError)({ userId, clientId }, error);
         }
     }
     async encrypt(plainText, recipients, domain = '') {

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

@@ -1,4 +1,5 @@
 export * from './ProteusService';
 export * from '../Utility';
 export * from './ProteusService.types';
+export { ProteusErrors } from './DecryptionErrorGenerator';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/index.ts"],"names":[],"mappings":"AAmBA,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/index.ts"],"names":[],"mappings":"AAmBA,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC"}

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

@@ -32,6 +32,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProteusErrors = void 0;
 __exportStar(require("./ProteusService"), exports);
 __exportStar(require("../Utility"), exports);
 __exportStar(require("./ProteusService.types"), exports);
+var DecryptionErrorGenerator_1 = require("./DecryptionErrorGenerator");
+Object.defineProperty(exports, "ProteusErrors", { enumerable: true, get: function () { return DecryptionErrorGenerator_1.ProteusErrors; } });

package/package.json

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