From 55601debe0d27f40e9deb821cb9600fb6682c690 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Mon, 17 Mar 2025 21:04:35 -0400
Subject: [PATCH] refactor: use Settings in SecureListenSocket for certificate
 path

---
 src/lib/net/CMakeLists.txt         |  2 +-
 src/lib/net/SecureListenSocket.cpp | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/lib/net/CMakeLists.txt b/src/lib/net/CMakeLists.txt
index 3b011fe178..a7a7d95eae 100644
--- a/src/lib/net/CMakeLists.txt
+++ b/src/lib/net/CMakeLists.txt
@@ -49,7 +49,7 @@ add_library(net STATIC
 
 target_link_libraries(
   net
-  PUBLIC OpenSSL::SSL OpenSSL::Crypto
+  PUBLIC OpenSSL::SSL OpenSSL::Crypto common
   PRIVATE mt io)
 
 if(WIN32)
diff --git a/src/lib/net/SecureListenSocket.cpp b/src/lib/net/SecureListenSocket.cpp
index 8340534269..5ec1e9be54 100644
--- a/src/lib/net/SecureListenSocket.cpp
+++ b/src/lib/net/SecureListenSocket.cpp
@@ -10,17 +10,13 @@
 #include "SecureSocket.h"
 #include "arch/XArch.h"
 #include "base/String.h"
-#include "common/constants.h"
+#include "common/Settings.h"
 #include "deskflow/ArgParser.h"
 #include "deskflow/ArgsBase.h"
 #include "net/NetworkAddress.h"
 #include "net/SocketMultiplexer.h"
 #include "net/TSocketMultiplexerMethodJob.h"
 
-// TODO: Reduce duplication of these strings between here and SecureSocket.cpp
-static const char s_certificateDir[] = {"tls"};
-static const char s_certificateFileExt[] = {"pem"};
-
 //
 // SecureListenSocket
 //
@@ -47,9 +43,7 @@ IDataSocket *SecureListenSocket::accept()
     }
 
     // default location of the TLS cert file in users dir
-    std::string certificateFilename = deskflow::string::sprintf(
-        "%s/%s/%s.%s", ARCH->getProfileDirectory().c_str(), s_certificateDir, kAppId, s_certificateFileExt
-    );
+    std::string certificateFilename = Settings::value(Settings::Security::Certificate).toString().toStdString();
 
     // if the tls cert option is set use that for the certificate file
     if (!ArgParser::argsBase().m_tlsCertFile.empty()) {