mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-13 07:42:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Limit DownloadHandler max redirection to 20

Browse source 
Closes #10219.
This commit is contained in:
Chocobo1 2019-02-13 21:56:48 +08:00
parent 409557ef30
commit 8fe1ff87f1
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/base/net/downloadhandler.cpp
View file

@ -44,6 +44,8 @@
namespace namespace
{ {
const int MAX_REDIRECTIONS = 20; // the common value for web browsers
bool saveToFile(const QByteArray &replyData, QString &filePath) bool saveToFile(const QByteArray &replyData, QString &filePath)
{ {
QTemporaryFile tmpfile {Utils::Fs::tempPath() + "XXXXXX"}; QTemporaryFile tmpfile {Utils::Fs::tempPath() + "XXXXXX"};
@ -155,6 +157,12 @@ void Net::DownloadHandler::checkDownloadSize(qint64 bytesReceived, qint64 bytesT
void Net::DownloadHandler::handleRedirection(const QUrl &newUrl) void Net::DownloadHandler::handleRedirection(const QUrl &newUrl)
{ {
if (m_redirectionCounter >= MAX_REDIRECTIONS) {
emit downloadFailed(url(), tr("Exceeded max redirections (%1)").arg(MAX_REDIRECTIONS));
this->deleteLater();
return;
}
// Resolve relative urls // Resolve relative urls
const QUrl resolvedUrl = (newUrl.isRelative()) ? m_reply->url().resolved(newUrl) : newUrl; const QUrl resolvedUrl = (newUrl.isRelative()) ? m_reply->url().resolved(newUrl) : newUrl;
const QString newUrlString = resolvedUrl.toString(); const QString newUrlString = resolvedUrl.toString();
@ -173,7 +181,8 @@ void Net::DownloadHandler::handleRedirection(const QUrl &newUrl)
return; return;
} }
const DownloadHandler *redirected = m_manager->download(DownloadRequest(m_downloadRequest).url(newUrlString)); DownloadHandler *redirected = m_manager->download(DownloadRequest(m_downloadRequest).url(newUrlString));
redirected->m_redirectionCounter = (m_redirectionCounter + 1);
connect(redirected, &DownloadHandler::destroyed, this, &DownloadHandler::deleteLater); connect(redirected, &DownloadHandler::destroyed, this, &DownloadHandler::deleteLater);
connect(redirected, &DownloadHandler::downloadFailed, this, [this](const QString &, const QString &reason) connect(redirected, &DownloadHandler::downloadFailed, this, [this](const QString &, const QString &reason)
{ {

1
src/base/net/downloadhandler.h
View file

@ -74,6 +74,7 @@ namespace Net
QNetworkReply *m_reply; QNetworkReply *m_reply;
DownloadManager *m_manager; DownloadManager *m_manager;
const DownloadRequest m_downloadRequest; const DownloadRequest m_downloadRequest;
short m_redirectionCounter = 0;
}; };
} }