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

refactor: new private MainWindow method localhostFingerprintDb

Browse source
This commit is contained in:
sithlord48 2025-02-16 19:46:00 -05:00 committed by Chris Rizzitello
parent 8d0491f1ad
commit 2f8b78e2a6
2 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -160,14 +160,13 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig)
// Force generation of SHA256 for the localhost // Force generation of SHA256 for the localhost
if (m_appConfig.tlsEnabled()) { if (m_appConfig.tlsEnabled()) {
auto localPath = QStringLiteral("%1/%2").arg(getTlsPath(), kFingerprintLocalFilename); if (!QFile::exists(localFingerPrintDb())) {
if (!QFile::exists(localPath)) {
regenerateLocalFingerprints(); regenerateLocalFingerprints();
return; return;
} }
deskflow::FingerprintDatabase db; deskflow::FingerprintDatabase db;
db.read(localPath.toStdString()); db.read(localFingerPrintDb().toStdString());
if (db.fingerprints().size() != kTlsDbSize) { if (db.fingerprints().size() != kTlsDbSize) {
regenerateLocalFingerprints(); regenerateLocalFingerprints();
} }
@ -486,15 +485,14 @@ void MainWindow::updateSize()
void MainWindow::showMyFingerprint() void MainWindow::showMyFingerprint()
{ {
auto localPath = QStringLiteral("%1/%2").arg(getTlsPath(), kFingerprintLocalFilename); if (!QFile::exists(localFingerPrintDb())) {
if (!QFile::exists(localPath)) {
if (regenerateLocalFingerprints()) if (regenerateLocalFingerprints())
showMyFingerprint(); showMyFingerprint();
return; return;
} }
deskflow::FingerprintDatabase db; deskflow::FingerprintDatabase db;
db.read(localPath.toStdString()); db.read(localFingerPrintDb().toStdString());
if (db.fingerprints().size() != kTlsDbSize) { if (db.fingerprints().size() != kTlsDbSize) {
if (regenerateLocalFingerprints()) if (regenerateLocalFingerprints())
showMyFingerprint(); showMyFingerprint();
@ -952,20 +950,7 @@ QString MainWindow::getIPAddresses() const
void MainWindow::updateLocalFingerprint() void MainWindow::updateLocalFingerprint()
{ {
bool fingerprintExists = false; ui->lblMyFingerprint->setVisible(m_appConfig.tlsEnabled() && QFile::exists(localFingerPrintDb()));
try {
auto localPath = QStringLiteral("%1/%2").arg(getTlsPath(), kFingerprintLocalFilename);
fingerprintExists = QFile::exists(localPath);
} catch (const std::exception &e) {
qDebug() << e.what();
qFatal() << "failed to check if fingerprint exists";
}
if (m_appConfig.tlsEnabled() && fingerprintExists) {
ui->lblMyFingerprint->setVisible(true);
} else {
ui->lblMyFingerprint->setVisible(false);
}
} }
void MainWindow::autoAddScreen(const QString name) void MainWindow::autoAddScreen(const QString name)
@ -1086,6 +1071,11 @@ QString MainWindow::getTlsPath()
return QStringLiteral("%1/%2").arg(coreTool.getProfileDir(), kSslDir); return QStringLiteral("%1/%2").arg(coreTool.getProfileDir(), kSslDir);
} }
QString MainWindow::localFingerPrintDb()
{
return QStringLiteral("%1/%2").arg(getTlsPath(), kFingerprintLocalFilename);
}
bool MainWindow::regenerateLocalFingerprints() bool MainWindow::regenerateLocalFingerprints()
{ {
TlsCertificate tls; TlsCertificate tls;

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

@ -166,6 +166,7 @@ private:
void showAndActivate(); void showAndActivate();
QString getTlsPath(); QString getTlsPath();
QString localFingerPrintDb();
// Generate prints if they are missing // Generate prints if they are missing
// Returns true if successful // Returns true if successful