smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Rename TLS constants for consistency

Browse source
This commit is contained in:
Nick Bolton 2025-03-10 16:35:29 +00:00
parent bc96ddebdd
commit bb38ad0766
5 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/apps/deskflow-gui/MainWindow.cpp
View file

@ -1143,18 +1143,18 @@ void MainWindow::setHostName()
QString MainWindow::getTlsPath() QString MainWindow::getTlsPath()
{ {
CoreTool coreTool; CoreTool coreTool;
return QStringLiteral("%1/%2").arg(coreTool.getProfileDir(), kSslDir); return QStringLiteral("%1/%2").arg(coreTool.getProfileDir(), kTlsDirName);
} }
QString MainWindow::localFingerprintDb() QString MainWindow::localFingerprintDb()
{ {
return QStringLiteral("%1/%2").arg(getTlsPath(), kFingerprintLocalFilename); return QStringLiteral("%1/%2").arg(getTlsPath(), kTlsFingerprintLocalFilename);
} }
QString MainWindow::trustedFingerprintDb() QString MainWindow::trustedFingerprintDb()
{ {
const bool isClient = m_coreProcess.mode() == CoreMode::Client; 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); return QStringLiteral("%1/%2").arg(getTlsPath(), trustFile);
} }

15
src/lib/common/constants.h.in
View file

@ -12,12 +12,15 @@ const auto kAppId = "@CMAKE_PROJECT_NAME@";
const auto kAppDescription = "@CMAKE_PROJECT_DESCRIPTION@"; const auto kAppDescription = "@CMAKE_PROJECT_DESCRIPTION@";
const auto kVersion = "@CMAKE_PROJECT_VERSION@"; const auto kVersion = "@CMAKE_PROJECT_VERSION@";
const auto kVersionGitSha = "@GIT_SHA_SHORT@"; 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 kDaemonBinName = "@CMAKE_PROJECT_NAME@-daemon";
const auto kDaemonIpcName = "@CMAKE_PROJECT_NAME@-daemon"; const auto kDaemonIpcName = "@CMAKE_PROJECT_NAME@-daemon";
const auto kDaemonLogFilename = "@CMAKE_PROJECT_NAME@-daemon.log"; const auto kDaemonLogFilename = "@CMAKE_PROJECT_NAME@-daemon.log";
const auto kWindowsRegistryKey = "SOFTWARE\\@CMAKE_PROJECT_PROPER_NAME@"; 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 = // const auto kCopyright = //
"Copyright @CMAKE_PROJECT_COPYRIGHT@\n" "Copyright @CMAKE_PROJECT_COPYRIGHT@\n"
"Copyright (C) 2012-2025 Symless Ltd.\n" "Copyright (C) 2012-2025 Symless Ltd.\n"
@ -30,9 +33,9 @@ const auto kDebugBuild = true;
const auto kDebugBuild = false; const auto kDebugBuild = false;
#endif #endif
const auto kSslDir = "tls"; const auto kTlsDirName = "tls";
const auto kTlsDbSize = 2; const auto kTlsDbSize = 2;
const auto kCertificateFilename = "@CMAKE_PROJECT_NAME@.pem"; const auto kTlsCertificateFilename = "@CMAKE_PROJECT_NAME@.pem";
const auto kFingerprintLocalFilename = "local-fingerprint"; const auto kTlsFingerprintLocalFilename = "local-fingerprint";
const auto kFingerprintTrustedServersFilename = "trusted-servers"; const auto kTlsFingerprintTrustedServersFilename = "trusted-servers";
const auto kFingerprintTrustedClientsFilename = "trusted-clients"; const auto kTlsFingerprintTrustedClientsFilename = "trusted-clients";

4
src/lib/gui/paths.h
View file

@ -49,8 +49,8 @@ inline QDir coreProfileDir()
inline QString defaultTlsCertPath() inline QString defaultTlsCertPath()
{ {
const auto root = coreProfileDir(); const auto root = coreProfileDir();
const auto sslDirPath = QDir(root.filePath(kSslDir)); const auto sslDirPath = QDir(root.filePath(kTlsDirName));
return sslDirPath.filePath(kCertificateFilename); return sslDirPath.filePath(kTlsCertificateFilename);
} }
} // namespace deskflow::gui::paths } // namespace deskflow::gui::paths

6
src/lib/gui/tls/TlsCertificate.cpp
View file

@ -60,7 +60,7 @@ bool TlsCertificate::generateFingerprint(const QString &certificateFilename)
deskflow::FingerprintDatabase db; deskflow::FingerprintDatabase db;
db.addTrusted(deskflow::pemFileCertFingerprint(certPath, deskflow::FingerprintType::SHA1)); db.addTrusted(deskflow::pemFileCertFingerprint(certPath, deskflow::FingerprintType::SHA1));
db.addTrusted(deskflow::pemFileCertFingerprint(certPath, deskflow::FingerprintType::SHA256)); 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"); qDebug("tls fingerprint generated");
return true; return true;
@ -77,12 +77,12 @@ int TlsCertificate::getCertKeyLength(const QString &path)
QString TlsCertificate::getCertificatePath() const 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 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) bool TlsCertificate::isCertificateValid(const QString &path)

6
src/lib/net/SecureSocket.cpp
View file

@ -449,7 +449,7 @@ int SecureSocket::secureAccept(int socket)
if (retry == 0) { if (retry == 0) {
if (m_securityLevel == SecurityLevel::PeerAuth) { if (m_securityLevel == SecurityLevel::PeerAuth) {
std::string dbDir = deskflow::string::sprintf( 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)) { if (!verifyCertFingerprint(dbDir)) {
retry = 0; retry = 0;
@ -481,7 +481,7 @@ int SecureSocket::secureConnect(int socket)
{ {
std::string certDir = 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)) { if (!loadCertificates(certDir)) {
LOG((CLOG_ERR "could not load client certificates")); 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 // No error, set ready, process and return ok
m_secureReady = true; m_secureReady = true;
std::string dbDir = deskflow::string::sprintf( 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)) { if (verifyCertFingerprint(dbDir)) {
LOG((CLOG_INFO "connected to secure socket")); LOG((CLOG_INFO "connected to secure socket"));