cmclark00/retro-imager
1
0
Fork 0
mirror of https://github.com/cmclark00/retro-imager.git synced 2025-05-18 16:05:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

imagewriter: Fixup redirect handling

Browse source
This commit is contained in:
Tom Dewey 2023-11-13 11:47:44 +00:00 • committed by Tom Dewey
parent b3d5221ac2
commit d2251291ce
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/imagewriter.cpp
View file

@ -465,7 +465,10 @@ namespace {
findAndQueueUnresolvedSubitemsJson(entryObject["subitems"].toArray(), manager, count++);
} else if (entryObject.contains("subitems_url")) {
auto url = entryObject["subitems_url"].toString();
manager.get(QNetworkRequest(url));
auto request = QNetworkRequest(url);
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute,
QNetworkRequest::NoLessSafeRedirectPolicy);
manager.get(request);
}
}
}
@ -498,7 +501,7 @@ void ImageWriter::handleNetworkRequestFinished(QNetworkReply *data) {
_completeOsList = QJsonDocument(response_object);
} else {
std::lock_guard<std::mutex> lock(_deviceListMutationMutex);
auto new_list = findAndInsertJsonResult(_completeOsList["os_list"].toArray(), response_object["os_list"].toArray(), data->url());
auto new_list = findAndInsertJsonResult(_completeOsList["os_list"].toArray(), response_object["os_list"].toArray(), data->request().url());
auto imager_meta = _completeOsList["imager"].toObject();
_completeOsList = QJsonDocument(QJsonObject({
{"imager", imager_meta},
@ -512,6 +515,8 @@ void ImageWriter::handleNetworkRequestFinished(QNetworkReply *data) {
qDebug() << "Incorrectly formatted OS list at: " << data->url();
}
} else if (httpStatusCode >= 300 && httpStatusCode < 400) {
// We should _never_ enter this branch. All requests are set to follow redirections
// at their call sites - so the only way you got here was a logic defect.
auto request = QNetworkRequest(data->url());
request.setAttribute(QNetworkRequest::RedirectionTargetAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
@ -622,7 +627,7 @@ void ImageWriter::beginOSListFetch() {
// This will set up a chain of requests that culiminate in the eventual fetch and assembly of
// a complete cached OS list.
_networkManager.get(QNetworkRequest(request));
_networkManager.get(request);
}
void ImageWriter::setCustomCacheFile(const QString &cacheFile, const QByteArray &sha256)