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

added ConnectionController error handling

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-06-05 22:40:35 +08:00
parent 420c33d3ba
commit 80fca589af
11 changed files with 134 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

95
client/amnezia_application.cpp
View file

@ -4,36 +4,15 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QTimer> #include <QTimer>
#include <QTranslator> #include <QTranslator>
#include <QQuickStyle>
#include "core/servercontroller.h"
#include "logger.h" #include "logger.h"
#include "defines.h" #include "defines.h"
#include <QQuickStyle>
#include "platforms/ios/QRCodeReaderBase.h" #include "platforms/ios/QRCodeReaderBase.h"
#include "ui/pages.h" #include "ui/pages.h"
#include "ui/pages_logic/AppSettingsLogic.h"
#include "ui/pages_logic/GeneralSettingsLogic.h"
#include "ui/pages_logic/NetworkSettingsLogic.h"
#include "ui/pages_logic/NewServerProtocolsLogic.h"
#include "ui/pages_logic/QrDecoderLogic.h"
#include "ui/pages_logic/ServerConfiguringProgressLogic.h"
#include "ui/pages_logic/ServerContainersLogic.h"
#include "ui/pages_logic/ServerListLogic.h"
#include "ui/pages_logic/ServerSettingsLogic.h"
#include "ui/pages_logic/ServerContainersLogic.h"
#include "ui/pages_logic/ShareConnectionLogic.h"
#include "ui/pages_logic/SitesLogic.h"
#include "ui/pages_logic/StartPageLogic.h"
#include "ui/pages_logic/VpnLogic.h"
#include "ui/pages_logic/WizardLogic.h"
#include "ui/pages_logic/protocols/CloakLogic.h"
#include "ui/pages_logic/protocols/OpenVpnLogic.h"
#include "ui/pages_logic/protocols/ShadowSocksLogic.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"
#endif #endif
@ -76,10 +55,6 @@ AmneziaApplication::~AmneziaApplication()
QObject::disconnect(m_engine, 0,0,0); QObject::disconnect(m_engine, 0,0,0);
delete m_engine; delete m_engine;
} }
if (m_uiLogic) {
QObject::disconnect(m_uiLogic, 0,0,0);
delete m_uiLogic;
}
if (m_protocolProps) delete m_protocolProps; if (m_protocolProps) delete m_protocolProps;
if (m_containerProps) delete m_containerProps; if (m_containerProps) delete m_containerProps;
@ -88,7 +63,6 @@ AmneziaApplication::~AmneziaApplication()
void AmneziaApplication::init() void AmneziaApplication::init()
{ {
m_engine = new QQmlApplicationEngine; m_engine = new QQmlApplicationEngine;
m_uiLogic = new UiLogic(m_settings, m_configurator);
const QUrl url(QStringLiteral("qrc:/ui/qml/main2.qml")); const QUrl url(QStringLiteral("qrc:/ui/qml/main2.qml"));
QObject::connect(m_engine, &QQmlApplicationEngine::objectCreated, QObject::connect(m_engine, &QQmlApplicationEngine::objectCreated,
@ -108,14 +82,8 @@ void AmneziaApplication::init()
m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator)); m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel)); m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection));
connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged,
m_connectionController.get(), &ConnectionController::connectionStateChanged);
connect(m_connectionController.get(), &ConnectionController::connectToVpn,
m_vpnConnection.get(), &VpnConnection::connectToVpn, Qt::QueuedConnection);
connect(m_connectionController.get(), &ConnectionController::disconnectFromVpn,
m_vpnConnection.get(), &VpnConnection::disconnectFromVpn, Qt::QueuedConnection);
m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get()); m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
m_pageController.reset(new PageController(m_serversModel)); m_pageController.reset(new PageController(m_serversModel));
@ -128,17 +96,12 @@ void AmneziaApplication::init()
m_engine->rootContext()->setContextProperty("ImportController", m_importController.get()); m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
// //
m_uiLogic->registerPagesLogic();
#if defined(Q_OS_IOS)
setStartPageLogic(m_uiLogic->pageLogic<StartPageLogic>());
#endif
m_engine->load(url); m_engine->load(url);
if (m_engine->rootObjects().size() > 0) { // if (m_engine->rootObjects().size() > 0) {
m_uiLogic->setQmlRoot(m_engine->rootObjects().at(0)); // m_uiLogic->setQmlRoot(m_engine->rootObjects().at(0));
} // }
if (m_settings->isSaveLogs()) { if (m_settings->isSaveLogs()) {
if (!Logger::init()) { if (!Logger::init()) {
@ -146,23 +109,23 @@ void AmneziaApplication::init()
} }
} }
#ifdef Q_OS_WIN //#ifdef Q_OS_WIN
if (m_parser.isSet("a")) m_uiLogic->showOnStartup(); // if (m_parser.isSet("a")) m_uiLogic->showOnStartup();
else emit m_uiLogic->show(); // else emit m_uiLogic->show();
#else //#else
m_uiLogic->showOnStartup(); // m_uiLogic->showOnStartup();
#endif //#endif
// TODO - fix // // TODO - fix
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) //#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
if (isPrimary()) { // if (isPrimary()) {
QObject::connect(this, &SingleApplication::instanceStarted, m_uiLogic, [this](){ // QObject::connect(this, &SingleApplication::instanceStarted, m_uiLogic, [this](){
qDebug() << "Secondary instance started, showing this window instead"; // qDebug() << "Secondary instance started, showing this window instead";
emit m_uiLogic->show(); // emit m_uiLogic->show();
emit m_uiLogic->raise(); // emit m_uiLogic->raise();
}); // });
} // }
#endif //#endif
} }
@ -174,16 +137,10 @@ void AmneziaApplication::registerTypes()
qRegisterMetaType<TransportProto>("TransportProto"); qRegisterMetaType<TransportProto>("TransportProto");
qRegisterMetaType<Proto>("Proto"); qRegisterMetaType<Proto>("Proto");
qRegisterMetaType<ServiceType>("ServiceType"); qRegisterMetaType<ServiceType>("ServiceType");
qRegisterMetaType<Page>("Page");
qRegisterMetaType<PageProtocolLogicBase *>("PageProtocolLogicBase *");
// declareQmlPageEnum();
declareQmlProtocolEnum(); declareQmlProtocolEnum();
declareQmlContainerEnum(); declareQmlContainerEnum();
qmlRegisterType<PageType>("PageType", 1, 0, "PageType");
qmlRegisterType<QRCodeReader>("QRCodeReader", 1, 0, "QRCodeReader"); qmlRegisterType<QRCodeReader>("QRCodeReader", 1, 0, "QRCodeReader");
m_containerProps = new ContainerProps; m_containerProps = new ContainerProps;
@ -201,16 +158,6 @@ void AmneziaApplication::loadFonts()
{ {
QQuickStyle::setStyle("Basic"); QQuickStyle::setStyle("Basic");
QFontDatabase::addApplicationFont(":/fonts/Lato-Black.ttf");
QFontDatabase::addApplicationFont(":/fonts/Lato-BlackItalic.ttf");
QFontDatabase::addApplicationFont(":/fonts/Lato-Bold.ttf");
QFontDatabase::addApplicationFont(":/fonts/Lato-BoldItalic.ttf");
QFontDatabase::addApplicationFont(":/fonts/Lato-Italic.ttf");
QFontDatabase::addApplicationFont(":/fonts/Lato-Light.ttf");
QFontDatabase::addApplicationFont(":/fonts/Lato-LightItalic.ttf");
QFontDatabase::addApplicationFont(":/fonts/Lato-Regular.ttf");
QFontDatabase::addApplicationFont(":/fonts/Lato-Thin.ttf");
QFontDatabase::addApplicationFont(":/fonts/Lato-ThinItalic.ttf");
QFontDatabase::addApplicationFont(":/fonts/pt-root-ui_vf.ttf"); QFontDatabase::addApplicationFont(":/fonts/pt-root-ui_vf.ttf");
} }

4
client/amnezia_application.h
View file

@ -11,7 +11,6 @@
#include "settings.h" #include "settings.h"
#include "vpnconnection.h" #include "vpnconnection.h"
#include "ui/uilogic.h"
#include "configurators/vpn_configurator.h" #include "configurators/vpn_configurator.h"
#include "ui/models/servers_model.h" #include "ui/models/servers_model.h"
@ -54,7 +53,6 @@ public:
private: private:
QQmlApplicationEngine *m_engine {}; QQmlApplicationEngine *m_engine {};
UiLogic *m_uiLogic {};
std::shared_ptr<Settings> m_settings; std::shared_ptr<Settings> m_settings;
std::shared_ptr<VpnConfigurator> m_configurator; std::shared_ptr<VpnConfigurator> m_configurator;
@ -67,7 +65,7 @@ private:
QSharedPointer<ContainersModel> m_containersModel; QSharedPointer<ContainersModel> m_containersModel;
QSharedPointer<ServersModel> m_serversModel; QSharedPointer<ServersModel> m_serversModel;
QScopedPointer<VpnConnection> m_vpnConnection; QSharedPointer<VpnConnection> m_vpnConnection;
QScopedPointer<ConnectionController> m_connectionController; QScopedPointer<ConnectionController> m_connectionController;
QScopedPointer<PageController> m_pageController; QScopedPointer<PageController> m_pageController;

45
client/ui/controllers/connectionController.cpp
View file

@ -2,11 +2,31 @@
#include <QApplication> #include <QApplication>
#include "core/errorstrings.h"
ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &serversModel, ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &serversModel,
const QSharedPointer<ContainersModel> &containersModel, const QSharedPointer<ContainersModel> &containersModel,
QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel) const QSharedPointer<VpnConnection> &vpnConnection,
QObject *parent)
: QObject(parent)
, m_serversModel(serversModel)
, m_containersModel(containersModel)
, m_vpnConnection(vpnConnection)
{ {
connect(m_vpnConnection.get(),
&VpnConnection::connectionStateChanged,
this,
&ConnectionController::connectionStateChanged);
connect(this,
&ConnectionController::connectToVpn,
m_vpnConnection.get(),
&VpnConnection::connectToVpn,
Qt::QueuedConnection);
connect(this,
&ConnectionController::disconnectFromVpn,
m_vpnConnection.get(),
&VpnConnection::disconnectFromVpn,
Qt::QueuedConnection);
} }
void ConnectionController::openConnection() void ConnectionController::openConnection()
@ -21,19 +41,11 @@ void ConnectionController::openConnection()
const QJsonObject &containerConfig = qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex, const QJsonObject &containerConfig = qvariant_cast<QJsonObject>(m_containersModel->data(containerModelIndex,
ContainersModel::Roles::ConfigRole)); ContainersModel::Roles::ConfigRole));
// if (m_settings->containers(serverIndex).isEmpty()) { if (container == DockerContainer::None) {
// set_labelErrorText(tr("VPN Protocols is not installed.\n Please install VPN container at first")); emit connectionErrorOccurred(tr("VPN Protocols is not installed.\n Please install VPN container at first"));
// set_pushButtonConnectChecked(false); return;
// return; }
// }
// if (container == DockerContainer::None) {
// set_labelErrorText(tr("VPN Protocol not chosen"));
// set_pushButtonConnectChecked(false);
// return;
// }
//todo error handling
qApp->processEvents(); qApp->processEvents();
emit connectToVpn(serverIndex, credentials, container, containerConfig); emit connectToVpn(serverIndex, credentials, container, containerConfig);
} }
@ -43,6 +55,11 @@ void ConnectionController::closeConnection()
emit disconnectFromVpn(); emit disconnectFromVpn();
} }
QString ConnectionController::getLastConnectionError()
{
return errorString(m_vpnConnection->lastError());
}
bool ConnectionController::isConnected() bool ConnectionController::isConnected()
{ {
return m_isConnected; return m_isConnected;

8
client/ui/controllers/connectionController.h
View file

@ -4,6 +4,7 @@
#include "ui/models/servers_model.h" #include "ui/models/servers_model.h"
#include "ui/models/containers_model.h" #include "ui/models/containers_model.h"
#include "protocols/vpnprotocol.h" #include "protocols/vpnprotocol.h"
#include "vpnconnection.h"
class ConnectionController : public QObject class ConnectionController : public QObject
{ {
@ -14,6 +15,7 @@ public:
explicit ConnectionController(const QSharedPointer<ServersModel> &serversModel, explicit ConnectionController(const QSharedPointer<ServersModel> &serversModel,
const QSharedPointer<ContainersModel> &containersModel, const QSharedPointer<ContainersModel> &containersModel,
const QSharedPointer<VpnConnection> &vpnConnection,
QObject *parent = nullptr); QObject *parent = nullptr);
bool isConnected(); bool isConnected();
@ -23,16 +25,22 @@ public slots:
void openConnection(); void openConnection();
void closeConnection(); void closeConnection();
QString getLastConnectionError();
signals: signals:
void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig); void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig);
void disconnectFromVpn(); void disconnectFromVpn();
void connectionStateChanged(Vpn::ConnectionState state); void connectionStateChanged(Vpn::ConnectionState state);
void isConnectedChanged(); void isConnectedChanged();
void connectionErrorOccurred(QString errorMessage);
private: private:
QSharedPointer<ServersModel> m_serversModel; QSharedPointer<ServersModel> m_serversModel;
QSharedPointer<ContainersModel> m_containersModel; QSharedPointer<ContainersModel> m_containersModel;
QSharedPointer<VpnConnection> m_vpnConnection;
bool m_isConnected = false; bool m_isConnected = false;
}; };

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

@ -6,33 +6,32 @@
#include "core/errorstrings.h" #include "core/errorstrings.h"
namespace { namespace {
enum class ConfigTypes { enum class ConfigTypes { Amnezia, OpenVpn, WireGuard };
Amnezia,
OpenVpn,
WireGuard
};
ConfigTypes checkConfigFormat(const QString &config) ConfigTypes checkConfigFormat(const QString &config)
{ {
const QString openVpnConfigPatternCli = "client"; const QString openVpnConfigPatternCli = "client";
const QString openVpnConfigPatternProto1 = "proto tcp"; const QString openVpnConfigPatternProto1 = "proto tcp";
const QString openVpnConfigPatternProto2 = "proto udp"; const QString openVpnConfigPatternProto2 = "proto udp";
const QString openVpnConfigPatternDriver1 = "dev tun"; const QString openVpnConfigPatternDriver1 = "dev tun";
const QString openVpnConfigPatternDriver2 = "dev tap"; const QString openVpnConfigPatternDriver2 = "dev tap";
const QString wireguardConfigPatternSectionInterface = "[Interface]"; const QString wireguardConfigPatternSectionInterface = "[Interface]";
const QString wireguardConfigPatternSectionPeer = "[Peer]"; const QString wireguardConfigPatternSectionPeer = "[Peer]";
if (config.contains(openVpnConfigPatternCli) && if (config.contains(openVpnConfigPatternCli)
(config.contains(openVpnConfigPatternProto1) || config.contains(openVpnConfigPatternProto2)) && && (config.contains(openVpnConfigPatternProto1)
(config.contains(openVpnConfigPatternDriver1) || config.contains(openVpnConfigPatternDriver2))) { || config.contains(openVpnConfigPatternProto2))
return ConfigTypes::OpenVpn; && (config.contains(openVpnConfigPatternDriver1)
} else if (config.contains(wireguardConfigPatternSectionInterface) && config.contains(wireguardConfigPatternSectionPeer)) { || config.contains(openVpnConfigPatternDriver2))) {
return ConfigTypes::WireGuard; return ConfigTypes::OpenVpn;
} } else if (config.contains(wireguardConfigPatternSectionInterface)
return ConfigTypes::Amnezia; && config.contains(wireguardConfigPatternSectionPeer)) {
return ConfigTypes::WireGuard;
} }
return ConfigTypes::Amnezia;
} }
} // namespace
ImportController::ImportController(const QSharedPointer<ServersModel> &serversModel, ImportController::ImportController(const QSharedPointer<ServersModel> &serversModel,
const QSharedPointer<ContainersModel> &containersModel, const QSharedPointer<ContainersModel> &containersModel,
@ -64,6 +63,7 @@ void ImportController::extractConfigFromFile(const QUrl &fileUrl)
void ImportController::extractConfigFromCode(QString code) void ImportController::extractConfigFromCode(QString code)
{ {
m_config = extractAmneziaConfig(code); m_config = extractAmneziaConfig(code);
m_configFileName = "";
} }
QString ImportController::getConfig() QString ImportController::getConfig()

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

@ -10,7 +10,6 @@ InstallController::InstallController(const QSharedPointer<ServersModel> &servers
const std::shared_ptr<Settings> &settings, const std::shared_ptr<Settings> &settings,
QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings) QObject *parent) : QObject(parent), m_serversModel(serversModel), m_containersModel(containersModel), m_settings(settings)
{ {
} }
void InstallController::install(DockerContainer container, int port, TransportProto transportProto) void InstallController::install(DockerContainer container, int port, TransportProto transportProto)

14
client/ui/models/containers_model.cpp
View file

@ -22,17 +22,19 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
switch (role) { switch (role) {
case NameRole: case NameRole:
// return ContainerProps::containerHumanNames().value(container); // return ContainerProps::containerHumanNames().value(container);
case DescRole: case DescRole:
// return ContainerProps::containerDescriptions().value(container); // return ContainerProps::containerDescriptions().value(container);
case ConfigRole: case ConfigRole:
m_settings->setContainerConfig(m_currentlyProcessedServerIndex, container, value.toJsonObject()); m_settings->setContainerConfig(m_currentlyProcessedServerIndex,
container,
value.toJsonObject());
case ServiceTypeRole: case ServiceTypeRole:
// return ContainerProps::containerService(container); // return ContainerProps::containerService(container);
case DockerContainerRole: case DockerContainerRole:
// return container; // return container;
case IsInstalledRole: case IsInstalledRole:
// return m_settings->containers(m_currentlyProcessedServerIndex).contains(container); // return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
case IsDefaultRole: case IsDefaultRole:
m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container); m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
emit defaultContainerChanged(); emit defaultContainerChanged();

53
client/ui/qml/Components/ConnectButton.qml
View file

@ -7,27 +7,48 @@ import ConnectionState 1.0
Button { Button {
id: root id: root
Connections {
target: ConnectionController
function onConnectionErrorOccurred(errorMessage) {
PageController.showErrorMessage(errorMessage)
}
}
text: qsTr("Connect") text: qsTr("Connect")
background: Image { background: Item {
id: border clip: true
source: connectionProccess.running ? "/images/connectionProgress.svg" : implicitHeight: border.implicitHeight
ConnectionController.isConnected ? "/images/connectionOff.svg" : "/images/connectionOn.svg" implicitWidth: border.implicitWidth
RotationAnimator { Image {
id: connectionProccess id: border
target: border source: connectionProccess.running ? "/images/connectionProgress.svg" :
running: false ConnectionController.isConnected ? "/images/connectionOff.svg" : "/images/connectionOn.svg"
from: 0 RotationAnimator {
to: 360 id: connectionProccess
loops: Animation.Infinite
duration: 1250 target: border
running: false
from: 0
to: 360
loops: Animation.Infinite
duration: 1250
}
Behavior on source {
PropertyAnimation { duration: 200 }
}
} }
Behavior on source { MouseArea {
PropertyAnimation { duration: 200 } anchors.fill: parent
cursorShape: Qt.PointingHandCursor
enabled: false
} }
} }
@ -46,7 +67,7 @@ Button {
} }
onClicked: { onClicked: {
ConnectionController.isConnected ? ConnectionController.closeConnection() : ConnectionController.openConnection() connectionProccess.running ? ConnectionController.closeConnection() : ConnectionController.openConnection()
} }
Connections { Connections {
@ -98,6 +119,8 @@ Button {
case ConnectionState.Error: { case ConnectionState.Error: {
console.log("Error") console.log("Error")
connectionProccess.running = false connectionProccess.running = false
root.text = qsTr("Connect")
PageController.showErrorMessage(ConnectionController.getLastConnectionError())
break break
} }
} }

2
client/ui/qml/Pages2/PageHome.qml
View file

@ -262,7 +262,7 @@ PageType {
Layout.fillWidth: true Layout.fillWidth: true
text: name text: name
descriptionText: "description" descriptionText: hostName
checked: index === serversMenuContent.currentIndex checked: index === serversMenuContent.currentIndex

7
client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
View file

@ -39,8 +39,6 @@ PageType {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
spacing: 16
ListView { ListView {
// todo change id naming // todo change id naming
id: containers id: containers
@ -63,6 +61,8 @@ PageType {
anchors.leftMargin: 16 anchors.leftMargin: 16
BackButtonType { BackButtonType {
id: backButton
Layout.topMargin: 20 Layout.topMargin: 20
} }
@ -136,6 +136,7 @@ PageType {
id: port id: port
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 16
headerText: "Port" headerText: "Port"
} }
@ -143,7 +144,7 @@ PageType {
// todo make it dynamic // todo make it dynamic
implicitHeight: root.height - port.implicitHeight - implicitHeight: root.height - port.implicitHeight -
transportProtoBackground.implicitHeight - transportProtoHeader.implicitHeight - transportProtoBackground.implicitHeight - transportProtoHeader.implicitHeight -
header.implicitHeight - installButton.implicitHeight - 100 header.implicitHeight - backButton.implicitHeight - installButton.implicitHeight - 116
color: "transparent" color: "transparent"
} }

1
client/ui/qml/main2.qml
View file

@ -3,7 +3,6 @@ import QtQuick.Window
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import PageType 1.0
import PageEnum 1.0 import PageEnum 1.0
import "Config" import "Config"