From bb38ad0766751140d75942dd4e641ff8082f08c2 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Mon, 10 Mar 2025 16:35:29 +0000 Subject: [PATCH] chore: Rename TLS constants for consistency --- src/apps/deskflow-gui/MainWindow.cpp | 6 +++--- src/lib/common/constants.h.in | 15 +++++++++------ src/lib/gui/paths.h | 4 ++-- src/lib/gui/tls/TlsCertificate.cpp | 6 +++--- src/lib/net/SecureSocket.cpp | 6 +++--- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp index cf9902c69..1bbb6253e 100644 --- a/src/apps/deskflow-gui/MainWindow.cpp +++ b/src/apps/deskflow-gui/MainWindow.cpp @@ -1143,18 +1143,18 @@ void MainWindow::setHostName() QString MainWindow::getTlsPath() { CoreTool coreTool; - return QStringLiteral("%1/%2").arg(coreTool.getProfileDir(), kSslDir); + return QStringLiteral("%1/%2").arg(coreTool.getProfileDir(), kTlsDirName); } QString MainWindow::localFingerprintDb() { - return QStringLiteral("%1/%2").arg(getTlsPath(), kFingerprintLocalFilename); + return QStringLiteral("%1/%2").arg(getTlsPath(), kTlsFingerprintLocalFilename); } QString MainWindow::trustedFingerprintDb() { const bool isClient = m_coreProcess.mode() == CoreMode::Client; - const auto trustFile = isClient ? kFingerprintTrustedServersFilename : kFingerprintTrustedClientsFilename; + const auto trustFile = isClient ? kTlsFingerprintTrustedServersFilename : kTlsFingerprintTrustedClientsFilename; return QStringLiteral("%1/%2").arg(getTlsPath(), trustFile); } diff --git a/src/lib/common/constants.h.in b/src/lib/common/constants.h.in index ba762c44d..b45543dc0 100644 --- a/src/lib/common/constants.h.in +++ b/src/lib/common/constants.h.in @@ -12,12 +12,15 @@ const auto kAppId = "@CMAKE_PROJECT_NAME@"; const auto kAppDescription = "@CMAKE_PROJECT_DESCRIPTION@"; const auto kVersion = "@CMAKE_PROJECT_VERSION@"; const auto kVersionGitSha = "@GIT_SHA_SHORT@"; -const auto kDisplayVersion = @CMAKE_PROJECT_VERSION_TWEAK@ ? "@CMAKE_PROJECT_VERSION@ (@GIT_SHA_SHORT@)" : "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@"; const auto kDaemonBinName = "@CMAKE_PROJECT_NAME@-daemon"; const auto kDaemonIpcName = "@CMAKE_PROJECT_NAME@-daemon"; const auto kDaemonLogFilename = "@CMAKE_PROJECT_NAME@-daemon.log"; const auto kWindowsRegistryKey = "SOFTWARE\\@CMAKE_PROJECT_PROPER_NAME@"; +// clang-format off +const auto kDisplayVersion = @CMAKE_PROJECT_VERSION_TWEAK@ ? "@CMAKE_PROJECT_VERSION@ (@GIT_SHA_SHORT@)" : "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@"; +// clang-format on + const auto kCopyright = // "Copyright @CMAKE_PROJECT_COPYRIGHT@\n" "Copyright (C) 2012-2025 Symless Ltd.\n" @@ -30,9 +33,9 @@ const auto kDebugBuild = true; const auto kDebugBuild = false; #endif -const auto kSslDir = "tls"; +const auto kTlsDirName = "tls"; const auto kTlsDbSize = 2; -const auto kCertificateFilename = "@CMAKE_PROJECT_NAME@.pem"; -const auto kFingerprintLocalFilename = "local-fingerprint"; -const auto kFingerprintTrustedServersFilename = "trusted-servers"; -const auto kFingerprintTrustedClientsFilename = "trusted-clients"; +const auto kTlsCertificateFilename = "@CMAKE_PROJECT_NAME@.pem"; +const auto kTlsFingerprintLocalFilename = "local-fingerprint"; +const auto kTlsFingerprintTrustedServersFilename = "trusted-servers"; +const auto kTlsFingerprintTrustedClientsFilename = "trusted-clients"; diff --git a/src/lib/gui/paths.h b/src/lib/gui/paths.h index 8050972d6..bde6990f6 100644 --- a/src/lib/gui/paths.h +++ b/src/lib/gui/paths.h @@ -49,8 +49,8 @@ inline QDir coreProfileDir() inline QString defaultTlsCertPath() { const auto root = coreProfileDir(); - const auto sslDirPath = QDir(root.filePath(kSslDir)); - return sslDirPath.filePath(kCertificateFilename); + const auto sslDirPath = QDir(root.filePath(kTlsDirName)); + return sslDirPath.filePath(kTlsCertificateFilename); } } // namespace deskflow::gui::paths diff --git a/src/lib/gui/tls/TlsCertificate.cpp b/src/lib/gui/tls/TlsCertificate.cpp index 882c71ce5..56aa238c0 100644 --- a/src/lib/gui/tls/TlsCertificate.cpp +++ b/src/lib/gui/tls/TlsCertificate.cpp @@ -60,7 +60,7 @@ bool TlsCertificate::generateFingerprint(const QString &certificateFilename) deskflow::FingerprintDatabase db; db.addTrusted(deskflow::pemFileCertFingerprint(certPath, deskflow::FingerprintType::SHA1)); db.addTrusted(deskflow::pemFileCertFingerprint(certPath, deskflow::FingerprintType::SHA256)); - db.write(QStringLiteral("%1/%2").arg(getTlsDir(), kFingerprintLocalFilename).toStdString()); + db.write(QStringLiteral("%1/%2").arg(getTlsDir(), kTlsFingerprintLocalFilename).toStdString()); qDebug("tls fingerprint generated"); return true; @@ -77,12 +77,12 @@ int TlsCertificate::getCertKeyLength(const QString &path) QString TlsCertificate::getCertificatePath() const { - return QStringLiteral("%1/%2/%3").arg(m_profileDir, kSslDir, kCertificateFilename); + return QStringLiteral("%1/%2/%3").arg(m_profileDir, kTlsDirName, kTlsCertificateFilename); } QString TlsCertificate::getTlsDir() const { - return QStringLiteral("%1/%2").arg(m_profileDir, kSslDir); + return QStringLiteral("%1/%2").arg(m_profileDir, kTlsDirName); } bool TlsCertificate::isCertificateValid(const QString &path) diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp index 435393c6e..b01b053b7 100644 --- a/src/lib/net/SecureSocket.cpp +++ b/src/lib/net/SecureSocket.cpp @@ -449,7 +449,7 @@ int SecureSocket::secureAccept(int socket) if (retry == 0) { if (m_securityLevel == SecurityLevel::PeerAuth) { std::string dbDir = deskflow::string::sprintf( - "%s/%s/%s", ARCH->getProfileDirectory().c_str(), kSslDir, kFingerprintTrustedClientsFilename + "%s/%s/%s", ARCH->getProfileDirectory().c_str(), kTlsDirName, kTlsFingerprintTrustedClientsFilename ); if (!verifyCertFingerprint(dbDir)) { retry = 0; @@ -481,7 +481,7 @@ int SecureSocket::secureConnect(int socket) { std::string certDir = - deskflow::string::sprintf("%s/%s/%s", ARCH->getProfileDirectory().c_str(), kSslDir, kCertificateFilename); + deskflow::string::sprintf("%s/%s/%s", ARCH->getProfileDirectory().c_str(), kTlsDirName, kTlsCertificateFilename); if (!loadCertificates(certDir)) { LOG((CLOG_ERR "could not load client certificates")); @@ -525,7 +525,7 @@ int SecureSocket::secureConnect(int socket) // No error, set ready, process and return ok m_secureReady = true; std::string dbDir = deskflow::string::sprintf( - "%s/%s/%s", ARCH->getProfileDirectory().c_str(), kSslDir, kFingerprintTrustedServersFilename + "%s/%s/%s", ARCH->getProfileDirectory().c_str(), kTlsDirName, kTlsFingerprintTrustedServersFilename ); if (verifyCertFingerprint(dbDir)) { LOG((CLOG_INFO "connected to secure socket"));