Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore some of the @icon checks until resolved #1325

Merged
merged 1 commit into from
Feb 10, 2018
Merged

Restore some of the @icon checks until resolved #1325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
239 changes: 124 additions & 115 deletions controllers/scriptStorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,121 +1381,130 @@ exports.storeScript = function (aUser, aMeta, aBuf, aUpdate, aCallback) {

aInnerCallback(null);
},
//
// See #1323
// function (aInnerCallback) {
// // `@icon` validations
// var icon = null;
// var buffer = null;
// var fn = null;
// var dimensions = null;
// var matches = null;
// var data = null;
// var rDataURIbase64 = /^data:image\/.+;base64,(.*)$/;
//
// function acceptedImage(aDimensions) {
// var maxX = 256; //px
// var maxY = 256; //px
//
// switch (aDimensions.type) {
// case 'gif':
// // fallthrough
// case 'jpeg':
// // fallthrough
// case 'png':
// // fallthrough
// case 'svg':
// // fallthrough
// case 'ico':
// if (dimensions.width <= maxX && dimensions.height <= maxY) {
// return true;
// }
// }
// return false;
// }
//
// icon = findMeta(aMeta, 'UserScript.icon.0.value');
// if (icon) {
// if (!isFQUrl(icon, false, true)) {
//
// // Not a web url... reject
// aInnerCallback(new statusError({
// message: '`@icon` not a web url or image data URI in the UserScript metadata block.',
// code: 400
// }), null);
// return;
// }
//
// // Test dimensions
// if (/^data:/.test(icon)) {
// matches = icon.match(rDataURIbase64);
// if (matches) {
// data = matches[1];
// buffer = new Buffer(data, 'base64');
// try {
// dimensions = sizeOf(buffer);
// } catch (aE) {
// aInnerCallback(new statusError({
// message: '`@icon` ' + aE.message,
// code: aE.code
// }));
// return;
// }
//
// if (!acceptedImage(dimensions)) {
// aInnerCallback(new statusError({
// message: '`@icon` unsupported file type or dimensions are too large.',
// code: 400
// }), null);
// } else {
// aInnerCallback(null);
// }
// } else {
// aInnerCallback(new statusError({
// message: 'Invalid `@icon`',
// code: 400
// }), null);
// }
// } else {
// fn = /^http:/.test(icon) ? http : https;
// fn.get(URL.parse(icon), function (aRes) {
// var chunks = [];
// aRes.on('data', function (aChunk) {
// var buf = null;
// chunks.push(aChunk);
// buf = Buffer.concat(chunks);
// if (buf.length > 3048) { // NOTE: KiB
// aRes.destroy();
// }
// }).on('end', function () {
// buffer = Buffer.concat(chunks);
// try {
// dimensions = sizeOf(buffer);
// } catch (aE) {
// aInnerCallback(new statusError({
// message: '`@icon` ' + aE.message,
// code: aE.code
// }));
// return;
// }
//
// if (!acceptedImage(dimensions)) {
// aInnerCallback(new statusError({
// message: '`@icon` unsupported file type or dimensions are too large.',
// code: 400
// }), null);
// } else {
// aInnerCallback(null);
// }
// }).on('error', function (aErr) {
// aInnerCallback(aErr);
// });
// });
// }
// } else {
// aInnerCallback(null);
// }
// },

function (aInnerCallback) {
// `@icon` validations
var icon = null;
var buffer = null;
var fn = null;
var dimensions = null;
var matches = null;
var data = null;
var rDataURIbase64 = /^data:image\/.+;base64,(.*)$/;

function acceptedImage(aDimensions) {
var maxX = 256; //px
var maxY = 256; //px

switch (aDimensions.type) {
case 'gif':
// fallthrough
case 'jpeg':
// fallthrough
case 'png':
// fallthrough
case 'svg':
// fallthrough
case 'ico':
if (dimensions.width <= maxX && dimensions.height <= maxY) {
return true;
}
}
return false;
}

icon = findMeta(aMeta, 'UserScript.icon.0.value');
if (icon) {
if (!isFQUrl(icon, false, true)) {

// Not a web url... reject
aInnerCallback(new statusError({
message: '`@icon` not a web url or image data URI in the UserScript metadata block.',
code: 400
}), null);
return;
}

// Test dimensions
if (/^data:/.test(icon)) {
matches = icon.match(rDataURIbase64);
if (matches) {
data = matches[1];
buffer = new Buffer(data, 'base64');
try {
dimensions = sizeOf(buffer);
} catch (aE) {
aInnerCallback(new statusError({
message: '`@icon` ' + aE.message,
code: aE.code
}));
return;
}

if (!acceptedImage(dimensions)) {
aInnerCallback(new statusError({
message: '`@icon` unsupported file type or dimensions are too large.',
code: 400
}), null);
} else {
aInnerCallback(null);
}
} else {
aInnerCallback(new statusError({
message: 'Invalid `@icon`',
code: 400
}), null);
}
} else {
fn = /^http:/.test(icon) ? http : https;

// Workaround for #1323
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skipping https here until resolved.

if (fn === https) {
aInnerCallback(null); // NOTE: Suspending further checks
return;
}
// /Workaround for #1323

fn.get(URL.parse(icon), function (aRes) {
var chunks = [];
aRes.on('data', function (aChunk) {
var buf = null;
chunks.push(aChunk);
buf = Buffer.concat(chunks);
if (buf.length > 3048) {
aRes.destroy();
}
}).on('end', function () {
buffer = Buffer.concat(chunks);
try {
dimensions = sizeOf(buffer);
} catch (aE) {
aInnerCallback(new statusError({
message: '`@icon` ' + aE.message,
code: aE.code
}));
return;
}

if (!acceptedImage(dimensions)) {
aInnerCallback(new statusError({
message: '`@icon` unsupported file type or dimensions are too large.',
code: 400
}), null);
} else {
aInnerCallback(null);
}
}).on('error', function (aErr) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Initial error trap was on response and not the request... still present.

aInnerCallback(aErr);
});
}).on('error', function (aErr) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added missing request error trap here.

aInnerCallback(aErr); // WARNING: See #1323
});
}
} else {
aInnerCallback(null);
}
},
function (aInnerCallback) {
// `@supportURL` validations
var supportURL = null;
Expand Down