Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: dont show E2EI shield and correct ciphersuite [WPB-15023] [WPB-15025] #18489

Merged
merged 1 commit into from
Dec 13, 2024
Merged

fix: dont show E2EI shield and correct ciphersuite [WPB-15023] [WPB-15025] #18489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/script/client/ClientEntity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,19 @@ import {splitFingerprint} from 'Util/StringUtil';

import {ClientMapper} from './ClientMapper';

import {isObject} from '../guards/common';
import {ClientRecord} from '../storage';

export enum MLSPublicKeys {
ED25519 = 'ed25519',
}
export const MLSPublicKeys = {
ed25519: 'ED25519',
ed448: 'ED448',
ecdsa_secp521r1_sha512: 'EDCSA_SECP521R1_SHA512',
ecdsa_secp384r1_sha384: 'EDCSA_SECP384R1_SHA384',
ecdsa_secp256r1_sha256: 'EDCSA_SECP256R1_SHA256',
} as const;
Comment on lines +30 to +36
Copy link
Contributor

@V-Gira V-Gira Dec 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't align with iOS for those?
FYI we're using those strings in the conversation details with Cyphersuite[<number>] (enum from Core-Crypto)


export const isKnownSignature = (signature: unknown): signature is keyof typeof MLSPublicKeys =>
signature !== undefined && typeof signature === 'string' && Object.keys(MLSPublicKeys).includes(signature);

export class ClientEntity {
static CONFIG = {
Expand All @@ -51,7 +59,7 @@ export class ClientEntity {
model?: string;
time?: string;
type?: ClientType.PERMANENT | ClientType.TEMPORARY;
mlsPublicKeys?: Partial<Record<MLSPublicKeys, string>>;
mlsPublicKeys?: Partial<Record<keyof typeof MLSPublicKeys, string>>;

constructor(isSelfClient: boolean, domain: string | null, id = '') {
this.isSelfClient = isSelfClient;
Expand Down Expand Up @@ -101,6 +109,12 @@ export class ClientEntity {
return hasModel ? this.model : this.class.toUpperCase();
}

getCipherSuite(): string | undefined {
return isObject(this.mlsPublicKeys) && Object.keys(this.mlsPublicKeys).length > 0
? Object.keys(this.mlsPublicKeys).at(0)
: undefined;
}

/**
* This method returns an object which can be stored in our local database.
*/
Expand Down
4 changes: 3 additions & 1 deletion src/script/components/Badge/components/VerificationBadges/VerificationBadges.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,11 @@ export const UserVerificationBadges = ({
export const DeviceVerificationBadges = ({
device,
getIdentity,
isE2EIEnabled = false,
}: {
device: ClientEntity;
getIdentity?: (deviceId: string) => WireIdentity | undefined;
isE2EIEnabled?: boolean;
}) => {
const userState = useRef(container.resolve(UserState));
const identity = useMemo(() => getIdentity?.(device.id), [device, getIdentity]);
Expand Down Expand Up @@ -159,7 +161,7 @@ export const DeviceVerificationBadges = ({
}, [identity]);

let status: MLSStatuses | undefined = undefined;
if (identity && user) {
if (isE2EIEnabled && identity && user) {
const mlsStatuses = getMLSStatuses({identities: [identity], user});
status = mlsStatuses?.[0];
}
Expand Down
4 changes: 3 additions & 1 deletion src/script/components/UserDevices/components/DeviceDetails/DeviceDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ export const DeviceDetails = ({

return (
<div className={cx('participant-devices__header', {'participant-devices__header--padding': !noPadding})}>
{deviceIdentity && <MLSDeviceDetails identity={deviceIdentity} isSelfUser={user.isMe} />}
{deviceIdentity && (
<MLSDeviceDetails identity={deviceIdentity} isSelfUser={user.isMe} cipherSuite={device.getCipherSuite()} />
)}

<div className="device-proteus-details">
<h3 className="device-details-title paragraph-body-3">{t('participantDevicesProteusDeviceVerification')}</h3>
Expand Down
2 changes: 0 additions & 2 deletions src/script/hooks/useDeviceIdentities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,11 @@ export const useUserIdentity = (userId: QualifiedId, groupId?: string, updateAft

return {
deviceIdentities,

status: !deviceIdentities
? undefined
: deviceIdentities.length > 0 && deviceIdentities.every(identity => identity.status === MLSStatuses.VALID)
? MLSStatuses.VALID
: MLSStatuses.NOT_ACTIVATED,

getDeviceIdentity,
};
};
14 changes: 11 additions & 3 deletions ...ript/page/MainContent/panels/preferences/DevicesPreferences/components/DetailedDevice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import React from 'react';

import {DeviceVerificationBadges} from 'Components/Badge';
import {ClientEntity} from 'src/script/client/ClientEntity';
import {WireIdentity} from 'src/script/E2EIdentity';
import {E2EIHandler, WireIdentity} from 'src/script/E2EIdentity';

import {MLSDeviceDetails} from './MLSDeviceDetails';
import {ProteusDeviceDetails} from './ProteusDeviceDetails';
Expand All @@ -41,16 +41,24 @@ export const DetailedDevice: React.FC<DeviceProps> = ({
getDeviceIdentity,
isProteusVerified,
}) => {
const isE2eiEnabled = E2EIHandler.getInstance().isE2EIEnabled();
const getIdentity = () => getDeviceIdentity?.(device.id);

return (
<>
<h3 className="preferences-devices-model preferences-devices-model-name" data-uie-name="device-model">
<span>{device.model}</span>
<DeviceVerificationBadges device={device} getIdentity={getIdentity} />
<DeviceVerificationBadges device={device} getIdentity={getIdentity} isE2EIEnabled={isE2eiEnabled} />
</h3>

{getIdentity && <MLSDeviceDetails isCurrentDevice={isCurrentDevice} identity={getIdentity()} isSelfUser />}
{getIdentity() !== undefined && (
<MLSDeviceDetails
isCurrentDevice={isCurrentDevice}
identity={getIdentity()}
isSelfUser
cipherSuite={device.getCipherSuite()}
/>
)}

<ProteusDeviceDetails device={device} fingerprint={fingerprint} isProteusVerified={isProteusVerified} />
</>
Expand Down
14 changes: 11 additions & 3 deletions ...nt/panels/preferences/DevicesPreferences/components/MLSDeviceDetails/MLSDeviceDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,23 @@ import {splitFingerprint} from 'Util/StringUtil';

import {styles} from './MLSDeviceDetails.styles';

import {MLSPublicKeys} from '../../../../../../../client';
import {isKnownSignature, MLSPublicKeys} from '../../../../../../../client';
import {E2EICertificateDetails} from '../E2EICertificateDetails';
import {FormattedId} from '../FormattedId';

interface MLSDeviceDetailsProps {
cipherSuite?: string;
isCurrentDevice?: boolean;
identity?: WireIdentity;
isSelfUser?: boolean;
}

export const MLSDeviceDetails = ({isCurrentDevice, identity, isSelfUser = false}: MLSDeviceDetailsProps) => {
export const MLSDeviceDetails = ({
cipherSuite,
isCurrentDevice,
identity,
isSelfUser = false,
}: MLSDeviceDetailsProps) => {
if (!isCurrentDevice && !identity) {
return null;
}
Expand All @@ -53,7 +59,9 @@ export const MLSDeviceDetails = ({isCurrentDevice, identity, isSelfUser = false}

return (
<div css={styles.wrapper}>
<h4 className="paragraph-body-3">{t('mlsSignature', {signature: MLSPublicKeys.ED25519.toUpperCase()})}</h4>
{isKnownSignature(cipherSuite) && (
<h4 className="paragraph-body-3">{t('mlsSignature', {signature: MLSPublicKeys[cipherSuite]})}</h4>
)}

{identity?.thumbprint && (
<>
Expand Down
Loading