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
206 lines
6.4 KiB
C++
206 lines
6.4 KiB
C++
#include "serversController.h"
|
|
#include "core/utils/networkUtilities.h"
|
|
#include "core/utils/api/apiEnums.h"
|
|
#include "core/utils/constants/apiKeys.h"
|
|
#include "core/utils/constants/apiConstants.h"
|
|
#include "core/utils/protocolEnum.h"
|
|
#include "core/protocols/protocolUtils.h"
|
|
#include "core/utils/constants/configKeys.h"
|
|
#include "core/utils/constants/protocolConstants.h"
|
|
#include "core/models/serverConfig.h"
|
|
#include "core/models/containerConfig.h"
|
|
|
|
#if defined(Q_OS_IOS) || defined(MACOS_NE)
|
|
#include <AmneziaVPN-Swift.h>
|
|
#endif
|
|
|
|
|
|
ServersController::ServersController(SecureServersRepository* serversRepository,
|
|
SecureAppSettingsRepository* appSettingsRepository,
|
|
QObject *parent)
|
|
: QObject(parent), m_serversRepository(serversRepository), m_appSettingsRepository(appSettingsRepository)
|
|
{
|
|
recomputeGatewayStacks();
|
|
}
|
|
|
|
void ServersController::addServer(const ServerConfig &server)
|
|
{
|
|
m_serversRepository->addServer(server);
|
|
}
|
|
|
|
void ServersController::editServer(int index, const ServerConfig &server)
|
|
{
|
|
m_serversRepository->editServer(index, server);
|
|
}
|
|
|
|
void ServersController::removeServer(int index)
|
|
{
|
|
m_serversRepository->removeServer(index);
|
|
}
|
|
|
|
void ServersController::setDefaultServerIndex(int index)
|
|
{
|
|
m_serversRepository->setDefaultServer(index);
|
|
}
|
|
|
|
void ServersController::setDefaultContainer(int serverIndex, DockerContainer container)
|
|
{
|
|
m_serversRepository->setDefaultContainer(serverIndex, container);
|
|
}
|
|
|
|
void ServersController::updateContainerConfig(int serverIndex, DockerContainer container, const ContainerConfig &config)
|
|
{
|
|
m_serversRepository->setContainerConfig(serverIndex, container, config);
|
|
}
|
|
|
|
void ServersController::clearCachedProfile(int serverIndex, DockerContainer container)
|
|
{
|
|
m_serversRepository->clearLastConnectionConfig(serverIndex, container);
|
|
}
|
|
|
|
QJsonArray ServersController::getServersArray() const
|
|
{
|
|
QJsonArray result;
|
|
QVector<ServerConfig> servers = m_serversRepository->servers();
|
|
for (const ServerConfig& server : servers) {
|
|
result.append(server.toJson());
|
|
}
|
|
return result;
|
|
}
|
|
|
|
QVector<ServerConfig> ServersController::getServers() const
|
|
{
|
|
return m_serversRepository->servers();
|
|
}
|
|
|
|
ContainerConfig ServersController::getContainerConfig(int serverIndex, DockerContainer container) const
|
|
{
|
|
return m_serversRepository->containerConfig(serverIndex, container);
|
|
}
|
|
|
|
int ServersController::getDefaultServerIndex() const
|
|
{
|
|
return m_serversRepository->defaultServerIndex();
|
|
}
|
|
|
|
int ServersController::getServersCount() const
|
|
{
|
|
return m_serversRepository->serversCount();
|
|
}
|
|
|
|
ServerConfig ServersController::getServerConfig(int serverIndex) const
|
|
{
|
|
return m_serversRepository->server(serverIndex);
|
|
}
|
|
|
|
ServerCredentials ServersController::getServerCredentials(int serverIndex) const
|
|
{
|
|
return m_serversRepository->serverCredentials(serverIndex);
|
|
}
|
|
|
|
QPair<QString, QString> ServersController::getDnsPair(int serverIndex, bool isAmneziaDnsEnabled) const
|
|
{
|
|
ServerConfig serverConfig = m_serversRepository->server(serverIndex);
|
|
return serverConfig.getDnsPair(isAmneziaDnsEnabled,
|
|
m_appSettingsRepository->primaryDns(),
|
|
m_appSettingsRepository->secondaryDns());
|
|
}
|
|
|
|
ServersController::GatewayStacksData ServersController::gatewayStacks() const
|
|
{
|
|
return m_gatewayStacks;
|
|
}
|
|
|
|
void ServersController::recomputeGatewayStacks()
|
|
{
|
|
GatewayStacksData computed;
|
|
bool hasNewTags = false;
|
|
QVector<ServerConfig> servers = m_serversRepository->servers();
|
|
|
|
for (const ServerConfig& serverConfig : servers) {
|
|
if (serverConfig.isApiV2()) {
|
|
const ApiV2ServerConfig* apiV2 = serverConfig.as<ApiV2ServerConfig>();
|
|
if (!apiV2) continue;
|
|
const QString userCountryCode = apiV2->apiConfig.userCountryCode;
|
|
const QString serviceType = apiV2->serviceType();
|
|
|
|
if (!userCountryCode.isEmpty()) {
|
|
if (!m_gatewayStacks.userCountryCodes.contains(userCountryCode)) {
|
|
hasNewTags = true;
|
|
}
|
|
computed.userCountryCodes.insert(userCountryCode);
|
|
}
|
|
|
|
if (!serviceType.isEmpty()) {
|
|
if (!m_gatewayStacks.serviceTypes.contains(serviceType)) {
|
|
hasNewTags = true;
|
|
}
|
|
computed.serviceTypes.insert(serviceType);
|
|
}
|
|
}
|
|
}
|
|
|
|
m_gatewayStacks = std::move(computed);
|
|
if (hasNewTags) {
|
|
emit gatewayStacksExpanded();
|
|
}
|
|
}
|
|
|
|
bool ServersController::GatewayStacksData::operator==(const GatewayStacksData &other) const
|
|
{
|
|
return userCountryCodes == other.userCountryCodes && serviceTypes == other.serviceTypes;
|
|
}
|
|
|
|
QJsonObject ServersController::GatewayStacksData::toJson() const
|
|
{
|
|
QJsonObject json;
|
|
|
|
QJsonArray userCountryCodesArray;
|
|
for (const QString &code : userCountryCodes) {
|
|
userCountryCodesArray.append(code);
|
|
}
|
|
json[apiDefs::key::userCountryCode] = userCountryCodesArray;
|
|
|
|
QJsonArray serviceTypesArray;
|
|
for (const QString &type : serviceTypes) {
|
|
serviceTypesArray.append(type);
|
|
}
|
|
json[apiDefs::key::serviceType] = serviceTypesArray;
|
|
|
|
return json;
|
|
}
|
|
|
|
bool ServersController::isServerFromApiAlreadyExists(const QString &userCountryCode, const QString &serviceType, const QString &serviceProtocol) const
|
|
{
|
|
QVector<ServerConfig> servers = m_serversRepository->servers();
|
|
for (const ServerConfig& serverConfig : servers) {
|
|
if (serverConfig.isApiV2()) {
|
|
const ApiV2ServerConfig* apiV2 = serverConfig.as<ApiV2ServerConfig>();
|
|
if (!apiV2) return false;
|
|
if (apiV2->apiConfig.userCountryCode == userCountryCode
|
|
&& apiV2->serviceType() == serviceType
|
|
&& apiV2->serviceProtocol() == serviceProtocol) {
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool ServersController::hasInstalledContainers(int serverIndex) const
|
|
{
|
|
ServerConfig serverConfig = m_serversRepository->server(serverIndex);
|
|
QMap<DockerContainer, ContainerConfig> containers = serverConfig.containers();
|
|
for (auto it = containers.begin(); it != containers.end(); ++it) {
|
|
DockerContainer container = it.key();
|
|
if (ContainerUtils::containerService(container) == ServiceType::Vpn) {
|
|
return true;
|
|
}
|
|
if (container == DockerContainer::SSXray) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|