jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop support for invalid `image/jpg` MIME type

This commit is contained in:
Daniel Gasienica 2018-02-13 10:37:11 -05:00
parent 69fe96581f
commit 4a7156327e
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/modules/types/mime.js
View File

@ -1,3 +1,2 @@
exports.isJPEG = mimeType =>
mimeType === 'image/jpeg' ||
mimeType === 'image/jpg';
mimeType === 'image/jpeg';

8
libtextsecure/test/contacts_parser_test.js
View File

@ -17,7 +17,7 @@ describe("ContactBuffer", function() {
var contactInfo = new textsecure.protobuf.ContactDetails({
name: "Zero Cool",
number: "+10000000000",
avatar: { contentType: "image/jpg", length: avatarLen }
avatar: { contentType: "image/jpeg", length: avatarLen }
});
var contactInfoBuffer = contactInfo.encode().toArrayBuffer();
@ -41,7 +41,7 @@ describe("ContactBuffer", function() {
count++;
assert.strictEqual(contact.name, "Zero Cool");
assert.strictEqual(contact.number, "+10000000000");
assert.strictEqual(contact.avatar.contentType, "image/jpg");
assert.strictEqual(contact.avatar.contentType, "image/jpeg");
assert.strictEqual(contact.avatar.length, 255);
assert.strictEqual(contact.avatar.data.byteLength, 255);
var avatarBytes = new Uint8Array(contact.avatar.data);
@ -68,7 +68,7 @@ describe("GroupBuffer", function() {
id: new Uint8Array([1, 3, 3, 7]).buffer,
name: "Hackers",
members: ['cereal', 'burn', 'phreak', 'joey'],
avatar: { contentType: "image/jpg", length: avatarLen }
avatar: { contentType: "image/jpeg", length: avatarLen }
});
var groupInfoBuffer = groupInfo.encode().toArrayBuffer();
@ -93,7 +93,7 @@ describe("GroupBuffer", function() {
assert.strictEqual(group.name, "Hackers");
assertEqualArrayBuffers(group.id.toArrayBuffer(), new Uint8Array([1,3,3,7]).buffer);
assert.sameMembers(group.members, ['cereal', 'burn', 'phreak', 'joey']);
assert.strictEqual(group.avatar.contentType, "image/jpg");
assert.strictEqual(group.avatar.contentType, "image/jpeg");
assert.strictEqual(group.avatar.length, 255);
assert.strictEqual(group.avatar.data.byteLength, 255);
var avatarBytes = new Uint8Array(group.avatar.data);

17
test/modules/types/mime_test.js
View File

@ -9,11 +9,18 @@ describe('MIME', () => {
assert.isTrue(MIME.isJPEG('image/jpeg'));
});
it('should return true for `image/jpg`', () => {
assert.isTrue(MIME.isJPEG('image/jpeg'));
});
['image/gif', 'image/tiff', 'application/json', 0, false, null, undefined]
[
'jpg',
'jpeg',
'image/jpg', // invalid MIME type: https://stackoverflow.com/a/37266399/125305
'image/gif',
'image/tiff',
'application/json',
0,
false,
null,
undefined,
]
.forEach((value) => {
it(`should return false for \`${value}\``, () => {
assert.isFalse(MIME.isJPEG(value));