Changeset 9795 in ntrip for trunk/BNC/src/bncnetqueryv2.cpp

Timestamp:

Jul 22, 2022, 1:34:16 PM (2 years ago)

Author:

stuerze

Message:

consideration of client SSL certificates, if they are available

File:

• trunk/BNC/src/bncnetqueryv2.cpp (modified) (3 diffs)

trunk/BNC/src/bncnetqueryv2.cpp

@@ -36 +36 @@
 
   bncSettings settings;
-  _sslIgnoreErrors =
-     (Qt::CheckState(settings.value("sslIgnoreErrors").toInt()) == Qt::Checked);
-
-  if (_secure && !QSslSocket::supportsSsl()) {
-    BNC_CORE->slotMessage("No SSL support, install OpenSSL run-time libraries", true);
-    stop();
-  }
+  _sslIgnoreErrors = (Qt::CheckState(settings.value("sslIgnoreErrors").toInt()) == Qt::Checked);
+
+  if (_secure ) {
+    if (!QSslSocket::supportsSsl()) {
+      BNC_CORE->slotMessage("No SSL support, install OpenSSL run-time libraries", true);
+      stop();
+    }
+    // Generate filenames to consider a potential client certificate
+    _crtFileName = settings.value("sslClientCertPath").toString() + _url.host() + QString(".%1.crt").arg(_url.port());
+    _keyFileName = settings.value("sslClientCertPath").toString() + _url.host() + QString(".%1.key").arg(_url.port());
+  }
+
+
 }
 
@@ -122 +128 @@
   if (_url.scheme().isEmpty()) {
     if (_secure) {
+      _url.setPort(443);
       _url.setScheme("https");
     }
@@ -134 +141 @@
   // Network Request
   // ---------------
+  bncSslConfig sslConfig = BNC_SSL_CONFIG;
+
+  if (_secure) {
+    QFile clientCrtFile(_crtFileName);
+    QFile privateKeyFile(_keyFileName);
+    if ( clientCrtFile.exists() && privateKeyFile.exists()) {
+      // set local certificate if available
+      clientCrtFile.open(QIODevice::ReadOnly);
+      QSslCertificate clientCrt(&clientCrtFile);
+      sslConfig.setLocalCertificate(clientCrt);
+      // set private key if available
+      privateKeyFile.open(QIODevice::ReadOnly);
+      QSslKey privateKey(&privateKeyFile, QSsl::Rsa);
+      sslConfig.setPrivateKey(privateKey);
+    }
+  }
+
   QNetworkRequest request;
-  request.setSslConfiguration(BNC_SSL_CONFIG);
+  request.setSslConfiguration(sslConfig);
   request.setUrl(_url);
   request.setRawHeader("Host"         , _url.host().toLatin1());