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

chore: Change TLS dir to same as Qt config

Browse source
This commit is contained in:
Nick Bolton 2024-10-14 16:06:05 +01:00
parent 3525b8a686
commit 9c4f6e6d0b
8 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/src/MainWindow.cpp
View file

@ -440,7 +440,7 @@ void MainWindow::on_m_pLabelComputerName_linkActivated(const QString &) {
void MainWindow::on_m_pLabelFingerprint_linkActivated(const QString &) { void MainWindow::on_m_pLabelFingerprint_linkActivated(const QString &) {
QMessageBox::information( QMessageBox::information(
this, "SSL/TLS fingerprint", TlsFingerprint::local().readFirst()); this, "TLS fingerprint", TlsFingerprint::local().readFirst());
} }
void MainWindow::on_m_pRadioGroupServer_clicked(bool) { void MainWindow::on_m_pRadioGroupServer_clicked(bool) {

2
src/lib/arch/unix/ArchFileUnix.cpp
View file

@ -105,7 +105,7 @@ std::string ArchFileUnix::getProfileDirectory() {
dir = m_profileDirectory; dir = m_profileDirectory;
} else { } else {
#if WINAPI_XWINDOWS #if WINAPI_XWINDOWS
dir = getUserDirectory().append("/." DESKFLOW_APP_ID); dir = getUserDirectory().append("/.config/" DESKFLOW_APP_NAME);
#else #else
dir = getUserDirectory().append("/Library/" DESKFLOW_APP_NAME); dir = getUserDirectory().append("/Library/" DESKFLOW_APP_NAME);
#endif #endif

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

@ -23,8 +23,9 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QString> #include <QString>
const auto kCertificateFilename = QString("%1.pem").arg(DESKFLOW_APP_NAME); // TODO: Reduce duplication of these strings between here and SecureSocket.cpp
const auto kSslDir = "SSL"; const auto kCertificateFilename = QString("%1.pem").arg(DESKFLOW_APP_ID);
const auto kSslDir = "tls";
namespace deskflow::gui::paths { namespace deskflow::gui::paths {

9
src/lib/gui/tls/TlsFingerprint.cpp
View file

@ -22,10 +22,11 @@
#include <QDir> #include <QDir>
#include <QTextStream> #include <QTextStream>
static const char kDirName[] = "SSL/Fingerprints"; // TODO: Reduce duplication of these strings between here and SecureSocket.cpp
static const char kLocalFilename[] = "Local.txt"; static const char kDirName[] = "tls";
static const char kTrustedServersFilename[] = "TrustedServers.txt"; static const char kLocalFilename[] = "local-fingerprint";
static const char kTrustedClientsFilename[] = "TrustedClients.txt"; static const char kTrustedServersFilename[] = "trusted-servers";
static const char kTrustedClientsFilename[] = "trusted-clients";
TlsFingerprint::TlsFingerprint(const QString &filename) TlsFingerprint::TlsFingerprint(const QString &filename)
: m_Filename(filename) {} : m_Filename(filename) {}

6
src/lib/net/InverseSockets/SecureServerSocket.cpp
View file

@ -69,10 +69,10 @@ std::string SecureServerSocket::getCertificateFileName() const {
auto certificateFilename = ArgParser::argsBase().m_tlsCertFile; auto certificateFilename = ArgParser::argsBase().m_tlsCertFile;
if (certificateFilename.empty()) { if (certificateFilename.empty()) {
// default location of the TLS cert file in users dir // TODO: Reduce duplication of these strings between here and
// SecureSocket.cpp
certificateFilename = deskflow::string::sprintf( certificateFilename = deskflow::string::sprintf(
"%s/SSL/" DESKFLOW_APP_NAME ".pem", "%s/tls/" DESKFLOW_APP_ID ".pem", ARCH->getProfileDirectory().c_str());
ARCH->getProfileDirectory().c_str());
} }
return certificateFilename; return certificateFilename;

4
src/lib/net/InverseSockets/SslApi.cpp
View file

@ -159,9 +159,9 @@ std::string SslApi::getFingerprint() const {
} }
bool SslApi::isTrustedFingerprint(const std::string &fingerprint) const { bool SslApi::isTrustedFingerprint(const std::string &fingerprint) const {
// TODO: Reduce duplication of these strings between here and SecureSocket.cpp
auto trustedServersFilename = deskflow::string::sprintf( auto trustedServersFilename = deskflow::string::sprintf(
"%s/SSL/Fingerprints/TrustedServers.txt", "%s/tls/trusted-servers", ARCH->getProfileDirectory().c_str());
ARCH->getProfileDirectory().c_str());
// check if this fingerprint exist // check if this fingerprint exist
std::ifstream file; std::ifstream file;

5
src/lib/net/SecureListenSocket.cpp
View file

@ -25,8 +25,9 @@
#include "net/SocketMultiplexer.h" #include "net/SocketMultiplexer.h"
#include "net/TSocketMultiplexerMethodJob.h" #include "net/TSocketMultiplexerMethodJob.h"
static const char s_certificateDir[] = {"SSL"}; // TODO: Reduce duplication of these strings between here and SecureSocket.cpp
static const char s_certificateFilename[] = {DESKFLOW_APP_NAME ".pem"}; static const char s_certificateDir[] = {"tls"};
static const char s_certificateFilename[] = {DESKFLOW_APP_ID ".pem"};
// //
// SecureListenSocket // SecureListenSocket

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

@ -45,11 +45,9 @@ static const float s_retryDelay = 0.01f;
enum { kMsgSize = 128 }; enum { kMsgSize = 128 };
static const char kFingerprintDirName[] = "SSL/Fingerprints"; // TODO: Reduce duplication of these strings between here and TlsFingerprint.cpp
// static const char kFingerprintLocalFilename[] = "Local.txt"; static const char kFingerprintDirName[] = "tls";
static const char kFingerprintTrustedServersFilename[] = "TrustedServers.txt"; static const char kFingerprintTrustedServersFilename[] = "trusted-servers";
// static const char kFingerprintTrustedClientsFilename[] =
// "TrustedClients.txt";
struct Ssl { struct Ssl {
SSL_CTX *m_context; SSL_CTX *m_context;