Merge pull request #1759 from namark/debug_ssl_error

Verbose logging for SSL errors in requests that Domain server redirec…
vircadia · Mar 3, 2024 · a2d90ce · a2d90ce
2 parents 8d2e135 + 48b7ed8
commit a2d90ce
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 0 deletions.
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
@@ -190,6 +190,8 @@ bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection,
         return true;
     }
 
+    connect(reply, &QNetworkReply::sslErrors, [reply](const auto& errors) { MetaverseAPI::logSslErrors(reply, errors); });
+
     connect(reply, &QNetworkReply::finished, this, [reply, connection]() {
         if (reply->error() != QNetworkReply::NoError) {
             auto data = reply->readAll();
@@ -2721,6 +2723,8 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
             QNetworkReply* reply = NetworkAccessManager::getInstance().put(req, doc.toJson());
 
+            connect(reply, &QNetworkReply::sslErrors, [reply](const auto& errors) { MetaverseAPI::logSslErrors(reply, errors); });
+
             connect(reply, &QNetworkReply::finished, this, [reply, connection]() {
                 if (reply->error() != QNetworkReply::NoError) {
                     qDebug() << "Got error response from metaverse server: " << reply->readAll();

diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
@@ -350,6 +350,7 @@ void AccountManager::sendRequest(const QString& path,
             }
         });
 
+        connect(networkReply, &QNetworkReply::sslErrors, [networkReply](const auto& errors) { MetaverseAPI::logSslErrors(networkReply, errors); });
 
         if (callbackParams.isEmpty()) {
             connect(networkReply, &QNetworkReply::finished, networkReply, &QNetworkReply::deleteLater);

diff --git a/libraries/networking/src/MetaverseAPI.cpp b/libraries/networking/src/MetaverseAPI.cpp
@@ -13,11 +13,15 @@
 #include "MetaverseAPI.h"
 
 #include <QUrl>
+#include <QSslSocket>
+#include <QSslCipher>
+#include <QDebug>
 
 #include <SettingHandle.h>
 #include <DependencyManager.h>
 
 #include "NetworkingConstants.h"
+#include "NetworkLogging.h"
 #include "NodeList.h"
 
 
@@ -98,4 +102,17 @@ namespace MetaverseAPI {
 
         return path;
     };
+
+    void logSslErrors(const QNetworkReply* reply, const QList<QSslError>& errors) {
+        for(auto&& error : errors)
+        {
+            qCDebug(networking_metaverse) << "Got SSL error from Metaverse server:" << error.errorString();
+            if (reply) {
+                qCDebug(networking_metaverse) << "Ciphers:" << reply->sslConfiguration().ciphers();
+                qCDebug(networking_metaverse) << "SSL session cipher:" << reply->sslConfiguration().sessionCipher();
+                qCDebug(networking_metaverse) << "Supported SSL Ciphers:" << QSslSocket::supportedCiphers();
+            }
+            qCDebug(networking_metaverse) << error.certificate().toText().toStdString().c_str();
+        }
+    }
 }  // namespace MetaverseAPI
diff --git a/libraries/networking/src/MetaverseAPI.h b/libraries/networking/src/MetaverseAPI.h
@@ -17,6 +17,8 @@
 
 #include <QtCore/QProcessEnvironment>
 #include <QtCore/QUrl>
+#include <QSslError>
+#include <QNetworkReply>
 
 namespace MetaverseAPI {
 
@@ -45,6 +47,8 @@ namespace MetaverseAPI {
 
     QUrl getCurrentMetaverseServerURL();
     QString getCurrentMetaverseServerURLPath(bool appendForwardSlash = false);
+
+    void logSslErrors(const QNetworkReply* reply, const QList<QSslError>& errors);
 }
 
 #endif  // athena_MetaverseAPI_h
diff --git a/libraries/networking/src/NetworkLogging.cpp b/libraries/networking/src/NetworkLogging.cpp
@@ -17,3 +17,4 @@ Q_LOGGING_CATEGORY(resourceLog, "hifi.networking.resource")
 Q_LOGGING_CATEGORY(asset_client, "hifi.networking.asset_client")
 Q_LOGGING_CATEGORY(messages_client, "hifi.networking.messages_client")
 Q_LOGGING_CATEGORY(networking_webrtc, "hifi.networking.webrtc")
+Q_LOGGING_CATEGORY(networking_metaverse, "hifi.networking.metaverse")
diff --git a/libraries/networking/src/NetworkLogging.h b/libraries/networking/src/NetworkLogging.h
@@ -20,5 +20,6 @@ Q_DECLARE_LOGGING_CATEGORY(networking_ice)
 Q_DECLARE_LOGGING_CATEGORY(asset_client)
 Q_DECLARE_LOGGING_CATEGORY(messages_client)
 Q_DECLARE_LOGGING_CATEGORY(networking_webrtc)
+Q_DECLARE_LOGGING_CATEGORY(networking_metaverse)
 
 #endif // hifi_NetworkLogging_h