rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2608 from robintown/fix-rageshakes

Browse Source 
Fix rageshakes
This commit is contained in:
Robin
2024-09-03 16:23:30 -04:00
committed by GitHub
parent 57e1434fec 0d007f49ec
commit 4157ad071a
1 changed files with 88 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
src/settings/submit-rageshake.ts
View File

@@ -18,9 +18,13 @@ import { ComponentProps, useCallback, useEffect, useState } from "react";
// eslint-disable-next-line @typescript-eslint/ban-ts-comment // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore // @ts-ignore
import pako from "pako"; import pako from "pako";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { ClientEvent } from "matrix-js-sdk/src/client";
import { logger } from "matrix-js-sdk/src/logger"; import { logger } from "matrix-js-sdk/src/logger";
import {
ClientEvent,
Crypto,
MatrixClient,
MatrixEvent,
} from "matrix-js-sdk/src/matrix";
import { getLogsForReport } from "./rageshake"; import { getLogsForReport } from "./rageshake";
import { useClient } from "../ClientContext"; import { useClient } from "../ClientContext";
@@ -35,6 +39,84 @@ const gzip = (text: string): Blob => {
return new Blob([pako.gzip(buf)]); return new Blob([pako.gzip(buf)]);
}; };
/**
* Collects crypto related information.
*/
async function collectCryptoInfo(
cryptoApi: Crypto.CryptoApi,
body: FormData,
): Promise<void> {
body.append("crypto_version", cryptoApi.getVersion());
const ownDeviceKeys = await cryptoApi.getOwnDeviceKeys();
const keys = [
`curve25519:${ownDeviceKeys.curve25519}`,
`ed25519:${ownDeviceKeys.ed25519}`,
];
body.append("device_keys", keys.join(", "));
// add cross-signing status information
const crossSigningStatus = await cryptoApi.getCrossSigningStatus();
body.append(
"cross_signing_ready",
String(await cryptoApi.isCrossSigningReady()),
);
body.append(
"cross_signing_key",
(await cryptoApi.getCrossSigningKeyId()) ?? "n/a",
);
body.append(
"cross_signing_privkey_in_secret_storage",
String(crossSigningStatus.privateKeysInSecretStorage),
);
body.append(
"cross_signing_master_privkey_cached",
String(crossSigningStatus.privateKeysCachedLocally.masterKey),
);
body.append(
"cross_signing_self_signing_privkey_cached",
String(crossSigningStatus.privateKeysCachedLocally.selfSigningKey),
);
body.append(
"cross_signing_user_signing_privkey_cached",
String(crossSigningStatus.privateKeysCachedLocally.userSigningKey),
);
}
/**
* Collects information about secret storage and backup.
*/
async function collectRecoveryInfo(
client: MatrixClient,
cryptoApi: Crypto.CryptoApi,
body: FormData,
): Promise<void> {
const secretStorage = client.secretStorage;
body.append(
"secret_storage_ready",
String(await cryptoApi.isSecretStorageReady()),
);
body.append(
"secret_storage_key_in_account",
String(await secretStorage.hasKey()),
);
body.append(
"session_backup_key_in_secret_storage",
String(!!(await client.isKeyBackupKeyStored())),
);
const sessionBackupKeyFromCache =
await cryptoApi.getSessionBackupPrivateKey();
body.append("session_backup_key_cached", String(!!sessionBackupKeyFromCache));
body.append(
"session_backup_key_well_formed",
String(sessionBackupKeyFromCache instanceof Uint8Array),
);
}
interface RageShakeSubmitOptions { interface RageShakeSubmitOptions {
sendLogs: boolean; sendLogs: boolean;
rageshakeRequestId?: string; rageshakeRequestId?: string;
@@ -120,90 +202,10 @@ export function useSubmitRageshake(): {
body.append("room_id", opts.roomId); body.append("room_id", opts.roomId);
} }
if (client.isCryptoEnabled()) { const crypto = client.getCrypto();
const keys = [`ed25519:${client.getDeviceEd25519Key()}`]; if (crypto) {
if (client.getDeviceCurve25519Key) { await collectCryptoInfo(crypto, body);
keys.push(`curve25519:${client.getDeviceCurve25519Key()}`); await collectRecoveryInfo(client, crypto, body);
}
body.append("device_keys", keys.join(", "));
body.append("cross_signing_key", client.getCrossSigningId()!);
// add cross-signing status information
const crossSigning = client.crypto!.crossSigningInfo;
const secretStorage = client.crypto!.secretStorage;
body.append(
"cross_signing_ready",
String(await client.isCrossSigningReady()),
);
body.append(
"cross_signing_supported_by_hs",
String(
await client.doesServerSupportUnstableFeature(
"org.matrix.e2e_cross_signing",
),
),
);
body.append("cross_signing_key", crossSigning.getId()!);
body.append(
"cross_signing_privkey_in_secret_storage",
String(
!!(await crossSigning.isStoredInSecretStorage(secretStorage)),
),
);
const pkCache = client.getCrossSigningCacheCallbacks();
body.append(
"cross_signing_master_privkey_cached",
String(
!!(
pkCache?.getCrossSigningKeyCache &&
(await pkCache.getCrossSigningKeyCache("master"))
),
),
);
body.append(
"cross_signing_self_signing_privkey_cached",
String(
!!(
pkCache?.getCrossSigningKeyCache &&
(await pkCache.getCrossSigningKeyCache("self_signing"))
),
),
);
body.append(
"cross_signing_user_signing_privkey_cached",
String(
!!(
pkCache?.getCrossSigningKeyCache &&
(await pkCache.getCrossSigningKeyCache("user_signing"))
),
),
);
body.append(
"secret_storage_ready",
String(await client.isSecretStorageReady()),
);
body.append(
"secret_storage_key_in_account",
String(!!(await secretStorage.hasKey())),
);
body.append(
"session_backup_key_in_secret_storage",
String(!!(await client.isKeyBackupKeyStored())),
);
const sessionBackupKeyFromCache =
await client.crypto!.getSessionBackupPrivateKey();
body.append(
"session_backup_key_cached",
String(!!sessionBackupKeyFromCache),
);
body.append(
"session_backup_key_well_formed",
String(sessionBackupKeyFromCache instanceof Uint8Array),
);
} }
} }