FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-27 23:59:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Proper HTTP redirection even for some totally exotic redirect URLs.

Browse Source
This commit is contained in:
Martin Rotter 2021-01-24 20:07:09 +01:00
parent 9b30c76bcd
commit 193748f836
3 changed files with 27 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/scripts/7za

@ -1 +1 @@
Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9 Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749

13
src/librssguard/network-web/basenetworkaccessmanager.cpp
View File

@ -49,11 +49,18 @@ QNetworkReply* BaseNetworkAccessManager::createRequest(QNetworkAccessManager::Op
QIODevice* outgoingData) { QIODevice* outgoingData) {
QNetworkRequest new_request = request; QNetworkRequest new_request = request;
// This rapidly speeds up loading of web sites.
// NOTE: https://en.wikipedia.org/wiki/HTTP_pipelining
new_request.setAttribute(QNetworkRequest::Attribute::HttpPipeliningAllowedAttribute, true); new_request.setAttribute(QNetworkRequest::Attribute::HttpPipeliningAllowedAttribute, true);
#if QT_VERSION >= 0x050900
new_request.setAttribute(QNetworkRequest::Attribute::RedirectPolicyAttribute,
QNetworkRequest::RedirectPolicy::NoLessSafeRedirectPolicy);
#elif QT_VERSION >= 0x050600
new_request.setAttribute(QNetworkRequest::Attribute::FollowRedirectsAttribute, true);
#endif
// Setup custom user-agent. // Setup custom user-agent.
new_request.setRawHeader(HTTP_HEADERS_USER_AGENT, QString(APP_USERAGENT).toLocal8Bit()); new_request.setRawHeader(HTTP_HEADERS_USER_AGENT, QString(APP_USERAGENT).toLocal8Bit());
return QNetworkAccessManager::createRequest(op, new_request, outgoingData);
auto reply = QNetworkAccessManager::createRequest(op, new_request, outgoingData);
return reply;
} }

73
src/librssguard/network-web/downloader.cpp
View File

@ -104,71 +104,30 @@ void Downloader::manipulateData(const QString& url,
void Downloader::finished() { void Downloader::finished() {
auto* reply = qobject_cast<QNetworkReply*>(sender()); auto* reply = qobject_cast<QNetworkReply*>(sender());
QNetworkAccessManager::Operation reply_operation = reply->operation();
m_timer->stop(); m_timer->stop();
// In this phase, some part of downloading process is completed. // In this phase, some part of downloading process is completed.
const QUrl redirection_url = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); const QUrl redirection_url = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
if (redirection_url.isValid()) { // No redirection is indicated. Final file is obtained in our "reply" object.
// Communication indicates that HTTP redirection is needed. // Read the data into output buffer.
// Setup redirection URL and download again. if (m_inputMultipartData == nullptr) {
QNetworkRequest request = reply->request(); m_lastOutputData = reply->readAll();
if (redirection_url.host().isEmpty()) {
request.setUrl(QUrl(reply->request().url().scheme() + QSL("://") + reply->request().url().host() + redirection_url.toString()));
}
else {
request.setUrl(redirection_url);
}
qWarningNN << LOGSEC_NETWORK
<< "We are redirecting URL request to:"
<< QUOTE_W_SPACE_DOT(request.url());
m_activeReply->deleteLater();
m_activeReply = nullptr;
if (reply_operation == QNetworkAccessManager::GetOperation) {
runGetRequest(request);
}
else if (reply_operation == QNetworkAccessManager::Operation::PostOperation) {
if (m_inputMultipartData == nullptr) {
runPostRequest(request, m_inputData);
}
else {
runPostRequest(request, m_inputMultipartData);
}
}
else if (reply_operation == QNetworkAccessManager::PutOperation) {
runPutRequest(request, m_inputData);
}
else if (reply_operation == QNetworkAccessManager::DeleteOperation) {
runDeleteRequest(request);
}
} }
else { else {
// No redirection is indicated. Final file is obtained in our "reply" object. m_lastOutputMultipartData = decodeMultipartAnswer(reply);
// Read the data into output buffer.
if (m_inputMultipartData == nullptr) {
m_lastOutputData = reply->readAll();
}
else {
m_lastOutputMultipartData = decodeMultipartAnswer(reply);
}
m_lastContentType = reply->header(QNetworkRequest::ContentTypeHeader);
m_lastOutputError = reply->error();
m_activeReply->deleteLater();
m_activeReply = nullptr;
if (m_inputMultipartData != nullptr) {
m_inputMultipartData->deleteLater();
}
emit completed(m_lastOutputError, m_lastOutputData);
} }
m_lastContentType = reply->header(QNetworkRequest::ContentTypeHeader);
m_lastOutputError = reply->error();
m_activeReply->deleteLater();
m_activeReply = nullptr;
if (m_inputMultipartData != nullptr) {
m_inputMultipartData->deleteLater();
}
emit completed(m_lastOutputError, m_lastOutputData);
} }
void Downloader::progressInternal(qint64 bytes_received, qint64 bytes_total) { void Downloader::progressInternal(qint64 bytes_received, qint64 bytes_total) {