w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-12-25 20:33:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make it possible to ignore SSL errors from network communications

Browse Source 
It seems  that the OpenSSL version  on some systems is  not capable of
correctly handling  intermediate certificates  for some  sites.  These
sites include SourceForge which we  use for serving sample files. This
change adds  a global handler for  QNAM SSL errors with  the option to
ignore them at the users discretion.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7359 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-12-04 11:17:34 +00:00
parent 2255b17e91
commit e61f5fa38f
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SampleDownloader/RemoteFile.cpp
View File

@ -139,15 +139,6 @@ void RemoteFile::download (QUrl const& url)
listener_->download_progress (bytes_received, total_bytes);
}
});
connect (reply_, &QNetworkReply::sslErrors, [this] (QList<QSslError> const& errors) {
QString message;
for (auto const& error: errors)
{
message += '\n' + reply_->request ().url ().toDisplayString () + ": "
+ error.errorString ();
}
listener_->error ("Network SSL Errors", message);
});
}
void RemoteFile::abort ()

20
main.cpp
View File

@ -9,6 +9,7 @@
#include <QDateTime>
#include <QApplication>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QRegularExpression>
#include <QObject>
#include <QSettings>
@ -315,8 +316,25 @@ int main(int argc, char *argv[])
).toBool () ? 1u : 4u;
}
QNetworkAccessManager network_manager {&a};
// run the application UI
MainWindow w(temp_dir, multiple, &multi_settings, &mem_jt9, downSampleFactor, new QNetworkAccessManager {&a}, &splash);
MainWindow w(temp_dir, multiple, &multi_settings, &mem_jt9, downSampleFactor, &network_manager, &splash);
// set up handling for any SSL issues
QObject::connect (&network_manager, &QNetworkAccessManager::sslErrors, [&w] (QNetworkReply * reply, QList<QSslError> const& errors) {
QString message;
for (auto const& error: errors)
{
message += '\n' + reply->request ().url ().toDisplayString () + ": "
+ error.errorString ();
}
if (QMessageBox::Ignore == QMessageBox::question (&w, "Network SSL Errors", message, QMessageBox::Abort | QMessageBox::Ignore))
{
reply->ignoreSslErrors ();
}
});
w.show();
splash.raise ();
QObject::connect (&a, SIGNAL (lastWindowClosed()), &a, SLOT (quit()));