colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more safeguards to isTrustedIdentity

Browse Source
This commit is contained in:
Ken Powers
2020-04-27 16:47:31 -04:00
committed by Scott Nonnenberg
parent 896dfcb43f
commit 1b5c36a9a8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/signal_protocol_store.js
View File

@@ -501,9 +501,11 @@
throw new Error('Tried to get identity key for undefined/null key'); throw new Error('Tried to get identity key for undefined/null key');
} }
const identifier = textsecure.utils.unencodeNumber(encodedAddress)[0]; const identifier = textsecure.utils.unencodeNumber(encodedAddress)[0];
const ourNumber = textsecure.storage.user.getNumber();
const ourUuid = textsecure.storage.user.getUuid();
const isOurIdentifier = const isOurIdentifier =
identifier === textsecure.storage.user.getNumber() || (ourNumber && identifier === ourNumber) ||
identifier === textsecure.storage.user.getUuid(); (ourUuid && identifier === ourUuid);
const identityRecord = this.getIdentityRecord(identifier); const identityRecord = this.getIdentityRecord(identifier);

4
ts/util/lint/exceptions.json
View File

@@ -317,9 +317,9 @@
"rule": "jQuery-load(", "rule": "jQuery-load(",
"path": "js/signal_protocol_store.js", "path": "js/signal_protocol_store.js",
"line": " await ConversationController.load();", "line": " await ConversationController.load();",
"lineNumber": 983, "lineNumber": 985,
"reasonCategory": "falseMatch", "reasonCategory": "falseMatch",
"updated": "2020-02-28T18:14:42.951Z" "updated": "2020-04-27T20:02:20.424Z"
}, },
{ {
"rule": "DOM-innerHTML", "rule": "DOM-innerHTML",