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

refactor: move requirepeerchecking to Settings

Browse Source 
newkey: security/checkpeerfingerprints <= General/requireClientCerts
remove requireClientCerts from appconfig
This commit is contained in:
sithlord48
2025-03-06 19:42:16 -05:00
committed by Nick Bolton
parent 4eb7ea3491
commit 5360fb3c89
11 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,7 +385,7 @@ void MainWindow::firstShown()
void MainWindow::settingsChanged(const QString &key)
{
if ((key == Settings::Security::Certificate) || (key == Settings::Security::KeySize) ||
(key == Settings::Security::TlsEnabled)) {
(key == Settings::Security::TlsEnabled) || (key == Settings::Security::CheckPeers)) {
const auto certificate = Settings::value(Settings::Security::Certificate).toString();
if (m_tlsUtility.isEnabled() && !QFile::exists(certificate)) {
m_tlsUtility.generateCertificate();

4
src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
View File

@ -160,7 +160,7 @@ void SettingsDialog::accept()
m_appConfig.setEnableService(ui->cbServiceEnabled->isChecked());
Settings::setValue(Settings::Gui::CloseToTray, ui->cbCloseToTray->isChecked());
Settings::setValue(Settings::Gui::SymbolicTrayIcon, ui->rbIconMono->isChecked());
m_appConfig.setRequireClientCerts(ui->cbRequireClientCert->isChecked());
Settings::setValue(Settings::Security::CheckPeers, ui->cbRequireClientCert->isChecked());
QDialog::accept();
}
@ -223,7 +223,7 @@ void SettingsDialog::updateTlsControls()
const auto enabled = writable && tlsEnabled;
ui->lineTlsCertPath->setText(certificate);
ui->cbRequireClientCert->setChecked(m_appConfig.requireClientCerts());
ui->cbRequireClientCert->setChecked(Settings::value(Settings::Security::CheckPeers).toBool());
ui->groupSecurity->setChecked(tlsEnabled);
ui->groupSecurity->setEnabled(writable);

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

@ -74,8 +74,8 @@ QVariant Settings::defaultValue(const QString &key)
return false;
}
if ((key == Gui::CloseToTray) || (key == Gui::LogExpanded) || (key == Gui::SymbolicTrayIcon) ||
(key == Gui::CloseReminder) || (key == Security::TlsEnabled)) {
if ((key == Gui::CloseToTray) || (key == Gui::LogExpanded) || (key == Gui::SymbolicTrayIcon)
|| (key == Gui::CloseReminder) || (key == Security::TlsEnabled) || (key == Security::CheckPeers)) {
return true;
}
@ -85,7 +85,7 @@ QVariant Settings::defaultValue(const QString &key)
if (key == Security::KeySize)
return 2048;
if (key == Settings::Security::Certificate)
if (key == Security::Certificate)
return QStringLiteral("%1/%2/%3").arg(instance()->settingsPath(), kTlsDirName, kTlsCertificateFilename);
return QVariant();

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

@ -17,18 +17,17 @@ class Settings : public QObject
Q_OBJECT
public:
#if defined(Q_OS_WIN)
inline const static auto UserSettingFile =
QStringLiteral("%1/AppData/Local/%2/%3.conf").arg(QDir::homePath(), kAppName, kAppName);
inline const static auto SystemSettingFile = QStringLiteral("C:/ProgramData/%2/%3.conf").arg(kAppName, kAppName);
inline const static auto UserDir = QStringLiteral("%1/AppData/Local/%2").arg(QDir::homePath(), kAppName);
inline const static auto SystemDir = QStringLiteral("C:/ProgramData/%1").arg(kAppName);
#elif defined(Q_OS_MAC)
inline const static auto UserSettingFile =
QStringLiteral("%1/Library/%2/%3.conf").arg(QDir::homePath(), kAppName, kAppName);
inline const static auto SystemSettingFile = QStringLiteral("/Libaray/%2/%3.conf").arg(kAppName, kAppName);
inline const static auto UserDir = QStringLiteral("%1/Library/%2").arg(QDir::homePath(), kAppName);
inline const static auto SystemDir = QStringLiteral("/Library/%1").arg(kAppName);
#else
inline const static auto UserSettingFile =
QStringLiteral("%1/.config/%2/%3.conf").arg(QDir::homePath(), kAppName, kAppName);
inline const static auto SystemSettingFile = QStringLiteral("/etc/%2/%3.conf").arg(kAppName, kAppName);
inline const static auto UserDir = QStringLiteral("%1/.config/%2").arg(QDir::homePath(), kAppName);
inline const static auto SystemDir = QStringLiteral("/etc/%1").arg(kAppName);
#endif
inline const static auto UserSettingFile = QStringLiteral("%1/%2.conf").arg(UserDir, kAppName);
inline const static auto SystemSettingFile = QStringLiteral("%1/%2.conf").arg(SystemDir, kAppName);
struct Core
{
@ -47,6 +46,7 @@ public:
};
struct Security
{
inline static const auto CheckPeers = QStringLiteral("security/checkpeerfingerprints");
inline static const auto Certificate = QStringLiteral("security/certificate");
inline static const auto KeySize = QStringLiteral("security/keySize");
inline static const auto TlsEnabled = QStringLiteral("security/tlsEnabled");
@ -92,6 +92,7 @@ private:
, Gui::SymbolicTrayIcon
, Gui::WindowGeometry
, Security::Certificate
, Security::CheckPeers
, Security::KeySize
, Security::TlsEnabled
};

16
src/lib/gui/config/AppConfig.cpp
View File

@ -79,7 +79,7 @@ const char *const AppConfig::m_SettingsName[] = {
"", // 43 Moved to deskflow settings
"", // 44, Moved to deskflow settings.
"", // 45 Moved to deskflow settings
"requireClientCerts",
"", // 46 require peer certs, Moved to deskflow settings
};
AppConfig::AppConfig(deskflow::gui::IConfigScopes &scopes, std::shared_ptr<Deps> deps)
@ -130,7 +130,6 @@ void AppConfig::recallFromCurrentScope()
m_LanguageSync = getFromCurrentScope(kLanguageSync, m_LanguageSync).toBool();
m_InvertScrollDirection = getFromCurrentScope(kInvertScrollDirection, m_InvertScrollDirection).toBool();
m_EnableService = getFromCurrentScope(kEnableService, m_EnableService).toBool();
m_RequireClientCert = getFromCurrentScope(kRequireClientCert, m_RequireClientCert).toBool();
}
void AppConfig::recallScreenName()
@ -178,7 +177,6 @@ void AppConfig::commit()
setInCurrentScope(kLanguageSync, m_LanguageSync);
setInCurrentScope(kInvertScrollDirection, m_InvertScrollDirection);
setInCurrentScope(kEnableService, m_EnableService);
setInCurrentScope(kRequireClientCert, m_RequireClientCert);
}
}
@ -485,11 +483,6 @@ bool AppConfig::clientGroupChecked() const
return m_ClientGroupChecked;
}
bool AppConfig::requireClientCerts() const
{
return m_RequireClientCert;
}
const QString &AppConfig::serverHostname() const
{
return m_ServerHostname;
@ -596,13 +589,6 @@ void AppConfig::setEnableService(bool enabled)
m_EnableService = enabled;
}
void AppConfig::setRequireClientCerts(bool requireClientCerts)
{
if (requireClientCerts == m_RequireClientCert)
return;
m_RequireClientCert = requireClientCerts;
}
///////////////////////////////////////////////////////////////////////////////
// End setters
///////////////////////////////////////////////////////////////////////////////

5
src/lib/gui/config/AppConfig.h
View File

@ -100,7 +100,7 @@ private:
// 43 = Enable Update Check,
// 44 = LogExpanded, Moved to deskflow settings
// 45 = Colorful Icon, Moved to deskflow settings
kRequireClientCert = 46
// kRequireClientCert = 46 Moved to deskflow settings
};
public:
@ -150,7 +150,6 @@ public:
int logLevel() const override;
bool enableService() const override;
bool clientGroupChecked() const override;
bool requireClientCerts() const override;
//
// Getters (new methods)
@ -176,7 +175,6 @@ public:
void setLanguageSync(bool b) override;
void setPreventSleep(bool b) override;
void setEnableService(bool enabled) override;
void setRequireClientCerts(bool requireClientCerts) override;
//
// Setters (new methods)
@ -278,7 +276,6 @@ private:
QString m_ServerHostname = "";
bool m_EnableService = deskflow::gui::kDefaultProcessMode == ProcessMode::kService;
bool m_LoadFromSystemScope = false;
bool m_RequireClientCert = true;
deskflow::gui::IConfigScopes &m_Scopes;
std::shared_ptr<Deps> m_pDeps;

2
src/lib/gui/config/IAppConfig.h
View File

@ -54,7 +54,6 @@ public:
virtual bool isActiveScopeSystem() const = 0;
virtual bool isActiveScopeWritable() const = 0;
virtual bool clientGroupChecked() const = 0;
virtual bool requireClientCerts() const = 0;
//
// Setters
@ -72,7 +71,6 @@ public:
virtual void setLanguageSync(bool languageSync) = 0;
virtual void setInvertScrollDirection(bool invertScrollDirection) = 0;
virtual void setEnableService(bool enableService) = 0;
virtual void setRequireClientCerts(bool requireClientCerts) = 0;
};
} // namespace deskflow::gui

2
src/lib/gui/core/CoreProcess.cpp
View File

@ -534,7 +534,7 @@ bool CoreProcess::addServerArgs(QStringList &args, QString &app)
args << "--log" << m_appConfig.logFilename();
}
if (!m_appConfig.requireClientCerts()) {
if (!Settings::value(Settings::Security::CheckPeers).toBool()) {
args << "--disable-client-cert-check";
}

4
src/lib/gui/core/ServerConnection.cpp
View File

@ -96,8 +96,8 @@ void ServerConnection::handleNewClient(const QString &clientName)
m_messageShowing = true;
const bool tlsEnabled = Settings::value(Settings::Security::TlsEnabled).toBool();
const auto result =
m_pDeps->showNewClientPrompt(m_pParent, clientName, tlsEnabled && m_appConfig.requireClientCerts());
const bool requireCerts = Settings::value(Settings::Security::CheckPeers).toBool();
const auto result = m_pDeps->showNewClientPrompt(m_pParent, clientName, tlsEnabled && requireCerts);
m_messageShowing = false;
if (result == Add) {

2
src/test/shared/gui/mocks/AppConfigMock.h
View File

@ -55,7 +55,6 @@ public:
MOCK_METHOD(bool, isActiveScopeSystem, (), (const, override));
MOCK_METHOD(bool, isActiveScopeWritable, (), (const, override));
MOCK_METHOD(bool, clientGroupChecked, (), (const, override));
MOCK_METHOD(bool, requireClientCerts, (), (const, override));
//
// Setters
@ -73,7 +72,6 @@ public:
MOCK_METHOD(void, setLanguageSync, (bool languageSync), (override));
MOCK_METHOD(void, setInvertScrollDirection, (bool invertScrollDirection), (override));
MOCK_METHOD(void, setEnableService, (bool enableService), (override));
MOCK_METHOD(void, setRequireClientCerts, (bool requireClientCerts), (override));
private:
const QString m_stub = "stub";

2
src/test/unittests/gui/core/ServerConnectionTests.cpp
View File

@ -46,7 +46,7 @@ TEST_F(ServerConnectionTests, handleLogLine_newClient_shouldShowPrompt)
ServerConnection serverConnection(nullptr, m_appConfig, m_serverConfig, m_serverConfigDialogState, m_pDeps);
QString clientName = "test client";
EXPECT_CALL(*m_pDeps, showNewClientPrompt(_, clientName, false));
EXPECT_CALL(*m_pDeps, showNewClientPrompt(_, clientName, true));
serverConnection.handleLogLine(R"(unrecognised client name "test client")");
}