mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

isUntrusted: Return false if firstUse is true

Browse source 
Because users will see this upon first trying to communicate with a new
contact if they're quick about it.

FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-07-25 11:33:02 -07:00
parent f38d715250
commit ef3431af1b
2 changed files with 75 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
js/signal_protocol_store.js
View file

@ -726,7 +726,8 @@
var identityRecord = new IdentityRecord({id: identifier});
identityRecord.fetch().then(function() {
if (Date.now() - identityRecord.get('timestamp') < TIMESTAMP_THRESHOLD
&& !identityRecord.get('nonblockingApproval')) {
&& !identityRecord.get('nonblockingApproval')
&& !identityRecord.get('firstUse')) {
resolve(true);
} else {
resolve(false);

78
test/storage_test.js
View file

@ -6,6 +6,12 @@ describe("SignalProtocolStore", function() {
var identityKey;
var testKey;
function wrapDeferred(deferred) {
return new Promise(function(resolve, reject) {
return deferred.then(resolve, reject);
});
}
before(function(done) {
store = textsecure.storage.protocol;
identityKey = {
@ -360,11 +366,6 @@ describe("SignalProtocolStore", function() {
var newIdentity = libsignal.crypto.getRandomBytes(33);
var keychangeTriggered;
function wrapDeferred(deferred) {
return new Promise(function(resolve, reject) {
return deferred.then(resolve, reject);
});
}
function fetchRecord() {
return wrapDeferred(record.fetch());
}
@ -646,6 +647,73 @@ describe("SignalProtocolStore", function() {
});
});
describe('isUntrusted', function() {
it('returns false if identity key old enough', function() {
var record = new IdentityKeyRecord({
id : identifier,
publicKey : testKey.pubKey,
timestamp : Date.now() - 10 * 1000 * 60,
verified : store.VerifiedStatus.DEFAULT,
firstUse : false,
nonblockingApproval : false
});
return wrapDeferred(record.save()).then(function() {
return store.isUntrusted(identifier);
}).then(function(untrusted) {
assert.strictEqual(untrusted, false);
});
});
it('returns false if new but nonblockingApproval is true', function() {
var record = new IdentityKeyRecord({
id : identifier,
publicKey : testKey.pubKey,
timestamp : Date.now(),
verified : store.VerifiedStatus.DEFAULT,
firstUse : false,
nonblockingApproval : true
});
return wrapDeferred(record.save()).then(function() {
return store.isUntrusted(identifier);
}).then(function(untrusted) {
assert.strictEqual(untrusted, false);
});
});
it('returns false if new but firstUse is true', function() {
var record = new IdentityKeyRecord({
id : identifier,
publicKey : testKey.pubKey,
timestamp : Date.now(),
verified : store.VerifiedStatus.DEFAULT,
firstUse : true,
nonblockingApproval : false
});
return wrapDeferred(record.save()).then(function() {
return store.isUntrusted(identifier);
}).then(function(untrusted) {
assert.strictEqual(untrusted, false);
});
});
it('returns true if new, and no flags are set', function() {
var record = new IdentityKeyRecord({
id : identifier,
publicKey : testKey.pubKey,
timestamp : Date.now(),
verified : store.VerifiedStatus.DEFAULT,
firstUse : false,
nonblockingApproval : false
});
return wrapDeferred(record.save()).then(function() {
return store.isUntrusted(identifier);
}).then(function(untrusted) {
assert.strictEqual(untrusted, true);
});
});
});
describe('getVerified', function() {
before(function(done) {
store.setVerified(identifier, store.VerifiedStatus.VERIFIED).then(done, done);