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

Switch from fingerprints to safety numbers

This commit is contained in:
lilia 2016-09-18 15:16:39 -07:00
parent 7fe708d195
commit f05d693994
5 changed files with 66 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_locales/en/messages.json
View File

@ -468,5 +468,15 @@
"example": "John"
}
}
},
"yourSafetyNumberWith": {
"message": "Your safety number with $name$",
"description": "Heading for safety number view",
"placeholders": {
"name": {
"content": "$1",
"example": "John"
}
}
}
}

19
background.html
View File

@ -299,26 +299,15 @@
</div>
</script>
<script type='text/x-tmpl-mustache' id='key_verification'>
<label> {{theirIdentity}} </label>
{{ ^their_key }}
{{ ^has_their_key }}
<div class='placeholder'>{{ their_key_unknown }}</div>
{{ /their_key }}
{{ /has_their_key }}
{{ #has_their_key }}
<label> {{ yourSafetyNumberWith }} </label>
<div class='key'>
{{ #their_key }} <span>{{ . }}</span> {{ /their_key }}
{{ #chunks }} <span>{{ . }}</span> {{ /chunks }}
</div>
{{ /has_their_key }}
<label> {{yourIdentity}} </label>
<div class='key'>
{{ #your_key }} <span>{{ . }}</span> {{ /your_key }}
</div>
<div class='securityNumber'></div>
</script>
<script type='text/x-tmpl-mustache' id='security_number'>
<label> Security number </label>
<div class='key'>
{{ #chunks }} <span>{{ . }}</span> {{ /chunks }}
</div>
</script>
<!-- index -->
<script type='text/x-tmpl-mustache' id='group_info_input'>

2
js/views/conversation_view.js
View File

@ -259,7 +259,7 @@
}
if (model) {
var view = new Whisper.KeyVerificationPanelView({
model: { their_number: model.id }
model: model
});
this.listenBack(view);
}

6
js/views/key_conflict_dialogue_view.js
View File

@ -14,10 +14,8 @@
this.conversation = options.conversation;
this.render();
var view = new Whisper.KeyVerificationView({
model: {
their_number: this.model.number,
their_key : this.model.identityKey,
}
model : this.contact,
newKey : this.model.identityKey
});
view.$el.appendTo(this.$('.keys'));
},

128
js/views/key_verification_view.js
View File

@ -5,94 +5,64 @@
'use strict';
window.Whisper = window.Whisper || {};
var SecurityNumberView = Whisper.View.extend({
className: 'securityNumber',
templateName: 'security_number',
initialize: function() {
this.generateSecurityNumber();
Whisper.KeyVerificationView = Whisper.View.extend({
className: 'key-verification',
templateName: 'key_verification',
initialize: function(options) {
this.our_number = textsecure.storage.user.getNumber();
if (options.newKey) {
this.their_key = options.newKey;
}
Promise.all([
this.loadTheirKey(),
this.loadOurKey(),
]).then(this.generateSecurityNumber.bind(this))
.then(this.render.bind(this));
},
loadTheirKey: function() {
if (this.their_key) {
return Promise.resolve(this.their_key);
} else {
return textsecure.storage.protocol.loadIdentityKey(
this.model.id
).then(function(their_key) {
this.their_key = their_key;
}.bind(this));
}
},
loadOurKey: function() {
if (this.our_key) {
return Promise.resolve(this.our_key);
} else {
return textsecure.storage.protocol.loadIdentityKey(
this.our_number
).then(function(our_key) {
this.our_key = our_key;
}.bind(this));
}
},
generateSecurityNumber: function() {
new libsignal.FingerprintGenerator(5200).createFor(
this.model.your_number,
this.model.your_key,
this.model.their_number,
this.model.their_key
).then(this.handleSecurityNumber.bind(this));
},
handleSecurityNumber: function(securityNumber) {
this.model.securityNumber = securityNumber;
this.render();
return new libsignal.FingerprintGenerator(5200).createFor(
this.our_number, this.our_key, this.model.id, this.their_key
).then(function(securityNumber) {
this.securityNumber = securityNumber;
}.bind(this));
},
render_attributes: function() {
var s = this.model.securityNumber;
var s = this.securityNumber;
var chunks = [];
for (var i = 0; i < s.length; i += 5) {
chunks.push(s.substring(i, i+5));
}
return { chunks: chunks };
}
});
Whisper.KeyVerificationView = Whisper.View.extend({
className: 'key-verification',
templateName: 'key_verification',
initialize: function() {
Promise.all([
this.loadTheirKey(),
this.loadOurKey(),
]).then(function() {
this.render();
/*
this.$('.securityNumber').append(
new SecurityNumberView({model: this.model}).el
);
*/
}.bind(this));
},
setOurKey: function(our_key) {
this.model.your_key = our_key;
},
setTheirKey: function(their_key) {
this.model.their_key = their_key;
},
loadTheirKey: function() {
if (this.model.their_key) {
return Promise.resolve(this.model.their_key);
} else {
return textsecure.storage.protocol.loadIdentityKey(
this.model.their_number
).then(this.setTheirKey.bind(this));
}
},
loadOurKey: function() {
if (this.model.your_key) {
return Promise.resolve(this.model.your_key);
} else {
return textsecure.storage.protocol.loadIdentityKey(
textsecure.storage.user.getNumber()
).then(this.setOurKey.bind(this));
}
},
splitKey: function(key) {
// key is an array buffer
var bytes = new Uint8Array(key);
var octets = [];
for (var i = 0; i < bytes.byteLength; ++i) {
octets.push(('0' + bytes[i].toString(16)).slice(-2));
}
return octets;
},
render_attributes: function() {
var yourSafetyNumberWith = i18n(
'yourSafetyNumberWith', this.model.getTitle()
);
return {
learnMore : i18n('learnMore'),
verifyIdentity: i18n('verifyIdentity'),
yourIdentity: i18n('yourIdentity'),
theirIdentity: i18n('theirIdentity'),
their_key_unknown: i18n('theirIdentityUnknown'),
your_key: this.splitKey(this.model.your_key),
their_key: this.splitKey(this.model.their_key),
has_their_key: this.model.their_key !== undefined
learnMore : i18n('learnMore'),
their_key_unknown : i18n('theirIdentityUnknown'),
yourSafetyNumberWith : i18n('yourSafetyNumberWith', this.model.getTitle()),
has_their_key : this.their_key !== undefined,
chunks : chunks,
};
}
});