Changeset f94ab1d in confclerk_git

Timestamp:

01/23/17 18:59:07 (5 years ago)

Author:

gregor herrmann <gregoa@…>

Branches:

master, qt5

Children:

6984e9d

Parents:

0d41eb2

Message:

Handle SSL errors.

Show warning with error messages, offer to ignore them or abort download.

Location:

src/gui

Files:

• mainwindow.cpp (modified) (2 diffs)
• mainwindow.h (modified) (2 diffs)

src/gui/mainwindow.cpp

@@ -132 +132 @@
     }
 
+    connect(mNetworkAccessManager, SIGNAL(sslErrors(QNetworkReply*, QList<QSslError>)), SLOT(sslErrors(QNetworkReply*, QList<QSslError>)));
     connect(mNetworkAccessManager, SIGNAL(finished(QNetworkReply*)), SLOT(networkQueryFinished(QNetworkReply*)));
     connect(mXmlParser, SIGNAL(parsingScheduleBegin()), conferenceModel, SLOT(newConferenceBegin()));
@@ -410 +411 @@
 }
 
+void MainWindow::sslErrors(QNetworkReply *aReply, const QList<QSslError> &errors) {
+    QString errorString;
+    foreach (const QSslError &error, errors) {
+        if (!errorString.isEmpty()) {
+            errorString += ", ";
+        }
+        errorString += error.errorString();
+    }
+
+    if (QMessageBox::warning(
+                this,
+                QString("SSL errors"),
+                QString("One or more SSL errors have occurred: ") + errorString,
+                QMessageBox::Ignore | QMessageBox::Cancel) == QMessageBox::Ignore) {
+        aReply->ignoreSslErrors();
+    } else {
+        aReply->abort();
+    }
+}
+
 void MainWindow::networkQueryFinished(QNetworkReply *aReply) {
     if (aReply->error() != QNetworkReply::NoError) {

src/gui/mainwindow.h

@@ -22 +22 @@
 
 #include <QtGui/QMainWindow>
+#include <QSslError>
 
 #include "ui_mainwindow.h"
@@ -52 +53 @@
     void onSearchResultChanged();
 
+    void sslErrors(QNetworkReply*,const QList<QSslError> &errors);
     void networkQueryFinished(QNetworkReply*);
     void importFromNetwork(const QString&, int conferenceId);