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

Merge pull request #4010 from matrix-org/foldleft/11968-verify-verification

Browse source 
double-check user verification
This commit is contained in:
Zoe 2020-02-04 13:47:32 +00:00 • committed by GitHub
commit d822104159
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 118 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/components/views/messages/MKeyVerificationConclusion.js
View file

@ -32,6 +32,7 @@ export default class MKeyVerificationConclusion extends React.Component {
if (request) {
request.on("change", this._onRequestChanged);
}
MatrixClientPeg.get().on("userTrustStatusChanged", this._onTrustChanged);
}
componentWillUnmount() {
@ -39,12 +40,22 @@ export default class MKeyVerificationConclusion extends React.Component {
if (request) {
request.off("change", this._onRequestChanged);
}
MatrixClientPeg.removeListener("userTrustStatusChanged", this._onTrustChanged);
}
_onRequestChanged = () => {
this.forceUpdate();
};
_onTrustChanged = (userId, status) => {
const { mxEvent } = this.props;
const request = mxEvent.verificationRequest;
if (!request || request.otherUserId !== userId) {
return;
}
this.forceUpdate();
};
_shouldRender(mxEvent, request) {
// normally should not happen
if (!request) {
@ -63,6 +74,14 @@ export default class MKeyVerificationConclusion extends React.Component {
if (request.pending) {
return false;
}
// User isn't actually verified
if (!MatrixClientPeg.get()
.checkUserTrust(request.otherUserId)
.isCrossSigningVerified()) {
return false;
}
return true;
}