jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-22 06:43:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

detect recursive redirects (#6570)

Browse source 
* detect recursive redirects

* handle failure with normal failure handler
This commit is contained in:
ebbit1q 2026-01-25 22:05:19 +01:00 • committed by GitHub
parent c02cf5e89e
commit 303bd8b607
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
View file

@ -70,16 +70,22 @@ void CardPictureLoaderWorkerWork::picDownloadFailed()
void CardPictureLoaderWorkerWork::handleNetworkReply(QNetworkReply *reply) void CardPictureLoaderWorkerWork::handleNetworkReply(QNetworkReply *reply)
{ {
QVariant redirectTarget = reply->attribute(QNetworkRequest::RedirectionTargetAttribute); QVariant redirectTarget = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
bool redirectFailure = false;
if (redirectTarget.isValid()) { if (redirectTarget.isValid()) {
QUrl url = reply->request().url(); QUrl url = reply->request().url();
QUrl redirectUrl = redirectTarget.toUrl(); QUrl redirectUrl = redirectTarget.toUrl();
if (redirectUrl.isRelative()) { if (redirectUrl.isRelative()) {
redirectUrl = url.resolved(redirectUrl); redirectUrl = url.resolved(redirectUrl);
} }
emit urlRedirected(url, redirectUrl); if (url == redirectUrl) {
qCWarning(CardPictureLoaderWorkerWorkLog) << "recusive redirect detected!";
redirectFailure = true;
} else {
emit urlRedirected(url, redirectUrl);
}
} }
if (reply->error()) { if (redirectFailure || reply->error()) {
handleFailedReply(reply); handleFailedReply(reply);
} else { } else {
handleSuccessfulReply(reply); handleSuccessfulReply(reply);