supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Harden url fetcher and don't crash on non-ASCII urls

Browse Source
This commit is contained in:
Pavel Djundik 2016-03-25 11:45:39 +02:00
parent 05ec819f2d
commit 93d7b16cd4
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/irc-events/link.js
View File

@ -16,10 +16,9 @@ module.exports = function(irc, network) {
} }
var links = []; var links = [];
var split = data.message.split(" "); var split = data.message.replace(/\x02|\x1D|\x1F|\x16|\x0F|\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?/g, "").split(" ");
_.each(split, function(w) { _.each(split, function(w) {
var match = w.indexOf("http://") === 0 || w.indexOf("https://") === 0; if (/^https?:\/\//.test(w)) {
if (match) {
links.push(w); links.push(w);
} }
}); });
@ -44,7 +43,7 @@ module.exports = function(irc, network) {
msg: msg msg: msg
}); });
var link = links[0]; var link = escapeHeader(links[0]);
fetch(link, function(res) { fetch(link, function(res) {
parse(msg, link, res, client); parse(msg, link, res, client);
}); });
@ -103,6 +102,8 @@ function fetch(url, cb) {
try { try {
var req = request.get({ var req = request.get({
url: url, url: url,
maxRedirects: 5,
timeout: 5000,
headers: { headers: {
"User-Agent": "Mozilla/5.0 (compatible; The Lounge IRC Client; +https://github.com/thelounge/lounge)" "User-Agent": "Mozilla/5.0 (compatible; The Lounge IRC Client; +https://github.com/thelounge/lounge)"
} }
@ -150,3 +151,13 @@ function fetch(url, cb) {
cb(data); cb(data);
})); }));
} }
// https://github.com/request/request/issues/2120
// https://github.com/nodejs/node/issues/1693
// https://github.com/alexeyten/descript/commit/50ee540b30188324198176e445330294922665fc
function escapeHeader(header) {
return header
.replace(/([\uD800-\uDBFF][\uDC00-\uDFFF])+/g, encodeURI)
.replace(/[\uD800-\uDFFF]/g, "")
.replace(/[\u0000-\u001F\u007F-\uFFFF]+/g, encodeURI);
}