Skip to content

Restore @icon check and modify graceful failure landing page #1328

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

Merged
merged 1 commit into from
Feb 10, 2018
Merged

Restore @icon check and modify graceful failure landing page #1328

Show file tree
Hide file tree
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
12 changes: 3 additions & 9 deletions controllers/scriptStorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1465,12 +1465,6 @@ exports.storeScript = function (aUser, aMeta, aBuf, aUpdate, aCallback) {
}
} else {
fn = /^http:/.test(icon) ? http : https;

// Workaround for #1323
aInnerCallback(null); // NOTE: Suspend further checks
return;
// /Workaround for #1323

fn.get(URL.parse(icon), function (aRes) {
var chunks = [];
aRes.on('data', function (aChunk) {
Expand Down Expand Up @@ -1509,11 +1503,11 @@ exports.storeScript = function (aUser, aMeta, aBuf, aUpdate, aCallback) {
} else {
aInnerCallback(null);
}
}).on('error', function (aErr) {
}).on('error', function (aErr) { // NOTE: response error trap
aInnerCallback(aErr);
});
}).on('error', function (aErr) {
aInnerCallback(aErr); // WARNING: See #1323
}).on('error', function (aErr) { // NOTE: request error trap
aInnerCallback(aErr);
});
}
} else {
Expand Down
6 changes: 5 additions & 1 deletion libs/templateHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,11 @@ exports.statusCodePage = function (aReq, aRes, aNext, aOptions) {
pageMetadata(aOptions, [aOptions.statusCode, aOptions.statusMessage], aOptions.statusMessage);

//---
aRes.status(aOptions.statusCode).render('pages/statusCodePage', aOptions);
if (typeof aOptions.statusCode !== 'number') {
aRes.status(400).render('pages/statusCodePage', aOptions);
} else {
aRes.status(aOptions.statusCode).render('pages/statusCodePage', aOptions);
}
};

// Add page metadata, containing title, description and keywords.
Expand Down