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

[Download] Fix fastdownload

Browse Source
This commit is contained in:
momo5502 2017-07-05 09:13:51 +02:00
parent b54b18806f
commit a3939860ea
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,6 +110,12 @@ namespace Components
} }
} }
if (ev == MG_EV_CLOSE)
{
fDownload->downloading = false;
return;
}
if (ev == MG_EV_RECV) if (ev == MG_EV_RECV)
{ {
size_t bytes = static_cast<size_t>(*reinterpret_cast<int*>(ev_data)); size_t bytes = static_cast<size_t>(*reinterpret_cast<int*>(ev_data));
@ -207,7 +213,24 @@ namespace Components
} }
std::string host = "http://" + download->target.getString(); std::string host = "http://" + download->target.getString();
std::string fastHost = "http://" + Dvar::Var("sv_wwwBaseUrl").get<std::string>(); std::string fastHost = Dvar::Var("sv_wwwBaseUrl").get<std::string>();
if (Utils::String::StartsWith(fastHost, "https://"))
{
download->thread.detach();
download->clear();
Scheduler::Once([]()
{
Command::Execute("closemenu mod_download_popmenu");
Party::ConnectError("HTTPS not supported for downloading!");
});
return 0;
}
else if (!Utils::String::StartsWith(fastHost, "http://"))
{
fastHost = "http://" + fastHost;
}
std::string url; std::string url;
@ -226,6 +249,7 @@ namespace Components
// ... // ...
if (Dvar::Var("sv_wwwDownload").get<bool>()) if (Dvar::Var("sv_wwwDownload").get<bool>())
{ {
if (!Utils::String::EndsWith(fastHost, "/")) fastHost.append("/");
url = fastHost + path; url = fastHost + path;
} }
else else
@ -234,6 +258,8 @@ namespace Components
+ (download->isPrivate ? ("?password=" + download->hashedPassword) : ""); + (download->isPrivate ? ("?password=" + download->hashedPassword) : "");
} }
Logger::Print("Downloading from url %s", url.data());
Download::FileDownload fDownload; Download::FileDownload fDownload;
fDownload.file = file; fDownload.file = file;
fDownload.index = index; fDownload.index = index;
@ -256,7 +282,7 @@ namespace Components
mg_mgr_free(&download->mgr); mg_mgr_free(&download->mgr);
download->valid = false; download->valid = false;
if (fDownload.buffer.size() != file.size || Utils::String::DumpHex(Utils::Cryptography::SHA256::Compute(fDownload.buffer), "") != file.hash) if (fDownload.buffer.size() != file.size || Utils::Cryptography::SHA256::Compute(fDownload.buffer, true) != file.hash)
{ {
return false; return false;
} }
@ -412,7 +438,7 @@ namespace Components
char buffer[128] = { 0 }; char buffer[128] = { 0 };
int passLen = mg_get_http_var(&message->query_string, "password", buffer, sizeof buffer); int passLen = mg_get_http_var(&message->query_string, "password", buffer, sizeof buffer);
if (passLen <= 0 || std::string(buffer, passLen) != Utils::String::DumpHex(Utils::Cryptography::SHA256::Compute(g_password), "")) if (passLen <= 0 || std::string(buffer, passLen) != Utils::Cryptography::SHA256::Compute(g_password, true))
{ {
mg_printf(nc, ("HTTP/1.1 403 Forbidden\r\n"s + mg_printf(nc, ("HTTP/1.1 403 Forbidden\r\n"s +
"Content-Type: text/html\r\n"s + "Content-Type: text/html\r\n"s +