QMatrixClient::NetworkAccessManager (singleton Qt NAM that remembers ignored SSL errors)

Closes #145.

6 files changed, 130 insertions, 36 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fea5b0c..463bfea7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,7 @@ message( STATUS )
 
 # Set up source files
 set(libqmatrixclient_SRCS
+   networkaccessmanager.cpp
    connectiondata.cpp
    connection.cpp
    logging.cpp
diff --git a/connectiondata.cpp b/connectiondata.cpp
index 11015dbf..4e9bc77e 100644
--- a/connectiondata.cpp
+++ b/connectiondata.cpp
@@ -18,10 +18,9 @@
 
 #include "connectiondata.h"
 
+#include "networkaccessmanager.h"
 #include "logging.h"
 
-#include <QtNetwork/QNetworkAccessManager>
-
 using namespace QMatrixClient;
 
 struct ConnectionData::Private
@@ -35,14 +34,8 @@ struct ConnectionData::Private
 
     mutable unsigned int txnCounter = 0;
     const qint64 id = QDateTime::currentMSecsSinceEpoch();
-
-    static QNetworkAccessManager* createNam();
-    static nam_customizer_t customizeNam;
 };
 
-ConnectionData::nam_customizer_t ConnectionData::Private::customizeNam =
-    [] (QNetworkAccessManager* /* unused */) { };
-
 ConnectionData::ConnectionData(QUrl baseUrl)
     : d(std::make_unique<Private>(baseUrl))
 { }
@@ -59,22 +52,9 @@ QUrl ConnectionData::baseUrl() const
     return d->baseUrl;
 }
 
-QNetworkAccessManager* ConnectionData::Private::createNam()
-{
-    auto nam = new QNetworkAccessManager;
-    // See #109. Once Qt bearer management gets better, this workaround
-    // should become unnecessary.
-    nam->connect(nam, &QNetworkAccessManager::networkAccessibleChanged,
-                 [nam] { nam->setNetworkAccessible(QNetworkAccessManager::Accessible);
-                 });
-    customizeNam(nam);
-    return nam;
-}
-
 QNetworkAccessManager* ConnectionData::nam() const
 {
-    static auto nam = d->createNam();
-    return nam;
+    return NetworkAccessManager::instance();
 }
 
 void ConnectionData::setBaseUrl(QUrl baseUrl)
@@ -126,10 +106,3 @@ QByteArray ConnectionData::generateTxnId() const
     return QByteArray::number(d->id) + 'q' +
             QByteArray::number(++d->txnCounter);
 }
-
-void
-ConnectionData::customizeNetworkAccess(ConnectionData::nam_customizer_t customizer)
-{
-    Private::customizeNam = customizer;
-}
-
diff --git a/connectiondata.h b/connectiondata.h
index 9f17a9b5..7a2f2e90 100644
--- a/connectiondata.h
+++ b/connectiondata.h
@@ -20,7 +20,6 @@
 
 #include <QtCore/QUrl>
 
-#include <functional>
 #include <memory>
 
 class QNetworkAccessManager;
@@ -49,10 +48,6 @@ namespace QMatrixClient
 
             QByteArray generateTxnId() const;
 
-            using nam_customizer_t =
-                std::function<void(QNetworkAccessManager*)>;
-            static void customizeNetworkAccess(nam_customizer_t customizer);
-
         private:
             struct Private;
             std::unique_ptr<Private> d;
diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri
index 5910554c..8ee3634c 100644
--- a/libqmatrixclient.pri
+++ b/libqmatrixclient.pri
@@ -33,7 +33,8 @@ HEADERS += \
     $$files($$PWD/jobs/generated/*.h, false) \
     $$PWD/logging.h \
     $$PWD/settings.h \
-    $$PWD/networksettings.h
+    $$PWD/networksettings.h \
+    $$PWD/networkaccessmanager.h
 
 SOURCES += \
     $$PWD/connectiondata.cpp \
@@ -61,4 +62,5 @@ SOURCES += \
     $$files($$PWD/jobs/generated/*.cpp, false) \
     $$PWD/logging.cpp \
     $$PWD/settings.cpp \
-    $$PWD/networksettings.cpp
+    $$PWD/networksettings.cpp \
+    $$PWD/networkaccessmanager.cpp
diff --git a/networkaccessmanager.cpp b/networkaccessmanager.cpp
new file mode 100644
index 00000000..7fb2f602
--- /dev/null
+++ b/networkaccessmanager.cpp
@@ -0,0 +1,74 @@
+/******************************************************************************
+ * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "networkaccessmanager.h"
+
+#include <QtNetwork/QNetworkReply>
+
+using namespace QMatrixClient;
+
+class NetworkAccessManager::Private
+{
+    public:
+        QList<QSslError> ignoredSslErrors;
+};
+
+NetworkAccessManager::NetworkAccessManager() : d(std::make_unique<Private>())
+{ }
+
+QList<QSslError> NetworkAccessManager::ignoredSslErrors() const
+{
+    return d->ignoredSslErrors;
+}
+
+void NetworkAccessManager::addIgnoredSslError(const QSslError& error)
+{
+    d->ignoredSslErrors << error;
+}
+
+void NetworkAccessManager::clearIgnoredSslErrors()
+{
+    d->ignoredSslErrors.clear();
+}
+
+static NetworkAccessManager* createNam()
+{
+    auto nam = new NetworkAccessManager;
+    // See #109. Once Qt bearer management gets better, this workaround
+    // should become unnecessary.
+    nam->connect(nam, &QNetworkAccessManager::networkAccessibleChanged,
+        [nam] { nam->setNetworkAccessible(QNetworkAccessManager::Accessible); });
+    return nam;
+}
+
+NetworkAccessManager*NetworkAccessManager::instance()
+{
+    static auto* nam = createNam();
+    return nam;
+}
+
+NetworkAccessManager::~NetworkAccessManager() = default;
+
+QNetworkReply* NetworkAccessManager::createRequest(Operation op,
+    const QNetworkRequest& request, QIODevice* outgoingData)
+{
+    auto reply =
+            QNetworkAccessManager::createRequest(op, request, outgoingData);
+    reply->ignoreSslErrors(d->ignoredSslErrors);
+    return reply;
+}
diff --git a/networkaccessmanager.h b/networkaccessmanager.h
new file mode 100644
index 00000000..ea08c591
--- /dev/null
+++ b/networkaccessmanager.h
@@ -0,0 +1,49 @@
+/******************************************************************************
+ * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#pragma once
+
+#include <QtNetwork/QNetworkAccessManager>
+
+#include <memory>
+
+namespace QMatrixClient
+{
+    class NetworkAccessManager : public QNetworkAccessManager
+    {
+            Q_OBJECT
+        public:
+            NetworkAccessManager();
+            ~NetworkAccessManager() override;
+
+            QList<QSslError> ignoredSslErrors() const;
+            void addIgnoredSslError(const QSslError& error);
+            void clearIgnoredSslErrors();
+
+            /** Get a pointer to the singleton */
+            static NetworkAccessManager* instance();
+
+        private:
+            QNetworkReply * createRequest(Operation op,
+                                const QNetworkRequest &request,
+                                QIODevice *outgoingData = Q_NULLPTR) override;
+
+            class Private;
+            std::unique_ptr<Private> d;
+    };
+} // namespace QMatrixClient