From 38f00da70489a53e7263f625e4f06110d0bbcc8a Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Mon, 17 Mar 2025 21:41:14 -0400
Subject: [PATCH] refactor: new Setting::tlsTrustedServersDb() method to return
 trusted server fingerprint db

---
 src/apps/deskflow-gui/MainWindow.cpp | 2 +-
 src/lib/common/Settings.cpp          | 5 +++++
 src/lib/common/Settings.h            | 1 +
 src/lib/net/SecureSocket.cpp         | 4 +---
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index 0a9283a01..76ea6dede 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -1146,7 +1146,7 @@ void MainWindow::setHostName()
 QString MainWindow::trustedFingerprintDb()
 {
   const bool isClient = m_coreProcess.mode() == CoreMode::Client;
-  const auto trustFile = isClient ? kTlsFingerprintTrustedServersFilename : kTlsFingerprintTrustedClientsFilename;
+  const auto trustFile = isClient ? Settings::tlsTrustedServersDb() : kTlsFingerprintTrustedClientsFilename;
   return QStringLiteral("%1/%2").arg(Settings::tlsDir(), trustFile);
 }
 
diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp
index 30118ba54..f6124cc70 100644
--- a/src/lib/common/Settings.cpp
+++ b/src/lib/common/Settings.cpp
@@ -171,6 +171,11 @@ const QString Settings::tlsLocalDb()
   return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintLocalFilename);
 }
 
+const QString Settings::tlsTrustedServersDb()
+{
+  return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintTrustedServersFilename);
+}
+
 void Settings::setValue(const QString &key, const QVariant &value)
 {
   if (instance()->m_settings->value(key) == value)
diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h
index 68a46ae48..5c873252b 100644
--- a/src/lib/common/Settings.h
+++ b/src/lib/common/Settings.h
@@ -143,6 +143,7 @@ public:
   static const QString settingsPath();
   static const QString tlsDir();
   static const QString tlsLocalDb();
+  static const QString tlsTrustedServersDb();
   static const QString logLevelText();
   static QSettingsProxy &proxy();
   static void save(bool emitSaving = true);
diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
index d28cd6c53..5abf4ce07 100644
--- a/src/lib/net/SecureSocket.cpp
+++ b/src/lib/net/SecureSocket.cpp
@@ -524,9 +524,7 @@ int SecureSocket::secureConnect(int socket)
   retry = 0;
   // No error, set ready, process and return ok
   m_secureReady = true;
-  std::string dbDir = deskflow::string::sprintf(
-      "%s/%s", Settings::tlsDir().toStdString().c_str(), kTlsFingerprintTrustedServersFilename
-  );
+  std::string dbDir = Settings::tlsTrustedServersDb().toStdString().c_str();
   if (verifyCertFingerprint(dbDir)) {
     LOG((CLOG_INFO "connected to secure socket"));
     if (!showCertificate()) {