0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

campaignd: Catch utils::invalid_utf8_exception within handle_upload()

Browse source 
Otherwise add-ons with invalid UTF-8 sequences in the add-on name or the
fields matched against the blacklist (description, author, email, title)
crash campaignd since the exception is not handled anywhere.

We specifically want to handle this exception deep within
handle_upload() and with more specific knowledge of the circumstances
because otherwise we can't give the user an error message with enough
information to help them.
This commit is contained in:
Ignacio R. Morelle 2015-01-19 16:40:42 -03:00
parent 7b0d2d76d3
commit 9514710e70
1 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/campaign_server/campaign_server.cpp
View file

@ -502,15 +502,30 @@ void server::handle_upload(const server::request& req)
config data = upload.child("data");
const std::string& name = upload["name"];
const std::string& lc_name = utils::lowercase(name);
config *campaign = NULL;
BOOST_FOREACH(config& c, campaigns().child_range("campaign"))
{
if(utils::lowercase(c["name"]) == lc_name) {
campaign = &c;
break;
bool passed_name_utf8_check = false;
try {
const std::string& lc_name = utils::lowercase(name);
passed_name_utf8_check = true;
BOOST_FOREACH(config& c, campaigns().child_range("campaign"))
{
if(utils::lowercase(c["name"]) == lc_name) {
campaign = &c;
break;
}
}
} catch(const utils::invalid_utf8_exception&) {
if(!passed_name_utf8_check) {
LOG_CS << "Upload aborted - invalid_utf8_exception caught on handle_upload() check 1, "
<< "the add-on pbl info contains invalid UTF-8\n";
send_error("Add-on rejected: The add-on name contains an invalid UTF-8 sequence.", req.sock);
} else {
LOG_CS << "Upload aborted - invalid_utf8_exception caught on handle_upload() check 2, "
<< "the internal add-ons list contains invalid UTF-8\n";
send_error("Server error: The server add-ons list is damaged.", req.sock);
}
}
@ -560,16 +575,22 @@ void server::handle_upload(const server::request& req)
LOG_CS << "Upload is owner upload.\n";
if(blacklist_.is_blacklisted(name,
upload["title"].str(),
upload["description"].str(),
upload["author"].str(),
req.addr,
upload["email"].str()))
{
LOG_CS << "Upload denied - blacklisted add-on information.\n";
send_error("Add-on upload denied. Please contact the server administration for assistance.", req.sock);
return;
try {
if(blacklist_.is_blacklisted(name,
upload["title"].str(),
upload["description"].str(),
upload["author"].str(),
req.addr,
upload["email"].str()))
{
LOG_CS << "Upload denied - blacklisted add-on information.\n";
send_error("Add-on upload denied. Please contact the server administration for assistance.", req.sock);
return;
}
} catch(const utils::invalid_utf8_exception&) {
LOG_CS << "Upload aborted - the add-on pbl info contains invalid UTF-8 and cannot be "
<< "checked against the blacklist\n";
send_error("Add-on rejected: The add-on publish information contains an invalid UTF-8 sequence.", req.sock);
}
std::string message = "Add-on accepted.";