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

Additional error traps for @icon check #1326

Merged
merged 1 commit into from
Feb 10, 2018
Merged

Additional error traps for @icon check #1326

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
23 changes: 20 additions & 3 deletions controllers/scriptStorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1430,6 +1430,14 @@ exports.storeScript = function (aUser, aMeta, aBuf, aUpdate, aCallback) {
matches = icon.match(rDataURIbase64);
if (matches) {
data = matches[1];
if (data <= 0) {
aInnerCallback(new statusError({
message: '`@icon` has no data',
code: 400
}));
return;
}

buffer = new Buffer(data, 'base64');
try {
dimensions = sizeOf(buffer);
Expand All @@ -1441,7 +1449,7 @@ exports.storeScript = function (aUser, aMeta, aBuf, aUpdate, aCallback) {
return;
}

if (!acceptedImage(dimensions)) {
if (!dimensions || !acceptedImage(dimensions)) {
aInnerCallback(new statusError({
message: '`@icon` unsupported file type or dimensions are too large.',
code: 400
Expand All @@ -1460,7 +1468,7 @@ exports.storeScript = function (aUser, aMeta, aBuf, aUpdate, aCallback) {

// Workaround for #1323
if (fn === https) {
aInnerCallback(null); // NOTE: Suspending further checks
aInnerCallback(null); // NOTE: Suspend further checks
return;
}
// /Workaround for #1323
Expand All @@ -1476,6 +1484,15 @@ exports.storeScript = function (aUser, aMeta, aBuf, aUpdate, aCallback) {
}
}).on('end', function () {
buffer = Buffer.concat(chunks);

if (buffer.length <= 0) {
aInnerCallback(new statusError({
message: '`@icon` has no data',
code: 400
}));
return;
}

try {
dimensions = sizeOf(buffer);
} catch (aE) {
Expand All @@ -1486,7 +1503,7 @@ exports.storeScript = function (aUser, aMeta, aBuf, aUpdate, aCallback) {
return;
}

if (!acceptedImage(dimensions)) {
if (!dimensions || !acceptedImage(dimensions)) {
aInnerCallback(new statusError({
message: '`@icon` unsupported file type or dimensions are too large.',
code: 400
Expand Down