NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

padurlsanitize: early return, no functional changes

Browse source
This commit is contained in:
muxator 2018-08-29 01:38:55 +02:00
parent d19436d044
commit 391bd79e03
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/node/hooks/express/padurlsanitize.js
View file

@ -8,26 +8,25 @@ exports.expressCreateServer = function (hook_name, args, cb) {
if(!padManager.isValidPadId(padId) || /\/$/.test(req.url)) if(!padManager.isValidPadId(padId) || /\/$/.test(req.url))
{ {
res.status(404).send('Such a padname is forbidden'); res.status(404).send('Such a padname is forbidden');
return;
} }
else
{ padManager.sanitizePadId(padId, function(sanitizedPadId) {
padManager.sanitizePadId(padId, function(sanitizedPadId) { //the pad id was sanitized, so we redirect to the sanitized version
//the pad id was sanitized, so we redirect to the sanitized version if(sanitizedPadId != padId)
if(sanitizedPadId != padId) {
{ var real_url = sanitizedPadId;
var real_url = sanitizedPadId; real_url = encodeURIComponent(real_url);
real_url = encodeURIComponent(real_url); var query = url.parse(req.url).query;
var query = url.parse(req.url).query; if ( query ) real_url += '?' + query;
if ( query ) real_url += '?' + query; res.header('Location', real_url);
res.header('Location', real_url); res.status(302).send('You should be redirected to <a href="' + real_url + '">' + real_url + '</a>');
res.status(302).send('You should be redirected to <a href="' + real_url + '">' + real_url + '</a>'); }
} //the pad id was fine, so just render it
//the pad id was fine, so just render it else
else {
{ next();
next(); }
} });
});
}
}); });
} }