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

NullMessage sent before verification sync should not be silent (#1857)

Browse source
This commit is contained in:
Scott Nonnenberg 2017-12-04 15:28:38 -08:00 • committed by GitHub
parent c195ba2630
commit 2fdb048721
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 72 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

68
js/libtextsecure.js
View file

@ -39085,8 +39085,7 @@ MessageReceiver.prototype.extend({
console.log('Got SyncMessage Request'); console.log('Got SyncMessage Request');
return this.removeFromCache(envelope); return this.removeFromCache(envelope);
} else if (syncMessage.read && syncMessage.read.length) { } else if (syncMessage.read && syncMessage.read.length) {
console.log('read messages', console.log('read messages from', this.getEnvelopeId(envelope));
'from', envelope.source + '.' + envelope.sourceDevice);
return this.handleRead(envelope, syncMessage.read); return this.handleRead(envelope, syncMessage.read);
} else if (syncMessage.verified) { } else if (syncMessage.verified) {
return this.handleVerified(envelope, syncMessage.verified); return this.handleVerified(envelope, syncMessage.verified);
@ -40095,39 +40094,44 @@ MessageSender.prototype = {
syncVerification: function(destination, state, identityKey) { syncVerification: function(destination, state, identityKey) {
var myNumber = textsecure.storage.user.getNumber(); var myNumber = textsecure.storage.user.getNumber();
var myDevice = textsecure.storage.user.getDeviceId(); var myDevice = textsecure.storage.user.getDeviceId();
if (myDevice != 1) { var now = Date.now();
// First send a null message to mask the sync message.
var nullMessage = new textsecure.protobuf.NullMessage();
// Generate a random int from 1 and 512 if (myDevice === 1) {
var buffer = libsignal.crypto.getRandomBytes(1); return Promise.resolve();
var paddingLength = (new Uint8Array(buffer)[0] & 0x1ff) + 1;
// Generate a random padding buffer of the chosen size
nullMessage.padding = libsignal.crypto.getRandomBytes(paddingLength);
var contentMessage = new textsecure.protobuf.Content();
contentMessage.nullMessage = nullMessage;
var silent = true;
return this.sendIndividualProto(destination, contentMessage, Date.now(), silent).then(function() {
var verified = new textsecure.protobuf.Verified();
verified.state = state;
verified.destination = destination;
verified.identityKey = identityKey;
verified.nullMessage = nullMessage.padding;
var syncMessage = this.createSyncMessage();
syncMessage.verified = verified;
var contentMessage = new textsecure.protobuf.Content();
contentMessage.syncMessage = syncMessage;
return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent);
}.bind(this));
} }
return Promise.resolve(); // First send a null message to mask the sync message.
var nullMessage = new textsecure.protobuf.NullMessage();
// Generate a random int from 1 and 512
var buffer = libsignal.crypto.getRandomBytes(1);
var paddingLength = (new Uint8Array(buffer)[0] & 0x1ff) + 1;
// Generate a random padding buffer of the chosen size
nullMessage.padding = libsignal.crypto.getRandomBytes(paddingLength);
var contentMessage = new textsecure.protobuf.Content();
contentMessage.nullMessage = nullMessage;
// We want the NullMessage to look like a normal outgoing message; not silent
const promise = this.sendIndividualProto(destination, contentMessage, now);
return promise.then(function() {
var verified = new textsecure.protobuf.Verified();
verified.state = state;
verified.destination = destination;
verified.identityKey = identityKey;
verified.nullMessage = nullMessage.padding;
var syncMessage = this.createSyncMessage();
syncMessage.verified = verified;
var contentMessage = new textsecure.protobuf.Content();
contentMessage.syncMessage = syncMessage;
var silent = true;
return this.sendIndividualProto(myNumber, contentMessage, now, silent);
}.bind(this));
}, },
sendGroupProto: function(numbers, proto, timestamp) { sendGroupProto: function(numbers, proto, timestamp) {

3
libtextsecure/message_receiver.js
View file

@ -618,8 +618,7 @@ MessageReceiver.prototype.extend({
console.log('Got SyncMessage Request'); console.log('Got SyncMessage Request');
return this.removeFromCache(envelope); return this.removeFromCache(envelope);
} else if (syncMessage.read && syncMessage.read.length) { } else if (syncMessage.read && syncMessage.read.length) {
console.log('read messages', console.log('read messages from', this.getEnvelopeId(envelope));
'from', envelope.source + '.' + envelope.sourceDevice);
return this.handleRead(envelope, syncMessage.read); return this.handleRead(envelope, syncMessage.read);
} else if (syncMessage.verified) { } else if (syncMessage.verified) {
return this.handleVerified(envelope, syncMessage.verified); return this.handleVerified(envelope, syncMessage.verified);

65
libtextsecure/sendmessage.js
View file

@ -420,39 +420,44 @@ MessageSender.prototype = {
syncVerification: function(destination, state, identityKey) { syncVerification: function(destination, state, identityKey) {
var myNumber = textsecure.storage.user.getNumber(); var myNumber = textsecure.storage.user.getNumber();
var myDevice = textsecure.storage.user.getDeviceId(); var myDevice = textsecure.storage.user.getDeviceId();
if (myDevice != 1) { var now = Date.now();
// First send a null message to mask the sync message.
var nullMessage = new textsecure.protobuf.NullMessage();
// Generate a random int from 1 and 512 if (myDevice === 1) {
var buffer = libsignal.crypto.getRandomBytes(1); return Promise.resolve();
var paddingLength = (new Uint8Array(buffer)[0] & 0x1ff) + 1;
// Generate a random padding buffer of the chosen size
nullMessage.padding = libsignal.crypto.getRandomBytes(paddingLength);
var contentMessage = new textsecure.protobuf.Content();
contentMessage.nullMessage = nullMessage;
var silent = true;
return this.sendIndividualProto(destination, contentMessage, Date.now(), silent).then(function() {
var verified = new textsecure.protobuf.Verified();
verified.state = state;
verified.destination = destination;
verified.identityKey = identityKey;
verified.nullMessage = nullMessage.padding;
var syncMessage = this.createSyncMessage();
syncMessage.verified = verified;
var contentMessage = new textsecure.protobuf.Content();
contentMessage.syncMessage = syncMessage;
return this.sendIndividualProto(myNumber, contentMessage, Date.now(), silent);
}.bind(this));
} }
return Promise.resolve(); // First send a null message to mask the sync message.
var nullMessage = new textsecure.protobuf.NullMessage();
// Generate a random int from 1 and 512
var buffer = libsignal.crypto.getRandomBytes(1);
var paddingLength = (new Uint8Array(buffer)[0] & 0x1ff) + 1;
// Generate a random padding buffer of the chosen size
nullMessage.padding = libsignal.crypto.getRandomBytes(paddingLength);
var contentMessage = new textsecure.protobuf.Content();
contentMessage.nullMessage = nullMessage;
// We want the NullMessage to look like a normal outgoing message; not silent
const promise = this.sendIndividualProto(destination, contentMessage, now);
return promise.then(function() {
var verified = new textsecure.protobuf.Verified();
verified.state = state;
verified.destination = destination;
verified.identityKey = identityKey;
verified.nullMessage = nullMessage.padding;
var syncMessage = this.createSyncMessage();
syncMessage.verified = verified;
var contentMessage = new textsecure.protobuf.Content();
contentMessage.syncMessage = syncMessage;
var silent = true;
return this.sendIndividualProto(myNumber, contentMessage, now, silent);
}.bind(this));
}, },
sendGroupProto: function(numbers, proto, timestamp) { sendGroupProto: function(numbers, proto, timestamp) {