Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Remove dependency on org.matrix.e2e_cross_signing unstable feature #10593

Merged
merged 2 commits into from
Apr 14, 2023
Merged

Remove dependency on org.matrix.e2e_cross_signing unstable feature #10593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeeb054
Remove dependency on `org.matrix.e2e_cross_signing` unstable feature
richvdh Apr 13, 2023
b4bd64c
fix unit test
richvdh Apr 13, 2023
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
3 changes: 2 additions & 1 deletion src/DeviceListener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@ export default class DeviceListener {
if (!this.running) return; // we have been stopped
const cli = MatrixClientPeg.get();

if (!(await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing"))) return;
// cross-signing support was added to Matrix in MSC1756, which landed in spec v1.1
if (!(await cli.isVersionSupported("v1.1"))) return;

if (!cli.isCryptoEnabled()) return;
// don't recheck until the initial sync is complete: lots of account data events will fire
Expand Down
4 changes: 0 additions & 4 deletions src/rageshake/submit-rageshake.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ async function collectBugReport(opts: IOpts = {}, gzipLogs = true): Promise<Form
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() ?? "n/a");
body.append(
"cross_signing_privkey_in_secret_storage",
Expand Down
3 changes: 0 additions & 3 deletions src/sentry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,6 @@ async function getCryptoContext(client: MatrixClient): Promise<CryptoContext> {
return {
device_keys: keys.join(", "),
cross_signing_ready: String(await client.isCrossSigningReady()),
cross_signing_supported_by_hs: String(
await client.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing"),
),
cross_signing_key: crossSigning.getId()!,
cross_signing_privkey_in_secret_storage: String(!!(await crossSigning.isStoredInSecretStorage(secretStorage))),
cross_signing_master_privkey_cached: String(!!(pkCache && (await pkCache.getCrossSigningKeyCache?.("master")))),
Expand Down
5 changes: 3 additions & 2 deletions test/DeviceListener-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ describe("DeviceListener", () => {
getUserId: jest.fn().mockReturnValue(userId),
getKeyBackupVersion: jest.fn().mockResolvedValue(undefined),
getRooms: jest.fn().mockReturnValue([]),
doesServerSupportUnstableFeature: jest.fn().mockResolvedValue(true),
isVersionSupported: jest.fn().mockResolvedValue(true),
isCrossSigningReady: jest.fn().mockResolvedValue(true),
isSecretStorageReady: jest.fn().mockResolvedValue(true),
isCryptoEnabled: jest.fn().mockReturnValue(true),
Expand Down Expand Up @@ -234,9 +234,10 @@ describe("DeviceListener", () => {

describe("recheck", () => {
it("does nothing when cross signing feature is not supported", async () => {
mockClient!.doesServerSupportUnstableFeature.mockResolvedValue(false);
mockClient!.isVersionSupported.mockResolvedValue(false);
await createAndStart();

expect(mockClient!.isVersionSupported).toHaveBeenCalledWith("v1.1");
expect(mockClient!.isCrossSigningReady).not.toHaveBeenCalled();
});
it("does nothing when crypto is not enabled", async () => {
Expand Down