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
171 lines
4.6 KiB
C++
171 lines
4.6 KiB
C++
#include "apiV2ServerConfig.h"
|
|
|
|
#include <QJsonArray>
|
|
#include <QJsonDocument>
|
|
|
|
#include "core/utils/containerEnum.h"
|
|
#include "core/utils/containers/containerUtils.h"
|
|
#include "core/utils/protocolEnum.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/utils/api/apiUtils.h"
|
|
#include "core/models/api/apiConfig.h"
|
|
#include "core/models/api/authData.h"
|
|
|
|
namespace amnezia
|
|
{
|
|
|
|
using namespace ContainerEnumNS;
|
|
|
|
QString ApiV2ServerConfig::vpnKey() const
|
|
{
|
|
if (!apiConfig.vpnKey.isEmpty()) {
|
|
return apiConfig.vpnKey;
|
|
}
|
|
|
|
QJsonObject json = toJson();
|
|
return apiUtils::getPremiumV2VpnKey(json);
|
|
}
|
|
|
|
QString ApiV2ServerConfig::serviceType() const
|
|
{
|
|
return apiConfig.serviceType;
|
|
}
|
|
|
|
QString ApiV2ServerConfig::serviceProtocol() const
|
|
{
|
|
return apiConfig.serviceProtocol;
|
|
}
|
|
|
|
bool ApiV2ServerConfig::isPremium() const
|
|
{
|
|
return apiConfig.isPremium();
|
|
}
|
|
|
|
bool ApiV2ServerConfig::isFree() const
|
|
{
|
|
return apiConfig.isFree();
|
|
}
|
|
|
|
bool ApiV2ServerConfig::isExternalPremium() const
|
|
{
|
|
return apiConfig.isExternalPremium();
|
|
}
|
|
|
|
bool ApiV2ServerConfig::hasContainers() const
|
|
{
|
|
return !containers.isEmpty();
|
|
}
|
|
|
|
ContainerConfig ApiV2ServerConfig::containerConfig(DockerContainer container) const
|
|
{
|
|
if (!containers.contains(container)) {
|
|
return ContainerConfig{};
|
|
}
|
|
return containers.value(container);
|
|
}
|
|
|
|
QJsonObject ApiV2ServerConfig::toJson() const
|
|
{
|
|
QJsonObject obj;
|
|
|
|
if (!name.isEmpty()) {
|
|
obj[configKey::name] = name;
|
|
}
|
|
if (nameOverriddenByUser) {
|
|
obj[configKey::nameOverriddenByUser] = true;
|
|
}
|
|
if (!description.isEmpty()) {
|
|
obj[configKey::description] = description;
|
|
}
|
|
|
|
obj[configKey::configVersion] = configVersion;
|
|
|
|
if (!hostName.isEmpty()) {
|
|
obj[configKey::hostName] = hostName;
|
|
}
|
|
|
|
QJsonArray containersArray;
|
|
for (auto it = containers.begin(); it != containers.end(); ++it) {
|
|
QJsonObject containerObj = it.value().toJson();
|
|
containersArray.append(containerObj);
|
|
}
|
|
if (!containersArray.isEmpty()) {
|
|
obj[configKey::containers] = containersArray;
|
|
}
|
|
|
|
if (defaultContainer != DockerContainer::None) {
|
|
obj[configKey::defaultContainer] = ContainerUtils::containerToString(defaultContainer);
|
|
}
|
|
|
|
if (!dns1.isEmpty()) {
|
|
obj[configKey::dns1] = dns1;
|
|
}
|
|
if (!dns2.isEmpty()) {
|
|
obj[configKey::dns2] = dns2;
|
|
}
|
|
|
|
if (crc > 0) {
|
|
obj[configKey::crc] = crc;
|
|
}
|
|
|
|
QJsonObject apiConfigObj = apiConfig.toJson();
|
|
if (!apiConfigObj.isEmpty()) {
|
|
obj[apiDefs::key::apiConfig] = apiConfigObj;
|
|
}
|
|
|
|
QJsonObject authDataObj = authData.toJson();
|
|
if (!authDataObj.isEmpty()) {
|
|
obj[QLatin1String("auth_data")] = authDataObj;
|
|
}
|
|
|
|
return obj;
|
|
}
|
|
|
|
ApiV2ServerConfig ApiV2ServerConfig::fromJson(const QJsonObject& json)
|
|
{
|
|
ApiV2ServerConfig config;
|
|
|
|
config.name = json.value(configKey::name).toString();
|
|
config.nameOverriddenByUser = json.value(configKey::nameOverriddenByUser).toBool(false);
|
|
config.description = json.value(configKey::description).toString();
|
|
config.configVersion = json.value(configKey::configVersion).toInt(2);
|
|
config.hostName = json.value(configKey::hostName).toString();
|
|
|
|
QJsonArray containersArray = json.value(configKey::containers).toArray();
|
|
for (const QJsonValue& val : containersArray) {
|
|
QJsonObject containerObj = val.toObject();
|
|
ContainerConfig containerConfig = ContainerConfig::fromJson(containerObj);
|
|
|
|
QString containerStr = containerObj.value(configKey::container).toString();
|
|
DockerContainer container = ContainerUtils::containerFromString(containerStr);
|
|
|
|
config.containers.insert(container, containerConfig);
|
|
}
|
|
|
|
QString defaultContainerStr = json.value(configKey::defaultContainer).toString();
|
|
config.defaultContainer = ContainerUtils::containerFromString(defaultContainerStr);
|
|
|
|
config.dns1 = json.value(configKey::dns1).toString();
|
|
config.dns2 = json.value(configKey::dns2).toString();
|
|
|
|
config.crc = json.value(configKey::crc).toInt(0);
|
|
|
|
QJsonObject apiConfigObj = json.value(apiDefs::key::apiConfig).toObject();
|
|
if (!apiConfigObj.isEmpty()) {
|
|
config.apiConfig = ApiConfig::fromJson(apiConfigObj);
|
|
}
|
|
|
|
QJsonObject authDataObj = json.value(QLatin1String("auth_data")).toObject();
|
|
if (!authDataObj.isEmpty()) {
|
|
config.authData = AuthData::fromJson(authDataObj);
|
|
}
|
|
|
|
return config;
|
|
}
|
|
|
|
} // namespace amnezia
|
|
|