runfix: Address revoked devices not being checked (#17068)

wireapp · Mar 13, 2024 · d98d2d9 · d98d2d9
1 parent 66ae0f2
commit d98d2d9
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 33 deletions.
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "@lexical/react": "0.12.5",
     "@wireapp/avs": "9.6.12",
     "@wireapp/commons": "5.2.6",
-    "@wireapp/core": "45.2.9",
+    "@wireapp/core": "45.2.10",
     "@wireapp/react-ui-kit": "9.16.0",
     "@wireapp/store-engine-dexie": "2.1.8",
     "@wireapp/webapp-events": "0.20.1",

diff --git a/src/__mocks__/@wireapp/core-crypto.ts b/src/__mocks__/@wireapp/core-crypto.ts
@@ -41,6 +41,11 @@ export enum CredentialType {
   Basic = 1,
   X509 = 2,
 }
+export enum DeviceStatus {
+  Valid = 1,
+  Expired = 2,
+  Revoked = 3,
+}
 export enum E2eiConversationState {
   /**
    * All clients have a valid E2EI certificate

diff --git a/src/script/E2EIdentity/E2EIdentityVerification.ts b/src/script/E2EIdentity/E2EIdentityVerification.ts
@@ -25,17 +25,11 @@ import {container} from 'tsyringe';
 import {Core} from 'src/script/service/CoreSingleton';
 import {base64ToArray} from 'Util/util';
 
-import {mapMLSStatus} from './certificateDetails';
+import {mapMLSStatus, MLSStatuses} from './mlsStatus';
 
 import {ConversationState} from '../conversation/ConversationState';
 
-export enum MLSStatuses {
-  VALID = 'valid',
-  NOT_ACTIVATED = 'not_activated',
-  EXPIRED = 'expired',
-  EXPIRES_SOON = 'expires_soon',
-  REVOKED = 'revoked',
-}
+export {MLSStatuses};
 
 export type WireIdentity = Omit<DeviceIdentity, 'status'> & {
   status: MLSStatuses;

diff --git a/src/script/E2EIdentity/certificateDetails.ts → src/script/E2EIdentity/mlsStatus.ts b/src/script/E2EIdentity/certificateDetails.ts → src/script/E2EIdentity/mlsStatus.ts
@@ -17,21 +17,22 @@
  *
  */
 
-import {WireIdentity} from '@wireapp/core/lib/messagingProtocols/mls';
+import {DeviceStatus} from '@wireapp/core/lib/messagingProtocols/mls';
 
-import {MLSStatuses} from './E2EIdentityVerification';
+export enum MLSStatuses {
+  VALID = 'valid',
+  NOT_ACTIVATED = 'not_activated',
+  EXPIRED = 'expired',
+  EXPIRES_SOON = 'expires_soon',
+  REVOKED = 'revoked',
+}
 
-type CoreStatus = WireIdentity['status'];
-
-export const mapMLSStatus = (status?: CoreStatus) => {
-  const statusMap: Record<any, MLSStatuses> = {
-    Valid: MLSStatuses.VALID,
-    Expired: MLSStatuses.EXPIRED,
-    Revoked: MLSStatuses.REVOKED,
-  };
+const statusMap: Record<DeviceStatus, MLSStatuses> = {
+  [DeviceStatus.Valid]: MLSStatuses.VALID,
+  [DeviceStatus.Expired]: MLSStatuses.EXPIRED,
+  [DeviceStatus.Revoked]: MLSStatuses.REVOKED,
+};
 
-  if (!status) {
-    return MLSStatuses.NOT_ACTIVATED;
-  }
-  return statusMap[status];
+export const mapMLSStatus = (status?: DeviceStatus) => {
+  return !status ? MLSStatuses.NOT_ACTIVATED : statusMap[status];
 };
diff --git a/yarn.lock b/yarn.lock
@@ -4768,20 +4768,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/core-crypto@npm:1.0.0-rc.50":
-  version: 1.0.0-rc.50
-  resolution: "@wireapp/core-crypto@npm:1.0.0-rc.50"
-  checksum: 8d8d16157458b942b10377c6235b2077044806efb2cb8f936ba57950502ef94316539f525432e9ea9166bf319596064eb55c94c1388eeae2b747c1bd2b2391e7
+"@wireapp/core-crypto@npm:1.0.0-rc.51":
+  version: 1.0.0-rc.51
+  resolution: "@wireapp/core-crypto@npm:1.0.0-rc.51"
+  checksum: 57298c878b4364458206d8ec7ac462704ef82d1e526172fa1a265ad8a4dfa94ebd024ae6cf50c471c58540907ed6d4ae408d8ecd07923f6d7e0bb98170e93cfd
   languageName: node
   linkType: hard
 
-"@wireapp/core@npm:45.2.9":
-  version: 45.2.9
-  resolution: "@wireapp/core@npm:45.2.9"
+"@wireapp/core@npm:45.2.10":
+  version: 45.2.10
+  resolution: "@wireapp/core@npm:45.2.10"
   dependencies:
     "@wireapp/api-client": ^26.11.2
     "@wireapp/commons": ^5.2.7
-    "@wireapp/core-crypto": 1.0.0-rc.50
+    "@wireapp/core-crypto": 1.0.0-rc.51
     "@wireapp/cryptobox": 12.8.0
     "@wireapp/priority-queue": ^2.1.5
     "@wireapp/promise-queue": ^2.3.2
@@ -4797,7 +4797,7 @@ __metadata:
     long: ^5.2.0
     uuidjs: 4.2.13
     zod: 3.22.4
-  checksum: f8765bbd457b7a57893877ca3d2d18a39222b01924fc66f2a5db65c8845f392251ac1e97022eb27d68682fa22313288bd8b3c4ce5e24e55742fd9541767b5e65
+  checksum: ad18da95fccefbc3ebe543dd5e6766da9538bc4fad31f8089bd3ce00c75ac730ef85b429af2498181219a8ac6ea898759e8151010508f3f32efa453046a416d8
   languageName: node
   linkType: hard
 
@@ -17459,7 +17459,7 @@ __metadata:
     "@wireapp/avs": 9.6.12
     "@wireapp/commons": 5.2.6
     "@wireapp/copy-config": 2.1.14
-    "@wireapp/core": 45.2.9
+    "@wireapp/core": 45.2.10
     "@wireapp/eslint-config": 3.0.5
     "@wireapp/prettier-config": 0.6.3
     "@wireapp/react-ui-kit": 9.16.0