mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-22 02:01:08 +07:00
847bb6923b
* 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
249 lines
7.3 KiB
C++
249 lines
7.3 KiB
C++
#include "secureServersRepository.h"
|
|
|
|
#include <QJsonDocument>
|
|
#include <QJsonArray>
|
|
|
|
#include "core/utils/api/apiEnums.h"
|
|
#include "core/utils/constants/apiKeys.h"
|
|
#include "core/utils/constants/apiConstants.h"
|
|
#include "core/models/serverConfig.h"
|
|
#include "core/models/containerConfig.h"
|
|
#include "core/utils/protocolEnum.h"
|
|
#include "core/protocols/protocolUtils.h"
|
|
#include "core/utils/constants/configKeys.h"
|
|
#include "core/utils/constants/protocolConstants.h"
|
|
|
|
SecureServersRepository::SecureServersRepository(SecureQSettings* settings, QObject *parent)
|
|
: QObject(parent), m_settings(settings)
|
|
{
|
|
QJsonArray arr = QJsonDocument::fromJson(value("Servers/serversList").toByteArray()).array();
|
|
for (const QJsonValue &val : arr) {
|
|
m_servers.append(ServerConfig::fromJson(val.toObject()));
|
|
}
|
|
m_defaultServerIndex = value("Servers/defaultServerIndex", 0).toInt();
|
|
}
|
|
|
|
QVariant SecureServersRepository::value(const QString &key, const QVariant &defaultValue) const
|
|
{
|
|
return m_settings->value(key, defaultValue);
|
|
}
|
|
|
|
void SecureServersRepository::setValue(const QString &key, const QVariant &value)
|
|
{
|
|
m_settings->setValue(key, value);
|
|
}
|
|
|
|
void SecureServersRepository::syncToStorage()
|
|
{
|
|
QJsonArray arr;
|
|
for (const ServerConfig &cfg : m_servers) {
|
|
arr.append(cfg.toJson());
|
|
}
|
|
setValue("Servers/serversList", QJsonDocument(arr).toJson());
|
|
}
|
|
|
|
void SecureServersRepository::invalidateCache()
|
|
{
|
|
m_servers.clear();
|
|
QJsonArray arr = QJsonDocument::fromJson(value("Servers/serversList").toByteArray()).array();
|
|
for (const QJsonValue &val : arr) {
|
|
m_servers.append(ServerConfig::fromJson(val.toObject()));
|
|
}
|
|
m_defaultServerIndex = value("Servers/defaultServerIndex", 0).toInt();
|
|
}
|
|
|
|
void SecureServersRepository::setServersArray(const QJsonArray &servers)
|
|
{
|
|
m_servers.clear();
|
|
for (const QJsonValue &val : servers) {
|
|
m_servers.append(ServerConfig::fromJson(val.toObject()));
|
|
}
|
|
syncToStorage();
|
|
}
|
|
|
|
void SecureServersRepository::addServer(const ServerConfig &server)
|
|
{
|
|
m_servers.append(server);
|
|
syncToStorage();
|
|
emit serverAdded(server);
|
|
}
|
|
|
|
void SecureServersRepository::editServer(int index, const ServerConfig &server)
|
|
{
|
|
if (index < 0 || index >= m_servers.size()) {
|
|
return;
|
|
}
|
|
m_servers.replace(index, server);
|
|
syncToStorage();
|
|
emit serverEdited(index, server);
|
|
}
|
|
|
|
void SecureServersRepository::removeServer(int index)
|
|
{
|
|
if (index < 0 || index >= m_servers.size()) {
|
|
return;
|
|
}
|
|
int defaultIndex = m_defaultServerIndex;
|
|
m_servers.removeAt(index);
|
|
|
|
if (defaultIndex == index) {
|
|
setDefaultServer(0);
|
|
} else if (defaultIndex > index) {
|
|
setDefaultServer(defaultIndex - 1);
|
|
}
|
|
|
|
if (m_servers.isEmpty()) {
|
|
setDefaultServer(0);
|
|
}
|
|
|
|
syncToStorage();
|
|
emit serverRemoved(index);
|
|
}
|
|
|
|
ServerConfig SecureServersRepository::server(int index) const
|
|
{
|
|
if (index < 0 || index >= m_servers.size()) {
|
|
return SelfHostedServerConfig{};
|
|
}
|
|
return m_servers.at(index);
|
|
}
|
|
|
|
QVector<ServerConfig> SecureServersRepository::servers() const
|
|
{
|
|
return m_servers;
|
|
}
|
|
|
|
int SecureServersRepository::serversCount() const
|
|
{
|
|
return m_servers.size();
|
|
}
|
|
|
|
int SecureServersRepository::defaultServerIndex() const
|
|
{
|
|
return m_defaultServerIndex;
|
|
}
|
|
|
|
void SecureServersRepository::setDefaultServer(int index)
|
|
{
|
|
if (index < 0) {
|
|
return;
|
|
}
|
|
if (m_servers.size() > 0 && index >= m_servers.size()) {
|
|
return;
|
|
}
|
|
if (m_servers.isEmpty() && index != 0) {
|
|
return;
|
|
}
|
|
if (m_defaultServerIndex == index) {
|
|
return;
|
|
}
|
|
m_defaultServerIndex = index;
|
|
setValue("Servers/defaultServerIndex", index);
|
|
emit defaultServerChanged(index);
|
|
}
|
|
|
|
void SecureServersRepository::setDefaultContainer(int serverIndex, DockerContainer container)
|
|
{
|
|
ServerConfig config = server(serverIndex);
|
|
config.visit([container](auto& arg) {
|
|
arg.defaultContainer = container;
|
|
});
|
|
editServer(serverIndex, config);
|
|
}
|
|
|
|
ContainerConfig SecureServersRepository::containerConfig(int serverIndex, DockerContainer container) const
|
|
{
|
|
ServerConfig config = server(serverIndex);
|
|
return config.containerConfig(container);
|
|
}
|
|
|
|
void SecureServersRepository::setContainerConfig(int serverIndex, DockerContainer container, const ContainerConfig &config)
|
|
{
|
|
ServerConfig serverConfig = server(serverIndex);
|
|
serverConfig.visit([container, &config](auto& arg) {
|
|
arg.containers[container] = config;
|
|
});
|
|
editServer(serverIndex, serverConfig);
|
|
}
|
|
|
|
void SecureServersRepository::clearLastConnectionConfig(int serverIndex, DockerContainer container)
|
|
{
|
|
ServerConfig serverConfig = server(serverIndex);
|
|
ContainerConfig containerCfg = serverConfig.containerConfig(container);
|
|
|
|
containerCfg.protocolConfig.clearClientConfig();
|
|
|
|
setContainerConfig(serverIndex, container, containerCfg);
|
|
}
|
|
|
|
ServerCredentials SecureServersRepository::serverCredentials(int index) const
|
|
{
|
|
ServerConfig config = server(index);
|
|
|
|
if (config.isSelfHosted()) {
|
|
const SelfHostedServerConfig* selfHosted = config.as<SelfHostedServerConfig>();
|
|
if (!selfHosted) return ServerCredentials();
|
|
auto creds = selfHosted->credentials();
|
|
if (creds.has_value()) {
|
|
return creds.value();
|
|
}
|
|
}
|
|
|
|
return ServerCredentials{};
|
|
}
|
|
|
|
bool SecureServersRepository::hasServerWithVpnKey(const QString &vpnKey) const
|
|
{
|
|
QString normalizedInput = vpnKey.trimmed();
|
|
if (normalizedInput.startsWith(QStringLiteral("vpn://"), Qt::CaseInsensitive)) {
|
|
normalizedInput = normalizedInput.mid(QStringLiteral("vpn://").size());
|
|
}
|
|
if (normalizedInput.isEmpty()) {
|
|
return false;
|
|
}
|
|
|
|
QVector<ServerConfig> serversList = servers();
|
|
for (const ServerConfig& serverConfig : serversList) {
|
|
if (serverConfig.isApiV1()) {
|
|
const ApiV1ServerConfig* apiV1 = serverConfig.as<ApiV1ServerConfig>();
|
|
if (!apiV1) continue;
|
|
QString storedKey = apiV1->vpnKey();
|
|
if (storedKey.isEmpty()) {
|
|
continue;
|
|
}
|
|
QString normalizedStored = storedKey.trimmed();
|
|
if (normalizedStored.startsWith(QStringLiteral("vpn://"), Qt::CaseInsensitive)) {
|
|
normalizedStored = normalizedStored.mid(QStringLiteral("vpn://").size());
|
|
}
|
|
if (normalizedInput == normalizedStored) {
|
|
return true;
|
|
}
|
|
} else if (serverConfig.isApiV2()) {
|
|
const ApiV2ServerConfig* apiV2 = serverConfig.as<ApiV2ServerConfig>();
|
|
if (!apiV2) continue;
|
|
QString storedKey = apiV2->vpnKey();
|
|
if (storedKey.isEmpty()) {
|
|
continue;
|
|
}
|
|
QString normalizedStored = storedKey.trimmed();
|
|
if (normalizedStored.startsWith(QStringLiteral("vpn://"), Qt::CaseInsensitive)) {
|
|
normalizedStored = normalizedStored.mid(QStringLiteral("vpn://").size());
|
|
}
|
|
if (normalizedInput == normalizedStored) {
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool SecureServersRepository::hasServerWithCrc(quint16 crc) const
|
|
{
|
|
for (const ServerConfig& serverConfig : m_servers) {
|
|
if (static_cast<quint16>(serverConfig.crc()) == crc) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|