GSvarServer: removed ssl_certificate_chain config parameter, the chai…

…n will be read from the certificate file
imgag · Oct 24, 2024 · c23b969 · c23b969
1 parent ef13f17
commit c23b969
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/bin/GSvarServer.ini.example b/bin/GSvarServer.ini.example
@@ -8,7 +8,6 @@ megsap_settings_ini = ""
 
 #SSL certificate-key pair needed for HTTPS
 ssl_certificate = "certificate.crt"
-ssl_certificate_chain = ""
 ssl_key = "certificate.key"
 
 #number of threads for parallel calculations, e.g. for coverage statistics

diff --git a/bin/settings_nightly.ini b/bin/settings_nightly.ini
@@ -47,7 +47,6 @@ server_host = "127.0.0.1"
 server_port = 
 ssl_certificate = 
 ssl_key = 
-ssl_certificate_chain = 
 session_duration = 36000
 
 #NovaSeqX

diff --git a/doc/GSvarServer/index.md b/doc/GSvarServer/index.md
@@ -23,7 +23,6 @@ The server is configurable via the GSVarServer.ini file located at the `./bin` f
 These are the most important config parameters:
 
 * `ssl_certificate` - location of your SSL certificate
-* `ssl_certificate_chain` - If the certificate itself does not contain all information for validation of the certificate, you can provide this optional chertificate chain file. It is used e.g. for Let's encrypt certificates.
 * `ssl_key` - location of your private key
 * `server_port` - port used by the server
 * `server_host` - domain name used be the server

diff --git a/src/GSvarServer/ServerWrapper.cpp b/src/GSvarServer/ServerWrapper.cpp
@@ -24,21 +24,19 @@ ServerWrapper::ServerWrapper(const quint16& port)
 		return;
 	}
 
+    QList<QSslCertificate> ca_certificates = QSslCertificate::fromPath(ssl_certificate, QSsl::Pem);
+    if (ca_certificates.isEmpty())
+    {
+        Log::info("SSL certificate chain not found. Continue with the available key");
+    }
+
 	QString ssl_key = ServerHelper::getStringSettingsValue("ssl_key");
 	if (ssl_key.isEmpty())
 	{
 		ssl_key = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + QDir::separator() + "test-key.key";
 		Log::warn("SSL key has not been specified in the config. Using a test key: " + ssl_key);
 	}
 
-	QString ssl_chain = ServerHelper::getStringSettingsValue("ssl_certificate_chain");
-	QList<QSslCertificate> ca_certificates;
-	if (!ssl_chain.isEmpty())
-	{
-		Log::info("Reading SSL certificate chain file");
-		ca_certificates = QSslCertificate::fromPath(ssl_chain, QSsl::Pem);
-	}
-
 	QSslCertificate cert(&certFile);
     QSslKey key = readPrivateKey(ssl_key);
     if (key.isNull())
@@ -53,7 +51,6 @@ ServerWrapper::ServerWrapper(const quint16& port)
 	config.setLocalCertificate(cert);
 	config.setPrivateKey(key);
 
-
 	if (ca_certificates.size()>0)
 	{
 		Log::info("Loading SSL certificate chain");