AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed Widgets from service part

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-08-23 00:20:59 +05:00
parent f7926847ac
commit 23ad006187
11 changed files with 178 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/amnezia_application.cpp
View file

@ -10,7 +10,6 @@
#include <QTimer> #include <QTimer>
#include <QTranslator> #include <QTranslator>
#include "core/servercontroller.h"
#include "logger.h" #include "logger.h"
#include "version.h" #include "version.h"
@ -20,7 +19,6 @@
#endif #endif
#include "protocols/qml_register_protocols.h" #include "protocols/qml_register_protocols.h"
#include "ui/pages.h"
#if defined(Q_OS_IOS) #if defined(Q_OS_IOS)
#include "platforms/ios/QtAppDelegate-C-Interface.h" #include "platforms/ios/QtAppDelegate-C-Interface.h"
@ -81,8 +79,6 @@ void AmneziaApplication::init()
m_engine->rootContext()->setContextProperty("Debug", &Logger::Instance()); m_engine->rootContext()->setContextProperty("Debug", &Logger::Instance());
//
m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this)); m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this));
m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator)); m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
m_vpnConnection->moveToThread(&m_vpnConnectionThread); m_vpnConnection->moveToThread(&m_vpnConnectionThread);
@ -125,14 +121,8 @@ void AmneziaApplication::init()
connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(), connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
&ConnectionController::closeConnection); &ConnectionController::closeConnection);
//
m_engine->load(url); m_engine->load(url);
// if (m_engine->rootObjects().size() > 0) {
// m_uiLogic->setQmlRoot(m_engine->rootObjects().at(0));
// }
if (m_settings->isSaveLogs()) { if (m_settings->isSaveLogs()) {
if (!Logger::init()) { if (!Logger::init()) {
qWarning() << "Initialization of debug subsystem failed"; qWarning() << "Initialization of debug subsystem failed";

47
client/fileUtilites.cpp Normal file
View file

@ -0,0 +1,47 @@
#include "fileUtilites.h"
#include <QDesktopServices>
#include <QStandardPaths>
void FileUtilites::saveFile(const QString &fileExtension, const QString &caption, const QString &fileName,
const QString &data)
{
QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
QUrl fileUrl = QFileDialog::getSaveFileUrl(nullptr, caption, QUrl::fromLocalFile(docDir + "/" + fileName),
"*" + fileExtension);
if (fileUrl.isEmpty())
return;
if (!fileUrl.toString().endsWith(fileExtension)) {
fileUrl = QUrl(fileUrl.toString() + fileExtension);
}
if (fileUrl.isEmpty())
return;
QFile save(fileUrl.toLocalFile());
// todo check if save successful
save.open(QIODevice::WriteOnly);
save.write(data.toUtf8());
save.close();
QFileInfo fi(fileUrl.toLocalFile());
QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
}
QString FileUtilites::getFileName(QWidget *parent, const QString &caption, const QString &dir, const QString &filter,
QString *selectedFilter, QFileDialog::Options options)
{
QString fileName = QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options);
#ifdef Q_OS_ANDROID
// patch for files containing spaces etc
const QString sep { "raw%3A%2F" };
if (fileName.startsWith("content://") && fileName.contains(sep)) {
QString contentUrl = fileName.split(sep).at(0);
QString rawUrl = fileName.split(sep).at(1);
rawUrl.replace(" ", "%20");
fileName = contentUrl + sep + rawUrl;
}
#endif
return fileName;
}

19
client/fileUtilites.h Normal file
View file

@ -0,0 +1,19 @@
#ifndef FILEUTILITES_H
#define FILEUTILITES_H
#include <QFileDialog>
class FileUtilites : public QObject
{
Q_OBJECT
public:
static void saveFile(const QString &fileExtension, const QString &caption, const QString &fileName,
const QString &data);
static QString getFileName(QWidget *parent = nullptr, const QString &caption = QString(),
const QString &dir = QString(), const QString &filter = QString(),
QString *selectedFilter = nullptr, QFileDialog::Options options = QFileDialog::Options());
};
#endif // FILEUTILITES_H

5
client/ui/controllers/exportController.cpp
View file

@ -4,7 +4,6 @@
#include <QDataStream> #include <QDataStream>
#include <QDesktopServices> #include <QDesktopServices>
#include <QFile> #include <QFile>
#include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QImage> #include <QImage>
#include <QStandardPaths> #include <QStandardPaths>
@ -12,7 +11,7 @@
#include "configurators/openvpn_configurator.h" #include "configurators/openvpn_configurator.h"
#include "configurators/wireguard_configurator.h" #include "configurators/wireguard_configurator.h"
#include "core/errorstrings.h" #include "core/errorstrings.h"
#include "utilities.h" #include "fileUtilites.h"
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
#include "platforms/android/android_controller.h" #include "platforms/android/android_controller.h"
#include "platforms/android/androidutils.h" #include "platforms/android/androidutils.h"
@ -230,7 +229,7 @@ void ExportController::saveFile(const QString &fileExtension, const QString &cap
return; return;
#endif #endif
Utils::saveFile(fileExtension, caption, fileName, m_config); FileUtilites::saveFile(fileExtension, caption, fileName, m_config);
} }
QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data) QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data)

8
client/ui/controllers/importController.cpp
View file

@ -10,7 +10,7 @@
#include "../../platforms/android/androidutils.h" #include "../../platforms/android/androidutils.h"
#include <QJniObject> #include <QJniObject>
#endif #endif
#include "utilities.h" #include "fileUtilites.h"
namespace namespace
{ {
@ -84,9 +84,9 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
void ImportController::extractConfigFromFile() void ImportController::extractConfigFromFile()
{ {
QString fileName = Utils::getFileName(Q_NULLPTR, tr("Open config file"), QString fileName = FileUtilites::getFileName(Q_NULLPTR, tr("Open config file"),
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
"*.vpn *.ovpn *.conf"); "*.vpn *.ovpn *.conf");
QFile file(fileName); QFile file(fileName);
if (file.open(QIODevice::ReadOnly)) { if (file.open(QIODevice::ReadOnly)) {
QString data = file.readAll(); QString data = file.readAll();

1
client/ui/controllers/installController.cpp
View file

@ -7,6 +7,7 @@
#include "core/errorstrings.h" #include "core/errorstrings.h"
#include "core/servercontroller.h" #include "core/servercontroller.h"
#include "fileUtilites.h"
#include "utilities.h" #include "utilities.h"
namespace namespace

10
client/ui/controllers/settingsController.cpp
View file

@ -2,8 +2,8 @@
#include <QStandardPaths> #include <QStandardPaths>
#include "fileUtilites.h"
#include "logger.h" #include "logger.h"
#include "utilities.h"
#include "version.h" #include "version.h"
SettingsController::SettingsController(const QSharedPointer<ServersModel> &serversModel, SettingsController::SettingsController(const QSharedPointer<ServersModel> &serversModel,
@ -69,7 +69,7 @@ void SettingsController::openLogsFolder()
void SettingsController::exportLogsFile() void SettingsController::exportLogsFile()
{ {
Utils::saveFile(".log", tr("Save log"), "AmneziaVPN", Logger::getLogFile()); FileUtilites::saveFile(".log", tr("Save log"), "AmneziaVPN", Logger::getLogFile());
} }
void SettingsController::clearLogs() void SettingsController::clearLogs()
@ -80,14 +80,14 @@ void SettingsController::clearLogs()
void SettingsController::backupAppConfig() void SettingsController::backupAppConfig()
{ {
Utils::saveFile(".backup", tr("Backup application config"), "AmneziaVPN", m_settings->backupAppConfig()); FileUtilites::saveFile(".backup", tr("Backup application config"), "AmneziaVPN", m_settings->backupAppConfig());
} }
void SettingsController::restoreAppConfig() void SettingsController::restoreAppConfig()
{ {
QString fileName = QString fileName =
Utils::getFileName(Q_NULLPTR, tr("Open backup"), FileUtilites::getFileName(Q_NULLPTR, tr("Open backup"),
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.backup"); QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.backup");
if (fileName.isEmpty()) { if (fileName.isEmpty()) {
return; return;

9
client/ui/controllers/sitesController.cpp
View file

@ -3,7 +3,7 @@
#include <QHostInfo> #include <QHostInfo>
#include <QStandardPaths> #include <QStandardPaths>
#include "utilities.h" #include "fileUtilites.h"
SitesController::SitesController(const std::shared_ptr<Settings> &settings, SitesController::SitesController(const std::shared_ptr<Settings> &settings,
const QSharedPointer<VpnConnection> &vpnConnection, const QSharedPointer<VpnConnection> &vpnConnection,
@ -80,8 +80,9 @@ void SitesController::removeSite(int index)
void SitesController::importSites(bool replaceExisting) void SitesController::importSites(bool replaceExisting)
{ {
QString fileName = Utils::getFileName(Q_NULLPTR, tr("Open sites file"), QString fileName =
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.json"); FileUtilites::getFileName(Q_NULLPTR, tr("Open sites file"),
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.json");
if (fileName.isEmpty()) { if (fileName.isEmpty()) {
return; return;
@ -149,7 +150,7 @@ void SitesController::exportSites()
QJsonDocument jsonDocument(jsonArray); QJsonDocument jsonDocument(jsonArray);
QByteArray jsonData = jsonDocument.toJson(); QByteArray jsonData = jsonDocument.toJson();
Utils::saveFile(".json", tr("Export sites file"), "sites", jsonData); FileUtilites::saveFile(".json", tr("Export sites file"), "sites", jsonData);
emit finished(tr("Export completed")); emit finished(tr("Export completed"));
} }

152
client/utilities.cpp
View file

@ -1,6 +1,5 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QDebug> #include <QDebug>
#include <QDesktopServices>
#include <QDir> #include <QDir>
#include <QHostAddress> #include <QHostAddress>
#include <QHostInfo> #include <QHostInfo>
@ -10,15 +9,15 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QUrl> #include <QUrl>
#include "version.h"
#include "utilities.h" #include "utilities.h"
#include "version.h"
QString Utils::getRandomString(int len) QString Utils::getRandomString(int len)
{ {
const QString possibleCharacters("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"); const QString possibleCharacters("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
QString randomString; QString randomString;
for(int i=0; i<len; ++i) { for (int i = 0; i < len; ++i) {
quint32 index = QRandomGenerator::global()->generate() % possibleCharacters.length(); quint32 index = QRandomGenerator::global()->generate() % possibleCharacters.length();
QChar nextChar = possibleCharacters.at(index); QChar nextChar = possibleCharacters.at(index);
randomString.append(nextChar); randomString.append(nextChar);
@ -31,7 +30,7 @@ QString Utils::systemLogPath()
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QStringList locationList = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); QStringList locationList = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
QString primaryLocation = "ProgramData"; QString primaryLocation = "ProgramData";
foreach (const QString& location, locationList) { foreach (const QString &location, locationList) {
if (location.contains(primaryLocation)) { if (location.contains(primaryLocation)) {
return QString("%1/%2/log").arg(location).arg(APPLICATION_NAME); return QString("%1/%2/log").arg(location).arg(APPLICATION_NAME);
} }
@ -42,7 +41,7 @@ QString Utils::systemLogPath()
#endif #endif
} }
bool Utils::initializePath(const QString& path) bool Utils::initializePath(const QString &path)
{ {
QDir dir; QDir dir;
if (!dir.mkpath(path)) { if (!dir.mkpath(path)) {
@ -52,13 +51,13 @@ bool Utils::initializePath(const QString& path)
return true; return true;
} }
bool Utils::createEmptyFile(const QString& path) bool Utils::createEmptyFile(const QString &path)
{ {
QFile f(path); QFile f(path);
return f.open(QIODevice::WriteOnly | QIODevice::Truncate); return f.open(QIODevice::WriteOnly | QIODevice::Truncate);
} }
QString Utils::executable(const QString& baseName, bool absPath) QString Utils::executable(const QString &baseName, bool absPath)
{ {
QString ext; QString ext;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
@ -71,7 +70,7 @@ QString Utils::executable(const QString& baseName, bool absPath)
return QCoreApplication::applicationDirPath() + "/" + fileName; return QCoreApplication::applicationDirPath() + "/" + fileName;
} }
QString Utils::usrExecutable(const QString& baseName) QString Utils::usrExecutable(const QString &baseName)
{ {
if (QFileInfo::exists("/usr/sbin/" + baseName)) if (QFileInfo::exists("/usr/sbin/" + baseName))
return ("/usr/sbin/" + baseName); return ("/usr/sbin/" + baseName);
@ -79,18 +78,22 @@ QString Utils::usrExecutable(const QString& baseName)
return ("/usr/bin/" + baseName); return ("/usr/bin/" + baseName);
} }
bool Utils::processIsRunning(const QString& fileName) bool Utils::processIsRunning(const QString &fileName)
{ {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QProcess process; QProcess process;
process.setReadChannel(QProcess::StandardOutput); process.setReadChannel(QProcess::StandardOutput);
process.setProcessChannelMode(QProcess::MergedChannels); process.setProcessChannelMode(QProcess::MergedChannels);
process.start("wmic.exe", QStringList() << "/OUTPUT:STDOUT" << "PROCESS" << "get" << "Caption"); process.start("wmic.exe",
QStringList() << "/OUTPUT:STDOUT"
<< "PROCESS"
<< "get"
<< "Caption");
process.waitForStarted(); process.waitForStarted();
process.waitForFinished(); process.waitForFinished();
QString processData(process.readAll()); QString processData(process.readAll());
QStringList processList = processData.split(QRegularExpression("[\r\n]"),Qt::SkipEmptyParts); QStringList processList = processData.split(QRegularExpression("[\r\n]"), Qt::SkipEmptyParts);
foreach (const QString& rawLine, processList) { foreach (const QString &rawLine, processList) {
const QString line = rawLine.simplified(); const QString line = rawLine.simplified();
if (line.isEmpty()) { if (line.isEmpty()) {
continue; continue;
@ -99,7 +102,6 @@ bool Utils::processIsRunning(const QString& fileName)
if (line == fileName) { if (line == fileName) {
return true; return true;
} }
} }
return false; return false;
#elif defined(Q_OS_IOS) #elif defined(Q_OS_IOS)
@ -107,7 +109,7 @@ bool Utils::processIsRunning(const QString& fileName)
#else #else
QProcess process; QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels); process.setProcessChannelMode(QProcess::MergedChannels);
process.start("pgrep", QStringList({fileName})); process.start("pgrep", QStringList({ fileName }));
process.waitForFinished(); process.waitForFinished();
if (process.exitStatus() == QProcess::NormalExit) { if (process.exitStatus() == QProcess::NormalExit) {
return (process.readAll().toUInt() > 0); return (process.readAll().toUInt() > 0);
@ -116,7 +118,7 @@ bool Utils::processIsRunning(const QString& fileName)
#endif #endif
} }
QString Utils::getIPAddress(const QString& host) QString Utils::getIPAddress(const QString &host)
{ {
if (ipAddressRegExp().match(host).hasMatch()) { if (ipAddressRegExp().match(host).hasMatch()) {
return host; return host;
@ -130,38 +132,44 @@ QString Utils::getIPAddress(const QString& host)
return ""; return "";
} }
QString Utils::getStringBetween(const QString& s, const QString& a, const QString& b) QString Utils::getStringBetween(const QString &s, const QString &a, const QString &b)
{ {
int ap = s.indexOf(a), bp = s.indexOf(b, ap + a.length()); int ap = s.indexOf(a), bp = s.indexOf(b, ap + a.length());
if(ap < 0 || bp < 0) if (ap < 0 || bp < 0)
return QString(); return QString();
ap += a.length(); ap += a.length();
if(bp - ap <= 0) if (bp - ap <= 0)
return QString(); return QString();
return s.mid(ap, bp - ap).trimmed(); return s.mid(ap, bp - ap).trimmed();
} }
bool Utils::checkIPv4Format(const QString& ip) bool Utils::checkIPv4Format(const QString &ip)
{ {
if (ip.isEmpty()) return false; if (ip.isEmpty())
return false;
int count = ip.count("."); int count = ip.count(".");
if(count != 3) return false; if (count != 3)
return false;
QHostAddress addr(ip); QHostAddress addr(ip);
return (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol); return (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol);
} }
bool Utils::checkIpSubnetFormat(const QString &ip) bool Utils::checkIpSubnetFormat(const QString &ip)
{ {
if (!ip.contains("/")) return checkIPv4Format(ip); if (!ip.contains("/"))
return checkIPv4Format(ip);
QStringList parts = ip.split("/"); QStringList parts = ip.split("/");
if (parts.size() != 2) return false; if (parts.size() != 2)
return false;
bool ok; bool ok;
int subnet = parts.at(1).toInt(&ok); int subnet = parts.at(1).toInt(&ok);
if (subnet >= 0 && subnet <= 32 && ok) return checkIPv4Format(parts.at(0)); if (subnet >= 0 && subnet <= 32 && ok)
else return false; return checkIPv4Format(parts.at(0));
else
return false;
} }
void Utils::killProcessByName(const QString &name) void Utils::killProcessByName(const QString &name)
@ -178,40 +186,39 @@ void Utils::killProcessByName(const QString &name)
QString Utils::netMaskFromIpWithSubnet(const QString ip) QString Utils::netMaskFromIpWithSubnet(const QString ip)
{ {
if (!ip.contains("/")) return "255.255.255.255"; if (!ip.contains("/"))
return "255.255.255.255";
bool ok; bool ok;
int prefix = ip.split("/").at(1).toInt(&ok); int prefix = ip.split("/").at(1).toInt(&ok);
if (!ok) return "255.255.255.255"; if (!ok)
return "255.255.255.255";
unsigned long mask = (0xFFFFFFFF << (32 - prefix)) & 0xFFFFFFFF; unsigned long mask = (0xFFFFFFFF << (32 - prefix)) & 0xFFFFFFFF;
return QString("%1.%2.%3.%4") return QString("%1.%2.%3.%4").arg(mask >> 24).arg((mask >> 16) & 0xFF).arg((mask >> 8) & 0xFF).arg(mask & 0xFF);
.arg(mask >> 24)
.arg((mask >> 16) & 0xFF)
.arg((mask >> 8) & 0xFF)
.arg( mask & 0xFF);
} }
QString Utils::ipAddressFromIpWithSubnet(const QString ip) QString Utils::ipAddressFromIpWithSubnet(const QString ip)
{ {
if (ip.count(".") != 3) return ""; if (ip.count(".") != 3)
return "";
return ip.split("/").first(); return ip.split("/").first();
} }
QStringList Utils::summarizeRoutes(const QStringList &ips, const QString cidr) QStringList Utils::summarizeRoutes(const QStringList &ips, const QString cidr)
{ {
// QMap<int, int> // QMap<int, int>
// QHostAddress // QHostAddress
// QMap<QString, QStringList> subnets; // <"a.b", <list subnets>> // QMap<QString, QStringList> subnets; // <"a.b", <list subnets>>
// for (const QString &ip : ips) { // for (const QString &ip : ips) {
// if (ip.count(".") != 3) continue; // if (ip.count(".") != 3) continue;
// const QStringList &parts = ip.split("."); // const QStringList &parts = ip.split(".");
// subnets[parts.at(0) + "." + parts.at(1)].append(ip); // subnets[parts.at(0) + "." + parts.at(1)].append(ip);
// } // }
return QStringList(); return QStringList();
} }
@ -252,58 +259,6 @@ QString Utils::certUtilPath()
#endif #endif
} }
void Utils::saveFile(const QString &fileExtension,
const QString &caption,
const QString &fileName,
const QString &data)
{
QString docDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
QUrl fileUrl = QFileDialog::getSaveFileUrl(nullptr,
caption,
QUrl::fromLocalFile(docDir + "/" + fileName),
"*" + fileExtension);
if (fileUrl.isEmpty())
return;
if (!fileUrl.toString().endsWith(fileExtension)) {
fileUrl = QUrl(fileUrl.toString() + fileExtension);
}
if (fileUrl.isEmpty())
return;
QFile save(fileUrl.toLocalFile());
//todo check if save successful
save.open(QIODevice::WriteOnly);
save.write(data.toUtf8());
save.close();
QFileInfo fi(fileUrl.toLocalFile());
QDesktopServices::openUrl(fi.absoluteDir().absolutePath());
}
QString Utils::getFileName(QWidget *parent,
const QString &caption,
const QString &dir,
const QString &filter,
QString *selectedFilter,
QFileDialog::Options options)
{
QString fileName
= QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options);
#ifdef Q_OS_ANDROID
// patch for files containing spaces etc
const QString sep{"raw%3A%2F"};
if (fileName.startsWith("content://") && fileName.contains(sep)) {
QString contentUrl = fileName.split(sep).at(0);
QString rawUrl = fileName.split(sep).at(1);
rawUrl.replace(" ", "%20");
fileName = contentUrl + sep + rawUrl;
}
#endif
return fileName;
}
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
// Inspired from http://stackoverflow.com/a/15281070/1529139 // Inspired from http://stackoverflow.com/a/15281070/1529139
// and http://stackoverflow.com/q/40059902/1529139 // and http://stackoverflow.com/q/40059902/1529139
@ -315,8 +270,7 @@ bool Utils::signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent)
// (otherwise AttachConsole will return ERROR_ACCESS_DENIED) // (otherwise AttachConsole will return ERROR_ACCESS_DENIED)
bool consoleDetached = (FreeConsole() != FALSE); bool consoleDetached = (FreeConsole() != FALSE);
if (AttachConsole(dwProcessId) != FALSE) if (AttachConsole(dwProcessId) != FALSE) {
{
// Add a fake Ctrl-C handler for avoid instant kill is this console // Add a fake Ctrl-C handler for avoid instant kill is this console
// WARNING: do not revert it or current program will be also killed // WARNING: do not revert it or current program will be also killed
SetConsoleCtrlHandler(nullptr, true); SetConsoleCtrlHandler(nullptr, true);
@ -324,11 +278,9 @@ bool Utils::signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent)
FreeConsole(); FreeConsole();
} }
if (consoleDetached) if (consoleDetached) {
{
// Create a new console if previous was deleted by OS // Create a new console if previous was deleted by OS
if (AttachConsole(thisConsoleId) == FALSE) if (AttachConsole(thisConsoleId) == FALSE) {
{
int errorCode = GetLastError(); int errorCode = GetLastError();
if (errorCode == 31) // 31=ERROR_GEN_FAILURE if (errorCode == 31) // 31=ERROR_GEN_FAILURE
{ {

73
client/utilities.h
View file

@ -1,45 +1,64 @@
#ifndef UTILITIES_H #ifndef UTILITIES_H
#define UTILITIES_H #define UTILITIES_H
#include <QFileDialog>
#include <QRegExp> #include <QRegExp>
#include <QRegularExpression> #include <QRegularExpression>
#include <QString> #include <QString>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include "Windows.h" #include "Windows.h"
#endif #endif
class Utils : public QObject { class Utils : public QObject
{
Q_OBJECT Q_OBJECT
public: public:
static QString getRandomString(int len); static QString getRandomString(int len);
static QString executable(const QString& baseName, bool absPath); static QString executable(const QString &baseName, bool absPath);
static QString usrExecutable(const QString& baseName); static QString usrExecutable(const QString &baseName);
static QString systemLogPath(); static QString systemLogPath();
static bool createEmptyFile(const QString& path); static bool createEmptyFile(const QString &path);
static bool initializePath(const QString& path); static bool initializePath(const QString &path);
static QString getIPAddress(const QString& host); static QString getIPAddress(const QString &host);
static QString getStringBetween(const QString& s, const QString& a, const QString& b); static QString getStringBetween(const QString &s, const QString &a, const QString &b);
static bool checkIPv4Format(const QString& ip); static bool checkIPv4Format(const QString &ip);
static bool checkIpSubnetFormat(const QString& ip); static bool checkIpSubnetFormat(const QString &ip);
static QRegularExpression ipAddressRegExp() { return QRegularExpression("^((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])(\\.(?!$)|$)){4}$"); } static QRegularExpression ipAddressRegExp()
static QRegularExpression ipAddressPortRegExp() { return QRegularExpression("^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}" {
"(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\:[0-9]{1,5}){0,1}$"); } return QRegularExpression("^((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])(\\.(?!$)|$)){4}$");
}
static QRegularExpression ipAddressPortRegExp()
{
return QRegularExpression("^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}"
"(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\:[0-9]{1,5}){0,1}$");
}
static QRegExp ipAddressWithSubnetRegExp() { return QRegExp("(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}" static QRegExp ipAddressWithSubnetRegExp()
"(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\/[0-9]{1,2}){0,1}"); } {
return QRegExp("(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}"
"(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\/[0-9]{1,2}){0,1}");
}
static QRegExp ipNetwork24RegExp() { return QRegExp("^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}" static QRegExp ipNetwork24RegExp()
"0$"); } {
return QRegExp("^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\\.){3}"
"0$");
}
static QRegExp ipPortRegExp() { return QRegExp("^()([1-9]|[1-5]?[0-9]{2,4}|6[1-4][0-9]{3}|65[1-4][0-9]{2}|655[1-2][0-9]|6553[1-5])$"); } static QRegExp ipPortRegExp()
{
return QRegExp("^()([1-9]|[1-5]?[0-9]{2,4}|6[1-4][0-9]{3}|65[1-4][0-9]{2}|655[1-2][0-9]|6553[1-5])$");
}
static QRegExp domainRegExp() { return QRegExp("(((?!\\-))(xn\\-\\-)?[a-z0-9\\-_]{0,61}[a-z0-9]{1,1}\\.)*(xn\\-\\-)?([a-z0-9\\-]{1,61}|[a-z0-9\\-]{1,30})\\.[a-z]{2,}"); } static QRegExp domainRegExp()
static bool processIsRunning(const QString& fileName); {
return QRegExp("(((?!\\-))(xn\\-\\-)?[a-z0-9\\-_]{0,61}[a-z0-9]{1,1}\\.)*(xn\\-\\-)?([a-z0-9\\-]{1,61}|[a-z0-"
"9\\-]{1,30})\\.[a-z]{2,}");
}
static bool processIsRunning(const QString &fileName);
static void killProcessByName(const QString &name); static void killProcessByName(const QString &name);
static QString netMaskFromIpWithSubnet(const QString ip); static QString netMaskFromIpWithSubnet(const QString ip);
@ -51,18 +70,6 @@ public:
static QString wireguardExecPath(); static QString wireguardExecPath();
static QString certUtilPath(); static QString certUtilPath();
static void saveFile(const QString &fileExtension,
const QString &caption,
const QString &fileName,
const QString &data);
static QString getFileName(QWidget *parent = nullptr,
const QString &caption = QString(),
const QString &dir = QString(),
const QString &filter = QString(),
QString *selectedFilter = nullptr,
QFileDialog::Options options = QFileDialog::Options());
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
static bool signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent); static bool signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent);
#endif #endif

4
service/server/CMakeLists.txt
View file

@ -6,7 +6,7 @@ project(${PROJECT})
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(Qt6 REQUIRED COMPONENTS Core Network RemoteObjects Core5Compat Widgets) find_package(Qt6 REQUIRED COMPONENTS Core Network RemoteObjects Core5Compat)
qt_standard_project_setup() qt_standard_project_setup()
configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
@ -188,7 +188,7 @@ include_directories(
) )
add_executable(${PROJECT} ${SOURCES} ${HEADERS}) add_executable(${PROJECT} ${SOURCES} ${HEADERS})
target_link_libraries(${PROJECT} PRIVATE Qt6::Core Qt6::Network Qt6::RemoteObjects Qt6::Core5Compat Qt6::Widgets ${LIBS}) target_link_libraries(${PROJECT} PRIVATE Qt6::Core Qt6::Network Qt6::RemoteObjects Qt6::Core5Compat ${LIBS})
target_compile_definitions(${PROJECT} PRIVATE "MZ_$<UPPER_CASE:${MZ_PLATFORM_NAME}>") target_compile_definitions(${PROJECT} PRIVATE "MZ_$<UPPER_CASE:${MZ_PLATFORM_NAME}>")
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")