openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

refactor: new Setting::tlsTrustedServersDb() method to return trusted server fingerprint db

Browse Source
This commit is contained in:
sithlord48
2025-03-17 21:41:14 -04:00
committed by Nick Bolton
parent dcd2c62880
commit 38f00da704
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/deskflow-gui/MainWindow.cpp
View File

@ -1146,7 +1146,7 @@ void MainWindow::setHostName()
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 ? kTlsFingerprintTrustedServersFilename : kTlsFingerprintTrustedClientsFilename; const auto trustFile = isClient ? Settings::tlsTrustedServersDb() : kTlsFingerprintTrustedClientsFilename;
return QStringLiteral("%1/%2").arg(Settings::tlsDir(), trustFile); return QStringLiteral("%1/%2").arg(Settings::tlsDir(), trustFile);
} }

5
src/lib/common/Settings.cpp
View File

@ -171,6 +171,11 @@ const QString Settings::tlsLocalDb()
return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintLocalFilename); 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) void Settings::setValue(const QString &key, const QVariant &value)
{ {
if (instance()->m_settings->value(key) == value) if (instance()->m_settings->value(key) == value)

1
src/lib/common/Settings.h
View File

@ -143,6 +143,7 @@ public:
static const QString settingsPath(); static const QString settingsPath();
static const QString tlsDir(); static const QString tlsDir();
static const QString tlsLocalDb(); static const QString tlsLocalDb();
static const QString tlsTrustedServersDb();
static const QString logLevelText(); static const QString logLevelText();
static QSettingsProxy &proxy(); static QSettingsProxy &proxy();
static void save(bool emitSaving = true); static void save(bool emitSaving = true);

4
src/lib/net/SecureSocket.cpp
View File

@ -524,9 +524,7 @@ int SecureSocket::secureConnect(int socket)
retry = 0; retry = 0;
// 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 = Settings::tlsTrustedServersDb().toStdString().c_str();
"%s/%s", Settings::tlsDir().toStdString().c_str(), kTlsFingerprintTrustedServersFilename
);
if (verifyCertFingerprint(dbDir)) { if (verifyCertFingerprint(dbDir)) {
LOG((CLOG_INFO "connected to secure socket")); LOG((CLOG_INFO "connected to secure socket"));
if (!showCertificate()) { if (!showCertificate()) {