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

campaignd: No longer allow existing add-ons with invalid names to be reuploaded

Browse source 
Reverts commit 88df3418f9.

We are going to branch 1.12 soon, so it's about time to get rid of this
temporary backwards compatibility measure.
This commit is contained in:
Ignacio R. Morelle 2014-02-20 22:29:09 -03:00
parent db75c081a5
commit 8918b974f1
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/campaign_server/campaign_server.cpp
View file

@ -495,18 +495,13 @@ namespace {
}
}
// TODO: remove for next add-ons server instance.
bool illegal_name_upload = false;
if (read_only_) {
LOG_CS << "Upload aborted - uploads not permitted in read-only mode.\n";
network::send_data(construct_error("Add-on rejected: The server is currently in read-only mode."), sock);
} else if (!data) {
LOG_CS << "Upload aborted - no add-on data.\n";
network::send_data(construct_error("Add-on rejected: No add-on data was supplied."), sock);
} else if ((illegal_name_upload = !addon_name_legal(upload["name"])) && campaign == NULL) {
// Only deny upload if we don't have an add-on with that id/name
// already. TODO: remove for next add-ons server instance.
} else if (!addon_name_legal(upload["name"])) {
LOG_CS << "Upload aborted - invalid add-on name.\n";
network::send_data(construct_error("Add-on rejected: The name of the add-on is invalid."), sock);
} else if (is_text_markup_char(upload["name"].str()[0])) {
@ -543,13 +538,6 @@ namespace {
} else {
const time_t upload_ts = time(NULL);
// Warn admins in the log about reuploading add-ons whose names don't
// pass the addon_name_legal() whitelist check above.
if(illegal_name_upload) {
LOG_CS << "Ignoring invalid add-on name '" << upload["name"] << "' because it already exists on the server.\n";
}
LOG_CS << "Upload is owner upload.\n";
std::string message = "Add-on accepted.";