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

Refactor 'waiting' flags into one location, fix timestamp check

Browse source
This commit is contained in:
Scott Nonnenberg 2019-05-16 15:14:06 -07:00
parent fd36720079
commit e18b6bed1f
6 changed files with 39 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libtextsecure/message_receiver.js
View file

@ -1304,13 +1304,19 @@ MessageReceiver.prototype.extend({
// Note that messages may (generally) only perform one action and we ignore remaining
// fields after the first action.
const TIMESTAMP_VALIDATION = false;
if (TIMESTAMP_VALIDATION && envelope.timestamp !== decrypted.timestamp) {
throw new Error(
`Timestamp ${
decrypted.timestamp
} in DataMessage did not match envelope timestamp ${envelope.timestamp}`
);
if (window.TIMESTAMP_VALIDATION) {
const envelopeTimestamp = envelope.timestamp.toNumber();
const decryptedTimestamp = decrypted.timestamp.toNumber();
if (envelopeTimestamp !== decryptedTimestamp) {
throw new Error(
`Timestamp ${
decrypted.timestamp
} in DataMessage did not match envelope timestamp ${
envelope.timestamp
}`
);
}
}
if (decrypted.flags == null) {

2
libtextsecure/sendmessage.js
View file

@ -185,7 +185,7 @@ MessageSender.prototype = {
},
getPaddedAttachment(data, shouldPad) {
if (!shouldPad) {
if (!window.PAD_ALL_ATTACHMENTS && !shouldPad) {
return data;
}