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

fix: #8259 track a client and server list

Browse source 
fixes 8259
This commit is contained in:
sithlord48 2025-02-27 12:11:54 -05:00 committed by Nick Bolton
parent 551e0211ac
commit 34b61cc8cd
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -797,11 +797,18 @@ void MainWindow::checkFingerprint(const QString &line)
deskflow::string::fromHex(sha256Text.toStdString()) deskflow::string::fromHex(sha256Text.toStdString())
}; };
if (m_checkedPeers.contains(sha256Text)) { const bool isClient = m_coreProcess.mode() == CoreMode::Client;
if ((isClient && m_checkedServers.contains(sha256Text)) || (!isClient && m_checkedClients.contains(sha256Text))) {
qDebug("ignoring fingerprint, already handled"); qDebug("ignoring fingerprint, already handled");
return; return;
} }
m_checkedPeers.append(sha256Text);
if (isClient) {
m_checkedServers.append(sha256Text);
} else {
m_checkedClients.append(sha256Text);
}
deskflow::FingerprintDatabase db; deskflow::FingerprintDatabase db;
db.read(trustedFingerprintDb().toStdString()); db.read(trustedFingerprintDb().toStdString());
@ -811,7 +818,6 @@ void MainWindow::checkFingerprint(const QString &line)
return; return;
} }
const bool isClient = m_coreProcess.mode() == CoreMode::Client;
auto dialogMode = isClient ? FingerprintDialogMode::Client : FingerprintDialogMode::Server; auto dialogMode = isClient ? FingerprintDialogMode::Client : FingerprintDialogMode::Server;
FingerprintDialog fingerprintDialog(this, {sha1, sha256}, dialogMode); FingerprintDialog fingerprintDialog(this, {sha1, sha256}, dialogMode);
@ -820,7 +826,11 @@ void MainWindow::checkFingerprint(const QString &line)
if (fingerprintDialog.exec() == QDialog::Accepted) { if (fingerprintDialog.exec() == QDialog::Accepted) {
db.addTrusted(sha256); db.addTrusted(sha256);
db.write(trustedFingerprintDb().toStdString()); db.write(trustedFingerprintDb().toStdString());
m_checkedPeers.removeAll(sha256Text); if (isClient) {
m_checkedServers.removeAll(sha256Text);
} else {
m_checkedClients.removeAll(sha256Text);
}
} }
} }

3
src/apps/deskflow-gui/MainWindow.h
View file

@ -204,7 +204,8 @@ private:
deskflow::gui::ClientConnection m_clientConnection; deskflow::gui::ClientConnection m_clientConnection;
deskflow::gui::TlsUtility m_tlsUtility; deskflow::gui::TlsUtility m_tlsUtility;
QSize m_expandedSize = QSize(); QSize m_expandedSize = QSize();
QStringList m_checkedPeers; QStringList m_checkedClients;
QStringList m_checkedServers;
QSystemTrayIcon *m_trayIcon = nullptr; QSystemTrayIcon *m_trayIcon = nullptr;
QLocalServer *m_guiDupeChecker = nullptr; QLocalServer *m_guiDupeChecker = nullptr;