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

Verify makeAttachmentPointer and encryptAttachment arguments

Browse source 
The underlying `crypto.subtle.encrypt` API requires it.
This commit is contained in:
Daniel Gasienica 2018-03-16 15:32:54 -04:00
parent 8218e308cd
commit 32911002d4
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libtextsecure/crypto.js
View file

@ -87,6 +87,13 @@
},
encryptAttachment: function(plaintext, keys, iv) {
if (!(plaintext instanceof ArrayBuffer) && !ArrayBuffer.isView(plaintext)) {
throw new TypeError(
'`plaintext` must be an `ArrayBuffer` or `ArrayBufferView`; got: ' +
typeof plaintext
);
}
if (keys.byteLength != 64) {
throw new Error("Got invalid length attachment keys");
}

11
libtextsecure/sendmessage.js
View file

@ -116,10 +116,21 @@ function MessageSender(url, username, password, cdn_url) {
MessageSender.prototype = {
constructor: MessageSender,
// makeAttachmentPointer :: Attachment -> Promise AttachmentPointerProto
makeAttachmentPointer: function(attachment) {
if (typeof attachment !== 'object' || attachment == null) {
return Promise.resolve(undefined);
}
if (!(attachment.data instanceof ArrayBuffer) &&
!ArrayBuffer.isView(attachment.data)) {
return Promise.reject(new TypeError(
'`attachment.data` must be an `ArrayBuffer` or `ArrayBufferView`; got: ' +
typeof attachment.data
));
}
var proto = new textsecure.protobuf.AttachmentPointer();
proto.key = libsignal.crypto.getRandomBytes(64);