Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[Download] Fix password protected moddownload

Browse Source
This commit is contained in:
momo5502 2017-06-26 13:04:30 +02:00
parent 0051722d94
commit ac7943cfbb
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Components/Modules/Download.cpp
View File

@ -32,13 +32,13 @@ namespace Components
if (needPassword) if (needPassword)
{ {
std::string pass = Dvar::Var("password").get<std::string>(); std::string pass = Dvar::Var("password").get<std::string>();
if (!pass.length()) if (pass.empty())
{ {
// shouldn't ever happen but this is safe // shouldn't ever happen but this is safe
Party::ConnectError("A password is required to connect to this server!"); Party::ConnectError("A password is required to connect to this server!");
return; return;
} }
Download::CLDownload.hashedPassword = Utils::Cryptography::SHA256::Compute(pass); Download::CLDownload.password = pass;
} }
Download::CLDownload.running = true; Download::CLDownload.running = true;
@ -230,7 +230,7 @@ namespace Components
else else
{ {
url = host + "/file/" + (download->isMap ? "map/" : "") + file.name url = host + "/file/" + (download->isMap ? "map/" : "") + file.name
+ (download->isPrivate ? ("?password=" + download->hashedPassword) : ""); + (download->isPrivate ? ("?password=" + download->password) : "");
} }
Download::FileDownload fDownload; Download::FileDownload fDownload;
@ -272,7 +272,7 @@ namespace Components
std::string host = "http://" + download->target.getString(); std::string host = "http://" + download->target.getString();
std::string listUrl = host + (download->isMap ? "/map" : "/list") + (download->isPrivate ? ("?password=" + download->hashedPassword) : ""); std::string listUrl = host + (download->isMap ? "/map" : "/list") + (download->isPrivate ? ("?password=" + download->password) : "");
std::string list = Utils::WebIO("IW4x", listUrl).setTimeout(5000)->get(); std::string list = Utils::WebIO("IW4x", listUrl).setTimeout(5000)->get();
if (list.empty()) if (list.empty())
@ -405,8 +405,7 @@ namespace Components
bool Download::VerifyPassword(mg_connection *nc, http_message* message) bool Download::VerifyPassword(mg_connection *nc, http_message* message)
{ {
std::string g_password = Dvar::Var("g_password").get<std::string>(); std::string g_password = Dvar::Var("g_password").get<std::string>();
if (g_password.empty()) return true;
if (!g_password.size()) return true;
// sha256 hashes are 64 chars long but we're gonna be safe here // sha256 hashes are 64 chars long but we're gonna be safe here
char buffer[128] = { 0 }; char buffer[128] = { 0 };
@ -810,12 +809,6 @@ namespace Components
mg_mgr_poll(&Download::Mgr, 100); mg_mgr_poll(&Download::Mgr, 100);
} }
}); });
Dvar::OnInit([]()
{
Dvar::Register<bool>("sv_wwwDownload", false, Game::dvar_flag::DVAR_FLAG_DEDISAVED, "Set to true to enable downloading maps/mods from an external server.");
Dvar::Register<const char*>("sv_wwwBaseUrl", "", Game::dvar_flag::DVAR_FLAG_DEDISAVED, "Set to the base url for the external map download.");
});
} }
else else
{ {
@ -824,8 +817,6 @@ namespace Components
Dvar::Register<const char*>("ui_dl_timeLeft", "", Game::dvar_flag::DVAR_FLAG_NONE, ""); Dvar::Register<const char*>("ui_dl_timeLeft", "", Game::dvar_flag::DVAR_FLAG_NONE, "");
Dvar::Register<const char*>("ui_dl_progress", "", Game::dvar_flag::DVAR_FLAG_NONE, ""); Dvar::Register<const char*>("ui_dl_progress", "", Game::dvar_flag::DVAR_FLAG_NONE, "");
Dvar::Register<const char*>("ui_dl_transRate", "", Game::dvar_flag::DVAR_FLAG_NONE, ""); Dvar::Register<const char*>("ui_dl_transRate", "", Game::dvar_flag::DVAR_FLAG_NONE, "");
Dvar::Register<bool>("sv_wwwDownload", false, Game::dvar_flag::DVAR_FLAG_DEDISAVED, "Set to true to enable downloading maps/mods from an external server.");
Dvar::Register<const char*>("sv_wwwBaseUrl", "", Game::dvar_flag::DVAR_FLAG_DEDISAVED, "Set to the base url for the external map download.");
}); });
UIScript::Add("mod_download_cancel", [](UIScript::Token) UIScript::Add("mod_download_cancel", [](UIScript::Token)
@ -834,6 +825,12 @@ namespace Components
}); });
} }
Dvar::OnInit([]()
{
Dvar::Register<bool>("sv_wwwDownload", false, Game::dvar_flag::DVAR_FLAG_DEDISAVED, "Set to true to enable downloading maps/mods from an external server.");
Dvar::Register<const char*>("sv_wwwBaseUrl", "", Game::dvar_flag::DVAR_FLAG_DEDISAVED, "Set to the base url for the external map download.");
});
Scheduler::OnFrame([]() Scheduler::OnFrame([]()
{ {
int workingCount = 0; int workingCount = 0;

2
src/Components/Modules/Download.hpp
View File

@ -28,7 +28,7 @@ namespace Components
bool isPrivate; bool isPrivate;
mg_mgr mgr; mg_mgr mgr;
Network::Address target; Network::Address target;
std::string hashedPassword; std::string password;
std::string mod; std::string mod;
std::thread thread; std::thread thread;