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

campaignd: Remove unwanted attributes from server response

Browse source 
As opposed to merely blanking them out.

Closes #4800.
This commit is contained in:
Iris Morelle 2020-03-14 00:52:32 -03:00
parent a658072586
commit 62c9aec04c
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/campaign_server/campaign_server.cpp
View file

@ -641,19 +641,16 @@ void server::handle_request_campaign_list(const server::request& req)
for(config& j : campaign_list.child_range("campaign"))
{
j["passphrase"] = "";
j["passhash"] = "";
j["passsalt"] = "";
j["upload_ip"] = "";
j["email"] = "";
j["feedback_url"] = "";
// Remove attributes containing information that's considered sensitive
// or irrelevant to clients
j.remove_attributes("passphrase", "passhash", "passsalt", "upload_ip", "email");
// Build a feedback_url string attribute from the
// internal [feedback] data.
// Build a feedback_url string attribute from the internal [feedback]
// data or deliver an empty value, in case clients decide to assume its
// presence.
const config& url_params = j.child_or_empty("feedback");
if(!url_params.empty() && !feedback_url_format_.empty()) {
j["feedback_url"] = format_addon_feedback_url(feedback_url_format_, url_params);
}
j["feedback_url"] = !url_params.empty() && !feedback_url_format_.empty()
? format_addon_feedback_url(feedback_url_format_, url_params) : "";
// Clients don't need to see the original data, so discard it.
j.clear_children("feedback");