mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
* refactor: move business logic from servers model * refactor: move containersModel initialization * refactor: added protocol ui controller and removed settings class from protocols model * refactor: moved cli management to separate controller * refactor: moved app split to separate controller * refactor: moved site split to separate controller * refactor: moved allowed dns to separate controller * refactor: moved language logic to separate ui controller * refactor: removed Settings from devices model * refactor: moved configs and services api logit to separate core controller * refactor: added a layer with a repository between the storage and controllers * refactor: use child parent system instead of smart pointers for controllers and models initialization * refactor: moved install functions from server controller to install controller * refactor: install controller refactoring * chore: renamed exportController to exportUiController * refactor: separate export controller * refactor: removed VpnConfigurationsController * chore: renamed ServerController to SshSession * refactor: replaced ServerController to SshSession * chore: moved qml controllers to separate folder * chore: include fixes * chore: moved utils from core root to core/utils * chore: include fixes * chore: rename core/utils files to camelCase foramt * chore: include fixes * chore: moved some utils to api and selfhosted folders * chore: include fixes * chore: remove unused file * chore: moved serialization folder to core/utils * chore: include fixes * chore: moved some files from client root to core/utils * chore: include fixes * chore: moved ui utils to ui/utils folder * chore: include fixes * chore: move utils from root to ui/utils * chore: include fixes * chore: moved configurators to core/configurators * chore: include fixes * refactor: moved iap logic from ui controller to core * refactor: moved remaining core logic from ApiConfigsController to SubscriptionController * chore: rename apiNewsController to apiNewsUiController * refactor: moved core logic from news ui controller to core * chore: renamed apiConfigsController to subscriptionUiController * chore: include fixes * refactor: merge ApiSettingsController with SubscriptionUiController * chore: moved ui selfhosted controllers to separate folder * chore: include fixes * chore: rename connectionController to connectiomUiController * refactor: moved core logic from connectionUiController * chore: rename settingsController to settingsUiController * refactor: move core logic from settingsUiController * refactor: moved core controller signal/slot connections to separate class * fix: newsController fixes after refactoring * chore: rename model to camelCase * chore: include fixes * chore: remove unused code * chore: move selfhosted core to separate folder * chore: include fixes * chore: rename importController to importUiController * refactor: move core logic from importUiController * chore: minor fixes * chore: remove prem v1 migration * refactor: remove openvpn over cloak and openvpn over shadowsocks * refactor: removed protocolsForContainer function * refactor: add core models * refactor: replace json with c++ structs for server config * refactor: move getDnsPair to ServerConfigUtils * feat: add admin selfhosted config export test * feat: add multi import test * refactor: use coreController for tests * feat: add few simple tests * chore: qrepos in all core controllers * feat: add test for settings * refactor: remove repo dependency from configurators * chore: moved protocols to core folder * chore: include fixes * refactor: moved containersDefs, defs, apiDefs, protocolsDefs to different places * chore: include fixes * chore: build fixes * chore: build fixes * refactor: remove q repo and interface repo * feat: add test for ui servers model and controller * chore: renamed to camelCase * chore: include fixes * refactor: moved core logic from sites ui controller * fix: fixed api config processing * fix: fixed processed server index processing * refactor: protocol models now use c++ structs instead of json configs * refactor: servers model now use c++ struct instead of json config * fix: fixed default server index processing * fix: fix logs init * fix: fix secure settings load keys * chore: build fixes * fix: fixed clear settings * fix: fixed restore backup * fix: sshSession usage * fix: fixed export functions signatures * fix: return missing part from buildContainerWorker * fix: fixed server description on page home * refactor: add container config helpers functions * refactor: c++ structs instead of json * chore: add dns protocol config struct * refactor: move config utils functions to config structs * feat: add test for selfhosted server setup * refactor: separate resources.qrc * fix: fixed server rename * chore: return nameOverriddenByUser * fix: build fixes * fix: fixed models init * refactor: cleanup models usage * fix: fixed models init * chore: cleanup connections and functions signatures * chore: cleanup updateModel calls * feat: added cache to servers repo * chore: cleanup unused functions * chore: ssxray processing * chore: remove transportProtoWithDefault and portWithDefault functions * chore: removed proto types any and l2tp * refactor: moved some constants * fix: fixed native configs export * refactor: remove json from processConfigWith functions * fix: fixed processed server index usage * fix: qml warning fixes * chore: merge fixes * chore: update tests * fix: fixed xray config processing * fix: fixed split tunneling processing * chore: rename sites controllers and model * chore: rename fixes * chore: minor fixes * chore: remove ability to load backup from "file with connection settings" button * fix: fixed api device revoke * fix: remove full model update when renaming a user * fix: fixed premium/free server rename * fix: fixed selfhosted new server install * fix: fixed updateContainer function * fix: fixed revoke for external premium configs * feat: add native configs qr processing * chore: codestyle fixes * fix: fixed admin config create * chore: again remove ability to load backup from "file with connection settings" button * chore: minor fixes * fix: fixed variables initialization * fix: fixed qml imports * fix: minor fixes * fix: fix vpnConnection function calls * feat: add buckup error handling * fix: fixed admin config revok * fix: fixed selfhosted awg installation * fix: ad visability * feat: add empty check for primary dns * chore: minor fixes
195 lines
5.1 KiB
C++
195 lines
5.1 KiB
C++
#include "osSignalHandler.h"
|
|
|
|
#include <QCoreApplication>
|
|
#include <QMetaObject>
|
|
#include <QSocketNotifier>
|
|
|
|
#include "../amneziaApplication.h"
|
|
|
|
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
|
#include <pthread.h>
|
|
#include <signal.h>
|
|
#include <sys/signalfd.h>
|
|
#include <unistd.h>
|
|
#elif defined(Q_OS_MACOS)
|
|
#include <fcntl.h>
|
|
#include <signal.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#ifdef Q_OS_WIN
|
|
#include <QAbstractNativeEventFilter>
|
|
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
namespace
|
|
{
|
|
|
|
static bool initialized = false;
|
|
|
|
#ifdef Q_OS_WIN
|
|
class WindowsCloseFilter : public QAbstractNativeEventFilter
|
|
{
|
|
public:
|
|
bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override
|
|
{
|
|
MSG *msg = static_cast<MSG *>(message);
|
|
|
|
switch (msg->message) {
|
|
case WM_CLOSE: {
|
|
const HWND active = GetActiveWindow();
|
|
const HWND self = msg->hwnd;
|
|
if (active != self) {
|
|
AmneziaApplication *app = qobject_cast<AmneziaApplication *>(QCoreApplication::instance());
|
|
if (app) {
|
|
QMetaObject::invokeMethod(app, "forceQuit", Qt::QueuedConnection);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
};
|
|
};
|
|
|
|
static WindowsCloseFilter *windowsFilter = nullptr;
|
|
#endif
|
|
|
|
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
|
static int signalFd = -1;
|
|
static QSocketNotifier *socketNotifier = nullptr;
|
|
|
|
static void setupUnixSignalHandler()
|
|
{
|
|
sigset_t set;
|
|
sigemptyset(&set);
|
|
sigaddset(&set, SIGINT);
|
|
sigaddset(&set, SIGTERM);
|
|
|
|
pthread_sigmask(SIG_BLOCK, &set, nullptr);
|
|
|
|
signalFd = signalfd(-1, &set, SFD_NONBLOCK | SFD_CLOEXEC);
|
|
if (signalFd < 0)
|
|
return;
|
|
|
|
socketNotifier = new QSocketNotifier(signalFd, QSocketNotifier::Read, QCoreApplication::instance());
|
|
|
|
QObject::connect(socketNotifier, &QSocketNotifier::activated, QCoreApplication::instance(), [](int) {
|
|
signalfd_siginfo fdsi;
|
|
::read(signalFd, &fdsi, sizeof(fdsi));
|
|
|
|
if (fdsi.ssi_signo == SIGINT || fdsi.ssi_signo == SIGTERM) {
|
|
QCoreApplication::quit();
|
|
}
|
|
});
|
|
}
|
|
#elif defined(Q_OS_MACOS)
|
|
static int signalPipe[2] = { -1, -1 };
|
|
static QSocketNotifier *socketNotifier = nullptr;
|
|
|
|
static void macSignalHandler(int)
|
|
{
|
|
if (signalPipe[1] >= 0) {
|
|
const char ch = 1;
|
|
::write(signalPipe[1], &ch, sizeof(ch));
|
|
}
|
|
}
|
|
|
|
static void setupUnixSignalHandler()
|
|
{
|
|
if (::pipe(signalPipe) != 0)
|
|
return;
|
|
|
|
::fcntl(signalPipe[0], F_SETFL, O_NONBLOCK);
|
|
::fcntl(signalPipe[1], F_SETFL, O_NONBLOCK);
|
|
|
|
socketNotifier = new QSocketNotifier(signalPipe[0], QSocketNotifier::Read, QCoreApplication::instance());
|
|
|
|
QObject::connect(socketNotifier, &QSocketNotifier::activated, QCoreApplication::instance(), [](int) {
|
|
char buf[16];
|
|
::read(signalPipe[0], buf, sizeof(buf));
|
|
QCoreApplication::quit();
|
|
});
|
|
|
|
struct sigaction sa {};
|
|
sa.sa_handler = macSignalHandler;
|
|
sigemptyset(&sa.sa_mask);
|
|
sa.sa_flags = 0;
|
|
|
|
sigaction(SIGINT, &sa, nullptr);
|
|
sigaction(SIGTERM, &sa, nullptr);
|
|
}
|
|
#endif
|
|
|
|
static void cleanupUnixSignalHandler()
|
|
{
|
|
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
|
if (socketNotifier) {
|
|
socketNotifier->setEnabled(false);
|
|
socketNotifier->deleteLater();
|
|
socketNotifier = nullptr;
|
|
}
|
|
|
|
if (signalFd >= 0) {
|
|
::close(signalFd);
|
|
signalFd = -1;
|
|
}
|
|
|
|
#elif defined(Q_OS_MACOS)
|
|
struct sigaction sa {};
|
|
sa.sa_handler = SIG_DFL;
|
|
sigemptyset(&sa.sa_mask);
|
|
sa.sa_flags = 0;
|
|
sigaction(SIGINT, &sa, nullptr);
|
|
sigaction(SIGTERM, &sa, nullptr);
|
|
|
|
if (socketNotifier) {
|
|
socketNotifier->setEnabled(false);
|
|
socketNotifier->deleteLater();
|
|
socketNotifier = nullptr;
|
|
}
|
|
|
|
if (signalPipe[0] >= 0) {
|
|
::close(signalPipe[0]);
|
|
signalPipe[0] = -1;
|
|
}
|
|
|
|
if (signalPipe[1] >= 0) {
|
|
::close(signalPipe[1]);
|
|
signalPipe[1] = -1;
|
|
}
|
|
#endif
|
|
|
|
#ifdef Q_OS_WIN
|
|
if (windowsFilter) {
|
|
QCoreApplication::instance()->removeNativeEventFilter(windowsFilter);
|
|
delete windowsFilter;
|
|
windowsFilter = nullptr;
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
|
|
OsSignalHandler::OsSignalHandler(QObject *parent) : QObject(parent)
|
|
{
|
|
}
|
|
|
|
void OsSignalHandler::setup()
|
|
{
|
|
if (initialized)
|
|
return;
|
|
|
|
initialized = true;
|
|
|
|
#if (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) || defined(Q_OS_MACOS)
|
|
setupUnixSignalHandler();
|
|
#endif
|
|
|
|
#ifdef Q_OS_WIN
|
|
windowsFilter = new WindowsCloseFilter();
|
|
QCoreApplication::instance()->installNativeEventFilter(windowsFilter);
|
|
#endif
|
|
|
|
QObject::connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, [] { cleanupUnixSignalHandler(); });
|
|
}
|