Changeset 371:4077a660b294 in SMSSender

Timestamp:

Apr 14, 2014 11:38:40 AM (4 years ago)

Author:

Sämy Zehnder <saemy.zehnder@…>

Branch:

separation-frontend-backend

Message:

• Even more information is printed out when encountering an ssl error in SNetworkHelper.

File:

• common/network/snetworkhelper.cpp (modified) (2 diffs)

common/network/snetworkhelper.cpp

@@ -59 +59 @@
 
         connect(nam, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
-                this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError>&)));
+                this, SLOT(onSslErrors(QNetworkReply*, const QList<QSslError>&)),
+                Qt::DirectConnection);
     }
     return *networkAccessManager_.value(QThread::currentThread());
@@ -371 +372 @@
 
 
+QString certToString(const QSslCertificate &cert, const QString &delim) {
+    QString subjectOrganization = cert.subjectInfo(QSslCertificate::Organization);
+    QString subjectCommonName = cert.subjectInfo(QSslCertificate::CommonName);
+    QString subjectLocalityName = cert.subjectInfo(QSslCertificate::LocalityName);
+    QString subjectOrganizationalUnitName = cert.subjectInfo(QSslCertificate::OrganizationalUnitName);
+
+    QString issuerOrganization = cert.issuerInfo(QSslCertificate::Organization);
+    QString issuerCommonName = cert.issuerInfo(QSslCertificate::CommonName);
+    QString issuerLocalityName = cert.issuerInfo(QSslCertificate::LocalityName);
+    QString issuerOrganizationalUnitName = cert.issuerInfo(QSslCertificate::OrganizationalUnitName);
+
+    return QString("s:[%1]%2i:[%3]")
+            .arg(QString("O=%1,CN=%2,L=%3,OU=%4,S=%5")
+                 .arg(subjectOrganization)
+                 .arg(subjectCommonName)
+                 .arg(subjectLocalityName)
+                 .arg(subjectOrganizationalUnitName)
+                 .arg(QString(cert.serialNumber())))
+            .arg(delim)
+            .arg(QString("O=%1,CN=%2,L=%3,OU=%4")
+                 .arg(issuerOrganization)
+                 .arg(issuerCommonName)
+                 .arg(issuerLocalityName)
+                 .arg(issuerOrganizationalUnitName));
+}
+
 void SNetworkHelper::onSslErrors(QNetworkReply* reply, const QList<QSslError>& errors) {
-    Q_UNUSED(reply);
-
-    qDebug() << "SSL-Errors occured:";
+    qDebug() << QString("SSL errors occured while connecting to %1:")
+                .arg(reply->request().url().toString());
+
     foreach (QSslError error, errors) {
-        QString subjectOrganization = error.certificate().subjectInfo(QSslCertificate::Organization);
-        QString subjectOrganizationalUnitName = error.certificate().subjectInfo(QSslCertificate::OrganizationalUnitName);
-        QString issuerOrganization = error.certificate().issuerInfo(QSslCertificate::Organization);
-        QString issuerOrganizationalUnitName = error.certificate().issuerInfo(QSslCertificate::OrganizationalUnitName);
-
-        qDebug() << QString("s:[O=%1,OU=%2],i:[O=%3,OU=%4],serial:%5: %6")
-                    .arg(subjectOrganization)
-                    .arg(subjectOrganizationalUnitName)
-                    .arg(issuerOrganization)
-                    .arg(issuerOrganizationalUnitName)
-                    .arg(QString(error.certificate().serialNumber()))
-                    .arg(error.errorString());
+        qDebug() << QString("%1\n  %2")
+                    .arg(error.errorString())
+                    .arg(certToString(error.certificate(), "\n  "));
+    }
+
+    qDebug() << "Installed CAs:";
+    unsigned i = 0;
+    foreach (const QSslCertificate &cert, reply->request().sslConfiguration().caCertificates()) {
+        qDebug() << QString("%1: %2")
+                    .arg(i)
+                    .arg(certToString(cert, "\n   "));
+        ++i;
     }
 }