Changeset 9726 in ntrip

Timestamp:

May 19, 2022, 10:38:53 PM (3 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/upload

Files:

• bncuploadcaster.cpp (modified) (2 diffs)
• bncuploadcaster.h (modified) (1 diff)

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -119 +119 @@
   emit newMessage("slotProxyAuthenticationRequired", true);
 }
+
+// TSL/SSL
+ ////////////////////////////////////////////////////////////////////////////
+void bncUploadCaster::slotSslErrors(QList<QSslError> errors) {
+  QString msg = "SSL Error: ";
+  if (_outSocket) {
+    QSslCertificate cert = _outSocket->sslConfiguration().peerCertificate();
+    if (!cert.isNull() &&
+         cert.issuerInfo(QSslCertificate::OrganizationalUnitName).count() &&
+         cert.issuerInfo(QSslCertificate::Organization).count()) {
+      msg += QString("Server Certificate Issued by:\n"
+                     "%1\n%2\nCannot be verified\n")
+#if QT_VERSION >= 0x050000
+            .arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName).at(0))
+            .arg(cert.issuerInfo(QSslCertificate::Organization).at(0));
+#else
+            .arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName))
+            .arg(cert.issuerInfo(QSslCertificate::Organization));
+#endif
+    }
+
+    QListIterator<QSslError> it(errors);
+    while (it.hasNext()) {
+      const QSslError& err = it.next();
+      msg += err.errorString();
+    }
+    cout << "msg.toStdString(): " << msg.toStdString().c_str() << endl;
+    emit(newMessage(msg.toLatin1(), true));
+
+    if (_sslIgnoreErrors) {
+      _outSocket->ignoreSslErrors();
+      emit(newMessage("BNC ignores SSL errors as configured", true));
+    }
+  }
+}
+
 
 // Endless Loop
@@ -194 +230 @@
 
   _outSocket = new QSslSocket();
+  _outSocket->setSslConfiguration(sslConfig);
   _outSocket->setProxy(QNetworkProxy::NoProxy);
-  _outSocket->setSslConfiguration(sslConfig);
-  if (_sslIgnoreErrors) {
-    _outSocket->ignoreSslErrors();
-    emit(newMessage("BNC ignores SSL errors as configured", true));
-  }
+  connect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
 
   if (_proxy) {

trunk/BNC/src/upload/bncuploadcaster.h

@@ -36 +36 @@
  private slots:
   void slotProxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*);
+  void slotSslErrors(QList<QSslError>);
 
  private: