w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-01 05:32:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid redirect loops with no OpenSSL support

Browse Source 
Only force http scheme on initial fetch attempt if no suitable OpenSSL
support is installed, also give a more meaningful error message when a
redirect to  an https scheme URL  when no suitable OpenSSL  support is
installed.
This commit is contained in:
Bill Somerville 2018-10-17 22:31:10 +01:00
parent d3bc15b781
commit 2a56a19677
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
LotWUsers.cpp
View File

@ -48,6 +48,10 @@ public:
if (!QFileInfo::exists (csv_file_name) || forced_fetch) if (!QFileInfo::exists (csv_file_name) || forced_fetch)
{ {
current_url_.setUrl (url); current_url_.setUrl (url);
if (current_url_.isValid () && !QSslSocket::supportsSsl ())
{
current_url_.setScheme ("http");
}
redirect_count_ = 0; redirect_count_ = 0;
download (current_url_); download (current_url_);
} }
@ -66,10 +70,6 @@ public:
network_manager_->setNetworkAccessible (QNetworkAccessManager::Accessible); network_manager_->setNetworkAccessible (QNetworkAccessManager::Accessible);
} }
if (url.isValid () && !QSslSocket::supportsSsl ())
{
url.setScheme ("http");
}
QNetworkRequest request {url}; QNetworkRequest request {url};
request.setRawHeader ("User-Agent", "WSJT LotW User Downloader"); request.setRawHeader ("User-Agent", "WSJT LotW User Downloader");
request.setOriginatingObject (this); request.setOriginatingObject (this);
@ -99,7 +99,14 @@ public:
QUrl redirect_url {reply_->attribute (QNetworkRequest::RedirectionTargetAttribute).toUrl ()}; QUrl redirect_url {reply_->attribute (QNetworkRequest::RedirectionTargetAttribute).toUrl ()};
if (reply_->error () == QNetworkReply::NoError && !redirect_url.isEmpty ()) if (reply_->error () == QNetworkReply::NoError && !redirect_url.isEmpty ())
{ {
if (++redirect_count_ < 10) // maintain sanity if ("https" == redirect_url.scheme () && !QSslSocket::supportsSsl ())
{
Q_EMIT self_->LotW_users_error (tr ("Network Error - SSL/TLS support not installed, cannot fetch:\n\'%1\'")
.arg (redirect_url.toDisplayString ()));
url_valid_ = false; // reset
Q_EMIT self_->load_finished ();
}
else if (++redirect_count_ < 10) // maintain sanity
{ {
// follow redirect // follow redirect
download (reply_->url ().resolved (redirect_url)); download (reply_->url ().resolved (redirect_url));