thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix bug in identity key conflict edge case

Browse source 
When resolving conflicts, we should not only discard the old key, but
set the new trusted key to the one the user has verified. Previously, we
would end up trusting the first-seen new key, which may not be the one
the user verified.

 // FREEBIE
This commit is contained in:
lilia 2015-07-31 11:14:43 -07:00
parent d808d255eb
commit ccfae3c78a
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
js/models/conversations.js
View file

@ -258,7 +258,9 @@
}
},
resolveConflicts: function(number) {
resolveConflicts: function(conflict) {
var number = conflict.number;
var identityKey = conflict.identityKey;
if (this.isPrivate()) {
number = this.id;
} else if (!_.include(this.get('members'), number)) {
@ -270,11 +272,13 @@
}
return textsecure.storage.axolotl.removeIdentityKey(number).then(function() {
this.messageCollection.each(function(message) {
if (message.hasKeyConflict(number)) {
message.resolveConflict(number);
}
});
return textsecure.storage.axolotl.putIdentityKey(number, identityKey).then(function() {
this.messageCollection.each(function(message) {
if (message.hasKeyConflict(number)) {
message.resolveConflict(number);
}
});
}.bind(this));
}.bind(this));
},
hashCode: function() {

2
js/views/key_conflict_dialogue_view.js
View file

@ -41,7 +41,7 @@
},
resolve: function() {
new Promise(function(resolve) {
this.conversation.resolveConflicts(this.model.number).then(resolve);
this.conversation.resolveConflicts(this.model).then(resolve);
}.bind(this));
this.trigger('resolve');
this.remove();