BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-07-01 23:46:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Safety improvements

Browse Source
This commit is contained in:
Tixx 2024-09-07 22:00:51 +02:00
parent 4678701f42
commit de3888618a
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Startup.cpp
View File

@ -416,11 +416,15 @@ void StartProxy() {
cli_res = backend.Post(remaining_path, headers); cli_res = backend.Post(remaining_path, headers);
} else if (host == "avatar") { } else if (host == "avatar") {
bool error = false;
std::string username; std::string username;
std::string avatar_size = "100"; std::string avatar_size = "100";
if (1 < path.size()) if (path.size() > 1) {
username = path[1]; username = path[1];
} else {
error = true;
}
if (path.size() > 2) { if (path.size() > 2) {
try { try {
@ -430,23 +434,39 @@ void StartProxy() {
} catch (std::exception&) {} } catch (std::exception&) {}
} }
auto summary_res = forum.Get("/u/" + username + ".json", headers); httplib::Result summary_res;
nlohmann::json d = nlohmann::json::parse(summary_res->body, nullptr, false);
if (d.contains("user")) { if (!error) {
auto user = d.at("user"); summary_res = forum.Get("/u/" + username + ".json", headers);
auto avatar_link_json = user.at("avatar_template");
if (!summary_res || summary_res->status != 200) {
error = true;
}
}
if (!error) {
try {
nlohmann::json d = nlohmann::json::parse(summary_res->body, nullptr, false); // can fail with parse_error
auto user = d.at("user"); // can fail with out_of_range
auto avatar_link_json = user.at("avatar_template"); // can fail with out_of_range
if (avatar_link_json.is_string()) {
auto avatar_link = avatar_link_json.get<std::string>(); auto avatar_link = avatar_link_json.get<std::string>();
size_t start_pos = avatar_link.find("{size}"); size_t start_pos = avatar_link.find("{size}");
if (start_pos != std::string::npos) if (start_pos != std::string::npos)
avatar_link.replace(start_pos, std::strlen("{size}"), avatar_size); avatar_link.replace(start_pos, std::strlen("{size}"), avatar_size);
cli_res = forum.Get(avatar_link, headers); cli_res = forum.Get(avatar_link, headers);
} catch (std::exception&) {
error = true;
} }
} else }
if (error) {
cli_res = forum.Get("/user_avatar/forum.beammp.com/user/0/0.png", headers); cli_res = forum.Get("/user_avatar/forum.beammp.com/user/0/0.png", headers);
}
} else { } else {
res.set_content("Host not found", "text/plain"); res.set_content("Host not found", "text/plain");
return; return;