-using namespace deskflow::gui::license;
-
namespace deskflow::gui::messages {
struct Errors {
@@ -63,16 +60,9 @@ void showErrorDialog(
text = "Sorry, a critical error has occurred.
";
}
- if (isLicensedProduct()) {
- text += QString(R"(Please contact us)"
- " and copy/paste the following error:
")
- .arg(kUrlContact, kColorSecondary);
- } else {
- text +=
- QString(R"(Please report a bug)"
- " and copy/paste the following error:
")
- .arg(kUrlBugReport, kColorSecondary);
- }
+ text += QString(R"(Please report a bug)"
+ " and copy/paste the following error:
")
+ .arg(kUrlHelp, kColorSecondary);
const QString version = QString::fromStdString(deskflow::version());
text += QString("v%1\n%2\n%3
").arg(version, message, fileLine);
@@ -140,17 +130,20 @@ void messageHandler(
void showCloseReminder(QWidget *parent) {
QString message =
- "Deskflow will continue to run in the background and can be accessed "
- "via the Deskflow icon in your system notifications area. This setting "
- "can be disabled.
";
+ QString(
+ "%1 will continue to run in the background and can be accessed "
+ "via the %1 icon in your system notifications area. This "
+ "setting "
+ "can be disabled.
")
+ .arg(kAppName);
#if defined(Q_OS_LINUX)
message += QString("On some Linux systems such as GNOME 3, the "
"notification area might be disabled. "
"You may need to "
R"(enable an extension)"
- " to see the Deskflow tray icon.
")
- .arg(kUrlGnomeTrayFix, kStyleLink);
+ " to see the %3 tray icon.")
+ .arg(kUrlGnomeTrayFix, kStyleLink, kAppName);
#endif
QMessageBox::information(parent, "Notification area icon", message);
@@ -159,16 +152,17 @@ void showCloseReminder(QWidget *parent) {
void showFirstServerStartMessage(QWidget *parent) {
QMessageBox::information(
parent, "Server is running",
- "Great, the server is now running.
"
- "Now you can connect your other computers to this server. "
- "You should see a prompt here on the server when a new client tries to "
- "connect.
");
+ QString("Great, the %1 server is now running.
"
+ "Now you can connect your client computers to this server. "
+ "You should see a prompt here on the server when a new client "
+ "tries to connect.
")
+ .arg(kAppName));
}
void showFirstConnectedMessage(
QWidget *parent, bool closeToTray, bool enableService, bool isServer) {
- auto message = QString("Deskflow is now connected!
");
+ auto message = QString("%1 is now connected!
").arg(kAppName);
if (isServer) {
message +=
@@ -181,13 +175,17 @@ void showFirstConnectedMessage(
if (!closeToTray && !enableService) {
message +=
- "As you do not have the setting enabled to keep Deskflow running in "
- "the background, you'll need to keep this window open or minimized to "
- "keep Deskflow running.
";
+ QString(
+ "As you do not have the setting enabled to keep %1 running in "
+ "the background, you'll need to keep this window open or minimized "
+ "to keep %1 running.
")
+ .arg(kAppName);
} else {
message +=
- "You can now close this window and Deskflow will continue to run in "
- "the background. This setting can be disabled.
";
+ QString(
+ "You can now close this window and %1 will continue to run in "
+ "the background. This setting can be disabled.
")
+ .arg(kAppName);
}
QMessageBox::information(parent, "Connected", message);
@@ -201,16 +199,11 @@ void showDevThanks(QWidget *parent, const QString &productName) {
QMessageBox::information(
parent, "Thank you!",
QString("Thanks for using %1.
"
- "If you enjoy using this app, you can support the
"
- "developers by "
- R"(purchasing a license)"
- " or "
- R"(contributing code.)"
- "
"
+ "If you enjoy using this tool, visit our website:
"
+ R"(%2
)"
+ "Please report bugs and consider contributing code.
"
"This message will only appear once.
")
- .arg(
- productName, kUrlPurchase, kColorSecondary, kUrlGitHub,
- kColorSecondary));
+ .arg(productName, kUrlApp, kColorSecondary));
}
void showClientConnectError(
@@ -274,8 +267,10 @@ bool showClearSettings(QWidget *parent) {
const auto clear =
message.addButton(QObject::tr("Clear settings"), QMessageBox::AcceptRole);
message.setText(
- "Are you sure you want to clear all settings and restart Deskflow?
"
- "This action cannot be undone.
");
+ QString(
+ "Are you sure you want to clear all settings and restart %1?
"
+ "This action cannot be undone.
")
+ .arg(kAppName));
message.exec();
return message.clickedButton() == clear;
@@ -298,27 +293,27 @@ void showWaylandExperimental(QWidget *parent) {
"Wayland support is experimental and contains bugs.
"
R"(Please report bugs to us if you find any.
)"
"Happy testing!
")
- .arg(kUrlBugReport, kColorSecondary));
+ .arg(kUrlHelp, kColorSecondary));
}
void showWaylandLibraryError(QWidget *parent) {
QMessageBox::critical(
parent, "Library problem",
QString(
- "Sorry, while this version of Deskflow does support Wayland, "
+ "
Sorry, while this version of %1 does support Wayland, "
"this build was not linked with one or more of the required "
"libraries.
"
"Please either switch to X from your login screen or use a build "
"that uses the correct libraries.
"
"If you think this is incorrect, please "
- R"(report a bug.
)"
+ R"(report a bug.)"
"Please check the logs for more information.
")
- .arg(kUrlBugReport, kColorSecondary));
+ .arg(kAppName, kUrlHelp, kColorSecondary));
}
bool showUpdateCheckOption(QWidget *parent) {
QMessageBox message(parent);
- message.addButton(QObject::tr("Close"), QMessageBox::RejectRole);
+ message.addButton(QObject::tr("No thanks"), QMessageBox::RejectRole);
const auto checkButton = message.addButton(
QObject::tr("Check for updates"), QMessageBox::AcceptRole);
message.setText(
diff --git a/src/lib/gui/paths.h b/src/lib/gui/paths.h
index 73612d201..b36ec2051 100644
--- a/src/lib/gui/paths.h
+++ b/src/lib/gui/paths.h
@@ -23,7 +23,7 @@
#include
#include
-const auto kCertificateFilename = "Deskflow.pem";
+const auto kCertificateFilename = QString("%1.pem").arg(DESKFLOW_APP_NAME);
const auto kSslDir = "SSL";
namespace deskflow::gui::paths {
diff --git a/src/lib/gui/tls/TlsCertificate.cpp b/src/lib/gui/tls/TlsCertificate.cpp
index 77d5625ef..9e58c3755 100644
--- a/src/lib/gui/tls/TlsCertificate.cpp
+++ b/src/lib/gui/tls/TlsCertificate.cpp
@@ -26,7 +26,7 @@
static const char *const kCertificateKeyLength = "rsa:";
static const char *const kCertificateHashAlgorithm = "-sha256";
static const char *const kCertificateLifetime = "365";
-static const char *const kCertificateSubjectInfo = "/CN=Deskflow";
+static const char *const kCertificateSubjectInfo = "/CN=" DESKFLOW_APP_NAME;
#if defined(Q_OS_WIN)
static const char *const kWinOpenSslDir = "OpenSSL";
@@ -94,6 +94,12 @@ bool TlsCertificate::runTool(const QStringList &args) {
#endif
QStringList environment;
+
+// Windows is special! :)
+// For OpenSSL, it's very common to bundle the openssl.exe and openssl.cnf files
+// with the application. This is made a little more complex in the Windows dev
+// env, because vcpkg can't find the openssl.cnf file by default, so we need to
+// give it a bit of guidance by setting the `OPENSSL_CONF` env var.
#if defined(Q_OS_WIN)
const auto openSslDir = QDir(openSslWindowsDir());
const auto config = QDir::cleanPath(openSslDir.filePath(kConfigFile));
diff --git a/src/lib/gui/tls/TlsUtility.cpp b/src/lib/gui/tls/TlsUtility.cpp
index e21031564..c2ff57375 100644
--- a/src/lib/gui/tls/TlsUtility.cpp
+++ b/src/lib/gui/tls/TlsUtility.cpp
@@ -18,34 +18,24 @@
#include "TlsUtility.h"
#include "TlsCertificate.h"
-#include "gui/license/license_utils.h"
#include
#include
-using namespace deskflow::license;
-using namespace deskflow::gui::license;
-
namespace deskflow::gui {
-TlsUtility::TlsUtility(const IAppConfig &appConfig, const ILicense &license)
- : m_appConfig(appConfig),
- m_license(license) {}
+TlsUtility::TlsUtility(const IAppConfig &appConfig) : m_appConfig(appConfig) {}
-bool TlsUtility::isAvailable() const {
- return !isActivationEnabled() || m_license.isTlsAvailable();
-}
-
-bool TlsUtility::isAvailableAndEnabled() const {
+bool TlsUtility::isEnabled() const {
const auto &config = m_appConfig;
- return isAvailable() && config.tlsEnabled();
+ return config.tlsEnabled();
}
bool TlsUtility::generateCertificate() {
qDebug("generating tls certificate, "
"all clients must trust the new fingerprint");
- if (!isAvailableAndEnabled()) {
+ if (!isEnabled()) {
qCritical("unable to generate tls certificate, "
"tls is either not available or not enabled");
return false;
diff --git a/src/lib/gui/tls/TlsUtility.h b/src/lib/gui/tls/TlsUtility.h
index 202a87939..6619dfcb3 100644
--- a/src/lib/gui/tls/TlsUtility.h
+++ b/src/lib/gui/tls/TlsUtility.h
@@ -20,18 +20,16 @@
#include "gui/config/IAppConfig.h"
#include "TlsCertificate.h"
-#include "license/ILicense.h"
#include
namespace deskflow::gui {
class TlsUtility : public QObject {
- using ILicense = deskflow::license::ILicense;
Q_OBJECT
public:
- explicit TlsUtility(const IAppConfig &appConfig, const ILicense &license);
+ explicit TlsUtility(const IAppConfig &appConfig);
bool generateCertificate();
bool persistCertificate();
@@ -43,16 +41,10 @@ public:
* If licensing is enabled, it checks whether the product has TLS
* available, and if licensing is not enabled, true is returned.
*/
- bool isAvailableAndEnabled() const;
-
- /**
- * @return true if TLS is available, regardless of whether it is enabled.
- */
- bool isAvailable() const;
+ bool isEnabled() const;
private:
const IAppConfig &m_appConfig;
- const ILicense &m_license;
TlsCertificate m_certificate;
};
diff --git a/src/lib/license/CMakeLists.txt b/src/lib/license/CMakeLists.txt
deleted file mode 100644
index 79e8e7ebd..000000000
--- a/src/lib/license/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2012-2024 Symless Ltd.
-# Copyright (C) 2009-2012 Nick Bolton
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-file(GLOB headers "*.h")
-file(GLOB sources "*.cpp")
-
-if(ADD_HEADERS_TO_SOURCES)
- list(APPEND sources ${headers})
-endif()
-
-add_library(license STATIC ${sources})
-
-target_link_libraries(license arch base)
diff --git a/src/lib/license/ILicense.h b/src/lib/license/ILicense.h
deleted file mode 100644
index ee34c06dc..000000000
--- a/src/lib/license/ILicense.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2016 Symless Ltd.
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-class Server;
-class LicenseHandler;
-class LicenseTests;
-
-namespace deskflow::license {
-
-class ILicense {
-public:
- virtual ~ILicense() = default;
- virtual bool isTlsAvailable() const = 0;
-};
-
-} // namespace deskflow::license
diff --git a/src/lib/license/License.cpp b/src/lib/license/License.cpp
deleted file mode 100644
index 3eceb7d4b..000000000
--- a/src/lib/license/License.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2016 Symless Ltd.
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#include "License.h"
-
-#include "Product.h"
-#include "license/SerialKey.h"
-#include "license/parse_serial_key.h"
-
-#include
-#include
-
-using namespace std::chrono;
-
-namespace deskflow::license {
-
-License::License(const std::string &hexString)
- : m_serialKey(parseSerialKey(hexString)) {}
-
-License::License(const SerialKey &serialKey) : m_serialKey(serialKey) {
- if (!m_serialKey.isValid) {
- throw InvalidSerialKey();
- }
-}
-
-bool License::isTrial() const { return m_serialKey.type.isTrial(); }
-
-bool License::isSubscription() const {
- return m_serialKey.type.isSubscription();
-}
-
-bool License::isTimeLimited() const {
- return m_serialKey.type.isSubscription() || m_serialKey.type.isTrial();
-}
-
-bool License::isTlsAvailable() const {
- return m_serialKey.product.isTlsAvailable();
-}
-
-Edition License::productEdition() const {
- return m_serialKey.product.edition();
-}
-
-bool License::isExpiringSoon() const {
- if (!isTimeLimited()) {
- return false;
- }
-
- if (!m_serialKey.warnTime.has_value()) {
- throw NoTimeLimitError();
- }
-
- return m_nowFunc() >= m_serialKey.warnTime.value();
-}
-
-bool License::isExpired() const {
- if (!isTimeLimited()) {
- return false;
- }
-
- if (!m_serialKey.expireTime.has_value()) {
- throw NoTimeLimitError();
- }
-
- return m_nowFunc() >= m_serialKey.expireTime.value();
-}
-
-days License::daysLeft() const {
- if (!m_serialKey.expireTime.has_value()) {
- throw NoTimeLimitError();
- }
-
- auto expireTime = m_serialKey.expireTime.value();
-
- auto timeLeft = expireTime - m_nowFunc();
- return duration_cast(timeLeft);
-}
-
-std::string License::productName() const {
- auto name = m_serialKey.product.name();
- if (m_serialKey.type.isTrial()) {
- name += " (Trial)";
- }
- return name;
-}
-
-} // namespace deskflow::license
diff --git a/src/lib/license/License.h b/src/lib/license/License.h
deleted file mode 100644
index 05743ddee..000000000
--- a/src/lib/license/License.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2016 Symless Ltd.
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-#include "ILicense.h"
-#include "SerialKey.h"
-
-#include
-#include
-#include
-#include
-
-class Server;
-class LicenseHandler;
-class LicenseTests;
-
-namespace deskflow::license {
-
-class License : public ILicense {
- friend class ::Server;
- friend class ::LicenseHandler;
- friend class ::LicenseTests;
-
- using days = std::chrono::days;
- using system_clock = std::chrono::system_clock;
- using time_point = system_clock::time_point;
- using NowFunc = std::function;
- using LicenseError = std::runtime_error;
-
-public:
- explicit License(const SerialKey &serialKey);
- explicit License(const std::string &hexString);
- ~License() override = default;
-
- friend bool operator==(License const &lhs, License const &rhs) {
- return lhs.m_serialKey == rhs.m_serialKey;
- }
-
- bool isTlsAvailable() const override;
-
- bool isValid() const { return m_serialKey.isValid; }
- bool isExpiringSoon() const;
- bool isExpired() const;
- bool isTrial() const;
- bool isSubscription() const;
- bool isTimeLimited() const;
- days daysLeft() const;
- Edition productEdition() const;
- std::string productName() const;
- const SerialKey &serialKey() const { return m_serialKey; }
- void invalidate() { m_serialKey = SerialKey::invalid(); }
-
- class InvalidSerialKey : public LicenseError {
- public:
- explicit InvalidSerialKey() : LicenseError("invalid serial key") {}
- };
-
- class NoTimeLimitError : public LicenseError {
- public:
- explicit NoTimeLimitError()
- : LicenseError("serial key has no time limit") {}
- };
-
-protected:
- void setNowFunc(const NowFunc &nowFunc) { m_nowFunc = nowFunc; }
-
-private:
- // for intentionality, force use of `invalid()` static function.
- License() = default;
-
- // prevent copy, so that changes can be reflected in one instance.
- License(const License &) = default;
- License &operator=(const License &) = default;
-
- static License invalid() { return License(); }
-
- SerialKey m_serialKey = SerialKey::invalid();
- NowFunc m_nowFunc = []() { return system_clock::now(); };
-};
-
-} // namespace deskflow::license
diff --git a/src/lib/license/Product.cpp b/src/lib/license/Product.cpp
deleted file mode 100644
index a82e9f7df..000000000
--- a/src/lib/license/Product.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * Copyright (C) 2016 Symless Ltd.
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#include