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

Move envelope decode before ack

Browse source 
We should not ack envelope protobufs that fail to decode correctly. If
the server happens to send us such a thing it probably indicates a
protocol mismatch between it and the client, in which case the client
needs to update and re-receive the failed message.

// FREEBIE
This commit is contained in:
lilia 2016-01-11 12:08:54 -08:00
parent 44824df6cb
commit 96520e9fd4
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
js/libtextsecure.js
View file

@ -36795,11 +36795,12 @@ MessageReceiver.prototype = {
// TODO: handle different types of requests. for now we blindly assume
// PUT /messages <encrypted Envelope>
textsecure.crypto.decryptWebsocketMessage(request.body, this.signalingKey).then(function(plaintext) {
var envelope = textsecure.protobuf.Envelope.decode(plaintext);
// After this point, decoding errors are not the server's
// fault, and we should handle them gracefully and tell the
// user they received an invalid message
request.respond(200, 'OK');
this.queueEnvelope(plaintext);
this.queueEnvelope(envelope);
}.bind(this)).catch(function(e) {
request.respond(500, 'Bad encrypted websocket message');
@ -36813,9 +36814,7 @@ MessageReceiver.prototype = {
var handleEnvelope = this.handleEnvelope.bind(this, envelope);
this.pending = this.pending.then(handleEnvelope, handleEnvelope);
},
handleEnvelope: function(encodedEnvelope) {
var envelope = textsecure.protobuf.Envelope.decode(encodedEnvelope);
handleEnvelope: function(envelope) {
if (envelope.type === textsecure.protobuf.Envelope.Type.RECEIPT) {
return this.onDeliveryReceipt(envelope);
} else if (envelope.content) {

7
libtextsecure/message_receiver.js
View file

@ -63,11 +63,12 @@ MessageReceiver.prototype = {
// TODO: handle different types of requests. for now we blindly assume
// PUT /messages <encrypted Envelope>
textsecure.crypto.decryptWebsocketMessage(request.body, this.signalingKey).then(function(plaintext) {
var envelope = textsecure.protobuf.Envelope.decode(plaintext);
// After this point, decoding errors are not the server's
// fault, and we should handle them gracefully and tell the
// user they received an invalid message
request.respond(200, 'OK');
this.queueEnvelope(plaintext);
this.queueEnvelope(envelope);
}.bind(this)).catch(function(e) {
request.respond(500, 'Bad encrypted websocket message');
@ -81,9 +82,7 @@ MessageReceiver.prototype = {
var handleEnvelope = this.handleEnvelope.bind(this, envelope);
this.pending = this.pending.then(handleEnvelope, handleEnvelope);
},
handleEnvelope: function(encodedEnvelope) {
var envelope = textsecure.protobuf.Envelope.decode(encodedEnvelope);
handleEnvelope: function(envelope) {
if (envelope.type === textsecure.protobuf.Envelope.Type.RECEIPT) {
return this.onDeliveryReceipt(envelope);
} else if (envelope.content) {