PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3860 from matrix-org/jryans/disable-key-request

Browse source 
Disable key request dialogs with cross-signing
This commit is contained in:
J. Ryan Stinnett 2020-01-17 14:24:23 +00:00 committed by GitHub
commit 1a6be3addd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/KeyRequestHandler.js
View file

@ -1,5 +1,6 @@
/* /*
Copyright 2017 Vector Creations Ltd Copyright 2017 Vector Creations Ltd
Copyright 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -16,7 +17,10 @@ limitations under the License.
import * as sdk from './index'; import * as sdk from './index';
import Modal from './Modal'; import Modal from './Modal';
import SettingsStore from './settings/SettingsStore';
// TODO: We can remove this once cross-signing is the only way.
// https://github.com/vector-im/riot-web/issues/11908
export default class KeyRequestHandler { export default class KeyRequestHandler {
constructor(matrixClient) { constructor(matrixClient) {
this._matrixClient = matrixClient; this._matrixClient = matrixClient;
@ -30,6 +34,11 @@ export default class KeyRequestHandler {
} }
handleKeyRequest(keyRequest) { handleKeyRequest(keyRequest) {
// Ignore own device key requests if cross-signing lab enabled
if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
return;
}
const userId = keyRequest.userId; const userId = keyRequest.userId;
const deviceId = keyRequest.deviceId; const deviceId = keyRequest.deviceId;
const requestId = keyRequest.requestId; const requestId = keyRequest.requestId;
@ -60,6 +69,11 @@ export default class KeyRequestHandler {
} }
handleKeyRequestCancellation(cancellation) { handleKeyRequestCancellation(cancellation) {
// Ignore own device key requests if cross-signing lab enabled
if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
return;
}
// see if we can find the request in the queue // see if we can find the request in the queue
const userId = cancellation.userId; const userId = cancellation.userId;
const deviceId = cancellation.deviceId; const deviceId = cancellation.deviceId;

2
src/components/structures/MatrixChat.js
View file

@ -1383,6 +1383,8 @@ export default createReactClass({
cli.on("Session.logged_out", () => dft.stop()); cli.on("Session.logged_out", () => dft.stop());
cli.on("Event.decrypted", (e, err) => dft.eventDecrypted(e, err)); cli.on("Event.decrypted", (e, err) => dft.eventDecrypted(e, err));
// TODO: We can remove this once cross-signing is the only way.
// https://github.com/vector-im/riot-web/issues/11908
const krh = new KeyRequestHandler(cli); const krh = new KeyRequestHandler(cli);
cli.on("crypto.roomKeyRequest", (req) => { cli.on("crypto.roomKeyRequest", (req) => {
krh.handleKeyRequest(req); krh.handleKeyRequest(req);

3
src/components/views/dialogs/KeyShareDialog.js
View file

@ -22,6 +22,9 @@ import * as sdk from '../../../index';
import { _t, _td } from '../../../languageHandler'; import { _t, _td } from '../../../languageHandler';
// TODO: We can remove this once cross-signing is the only way.
// https://github.com/vector-im/riot-web/issues/11908
/** /**
* Dialog which asks the user whether they want to share their keys with * Dialog which asks the user whether they want to share their keys with
* an unverified device. * an unverified device.