imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5574 from matrix-org/jryans/verify-require-reg

Browse source 
Require registration for verification actions
This commit is contained in:
J. Ryan Stinnett 2021-01-26 11:58:59 +00:00 • committed by GitHub
commit e327551399
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/verification.js
View file

@ -74,6 +74,10 @@ function UntrustedDeviceDialog(props) {
export async function verifyDevice(user, device) { export async function verifyDevice(user, device) {
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
if (cli.isGuest()) {
dis.dispatch({action: 'require_registration'});
return;
}
// if cross-signing is not explicitly disabled, check if it should be enabled first. // if cross-signing is not explicitly disabled, check if it should be enabled first.
if (cli.getCryptoTrustCrossSignedDevices()) { if (cli.getCryptoTrustCrossSignedDevices()) {
if (!await enable4SIfNeeded()) { if (!await enable4SIfNeeded()) {
@ -113,6 +117,10 @@ export async function verifyDevice(user, device) {
export async function legacyVerifyUser(user) { export async function legacyVerifyUser(user) {
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
if (cli.isGuest()) {
dis.dispatch({action: 'require_registration'});
return;
}
// if cross-signing is not explicitly disabled, check if it should be enabled first. // if cross-signing is not explicitly disabled, check if it should be enabled first.
if (cli.getCryptoTrustCrossSignedDevices()) { if (cli.getCryptoTrustCrossSignedDevices()) {
if (!await enable4SIfNeeded()) { if (!await enable4SIfNeeded()) {
@ -128,6 +136,11 @@ export async function legacyVerifyUser(user) {
} }
export async function verifyUser(user) { export async function verifyUser(user) {
const cli = MatrixClientPeg.get();
if (cli.isGuest()) {
dis.dispatch({action: 'require_registration'});
return;
}
if (!await enable4SIfNeeded()) { if (!await enable4SIfNeeded()) {
return; return;
} }