Files
amnezia-client/client/core/models/protocols/openVpnProtocolConfig.cpp
vkamn 847bb6923b refactor: refactor the application to the mvvm architecture (#2009)
* 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
2026-04-30 14:53:03 +08:00

165 lines
4.8 KiB
C++

#include "openVpnProtocolConfig.h"
#include <QJsonDocument>
#include "../../../core/utils/protocolEnum.h"
#include "../../../core/protocols/protocolUtils.h"
#include "../../../core/utils/constants/configKeys.h"
#include "../../../core/utils/constants/protocolConstants.h"
using namespace amnezia;
using namespace ProtocolUtils;
namespace amnezia
{
QJsonObject OpenVpnServerConfig::toJson() const
{
QJsonObject obj;
if (!port.isEmpty()) {
obj[configKey::port] = port;
}
if (!transportProto.isEmpty()) {
obj[configKey::transportProto] = transportProto;
}
if (!subnetAddress.isEmpty()) {
obj[configKey::subnetAddress] = subnetAddress;
}
if (!subnetMask.isEmpty()) {
obj[configKey::subnetMask] = subnetMask;
}
if (!subnetCidr.isEmpty()) {
obj[configKey::subnetCidr] = subnetCidr;
}
if (!cipher.isEmpty()) {
obj[configKey::cipher] = cipher;
}
if (!hash.isEmpty()) {
obj[configKey::hash] = hash;
}
if (ncpDisable != false) {
obj[configKey::ncpDisable] = ncpDisable;
}
if (tlsAuth != true) {
obj[configKey::tlsAuth] = tlsAuth;
}
if (!additionalClientConfig.isEmpty()) {
obj[configKey::additionalClientConfig] = additionalClientConfig;
}
if (!additionalServerConfig.isEmpty()) {
obj[configKey::additionalServerConfig] = additionalServerConfig;
}
if (isThirdPartyConfig) {
obj[configKey::isThirdPartyConfig] = isThirdPartyConfig;
}
return obj;
}
OpenVpnServerConfig OpenVpnServerConfig::fromJson(const QJsonObject& json)
{
OpenVpnServerConfig config;
config.port = json.value(configKey::port).toString();
config.transportProto = json.value(configKey::transportProto).toString();
config.subnetAddress = json.value(configKey::subnetAddress).toString();
config.subnetMask = json.value(configKey::subnetMask).toString();
config.subnetCidr = json.value(configKey::subnetCidr).toString();
config.cipher = json.value(configKey::cipher).toString();
config.hash = json.value(configKey::hash).toString();
config.ncpDisable = json.value(configKey::ncpDisable).toBool(false);
config.tlsAuth = json.value(configKey::tlsAuth).toBool(true);
config.additionalClientConfig = json.value(configKey::additionalClientConfig).toString();
config.additionalServerConfig = json.value(configKey::additionalServerConfig).toString();
config.isThirdPartyConfig = json.value(configKey::isThirdPartyConfig).toBool(false);
return config;
}
bool OpenVpnServerConfig::hasEqualServerSettings(const OpenVpnServerConfig& other) const
{
return subnetAddress == other.subnetAddress &&
port == other.port &&
transportProto == other.transportProto &&
cipher == other.cipher &&
hash == other.hash &&
ncpDisable == other.ncpDisable &&
tlsAuth == other.tlsAuth &&
additionalServerConfig == other.additionalServerConfig;
}
QJsonObject OpenVpnClientConfig::toJson() const
{
QJsonObject obj;
if (!nativeConfig.isEmpty()) {
obj[configKey::config] = nativeConfig;
}
if (!clientId.isEmpty()) {
obj[configKey::clientId] = clientId;
}
obj[configKey::blockOutsideDns] = blockOutsideDns;
return obj;
}
OpenVpnClientConfig OpenVpnClientConfig::fromJson(const QJsonObject& json)
{
OpenVpnClientConfig config;
config.nativeConfig = json.value(configKey::config).toString();
config.clientId = json.value(configKey::clientId).toString();
config.blockOutsideDns = json.value(configKey::blockOutsideDns).toBool(false);
return config;
}
QJsonObject OpenVpnProtocolConfig::toJson() const
{
QJsonObject obj = serverConfig.toJson();
if (clientConfig.has_value()) {
QJsonObject clientJson = clientConfig->toJson();
obj[configKey::lastConfig] = QString::fromUtf8(QJsonDocument(clientJson).toJson(QJsonDocument::Compact));
}
return obj;
}
OpenVpnProtocolConfig OpenVpnProtocolConfig::fromJson(const QJsonObject& json)
{
OpenVpnProtocolConfig config;
config.serverConfig = OpenVpnServerConfig::fromJson(json);
QString lastConfigStr = json.value(configKey::lastConfig).toString();
if (!lastConfigStr.isEmpty()) {
QJsonDocument doc = QJsonDocument::fromJson(lastConfigStr.toUtf8());
if (doc.isObject()) {
config.clientConfig = OpenVpnClientConfig::fromJson(doc.object());
}
}
return config;
}
bool OpenVpnProtocolConfig::hasClientConfig() const
{
return clientConfig.has_value();
}
void OpenVpnProtocolConfig::setClientConfig(const OpenVpnClientConfig& config)
{
clientConfig = config;
}
void OpenVpnProtocolConfig::clearClientConfig()
{
clientConfig.reset();
}
} // namespace amnezia