mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-21 02:01:03 +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
126 lines
3.1 KiB
C++
126 lines
3.1 KiB
C++
#include "ikev2ProtocolConfig.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 Ikev2ServerConfig::toJson() const
|
|
{
|
|
QJsonObject obj;
|
|
|
|
if (!hostName.isEmpty()) {
|
|
obj[configKey::hostName] = hostName;
|
|
}
|
|
|
|
if (isThirdPartyConfig) {
|
|
obj[configKey::isThirdPartyConfig] = isThirdPartyConfig;
|
|
}
|
|
|
|
return obj;
|
|
}
|
|
|
|
Ikev2ServerConfig Ikev2ServerConfig::fromJson(const QJsonObject& json)
|
|
{
|
|
Ikev2ServerConfig config;
|
|
|
|
config.hostName = json.value(configKey::hostName).toString();
|
|
config.isThirdPartyConfig = json.value(configKey::isThirdPartyConfig).toBool(false);
|
|
|
|
return config;
|
|
}
|
|
|
|
QJsonObject Ikev2ClientConfig::toJson() const
|
|
{
|
|
QJsonObject obj;
|
|
|
|
if (!nativeConfig.isEmpty()) {
|
|
obj[configKey::config] = nativeConfig;
|
|
}
|
|
if (!hostName.isEmpty()) {
|
|
obj[configKey::hostName] = hostName;
|
|
}
|
|
if (!userName.isEmpty()) {
|
|
obj[configKey::userName] = userName;
|
|
}
|
|
if (!cert.isEmpty()) {
|
|
obj[configKey::cert] = cert;
|
|
}
|
|
if (!password.isEmpty()) {
|
|
obj[configKey::password] = password;
|
|
}
|
|
if (!clientId.isEmpty()) {
|
|
obj[configKey::clientId] = clientId;
|
|
}
|
|
|
|
return obj;
|
|
}
|
|
|
|
Ikev2ClientConfig Ikev2ClientConfig::fromJson(const QJsonObject& json)
|
|
{
|
|
Ikev2ClientConfig config;
|
|
|
|
config.nativeConfig = json.value(configKey::config).toString();
|
|
config.hostName = json.value(configKey::hostName).toString();
|
|
config.userName = json.value(configKey::userName).toString();
|
|
config.cert = json.value(configKey::cert).toString();
|
|
config.password = json.value(configKey::password).toString();
|
|
config.clientId = json.value(configKey::clientId).toString();
|
|
|
|
return config;
|
|
}
|
|
|
|
QJsonObject Ikev2ProtocolConfig::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;
|
|
}
|
|
|
|
Ikev2ProtocolConfig Ikev2ProtocolConfig::fromJson(const QJsonObject& json)
|
|
{
|
|
Ikev2ProtocolConfig config;
|
|
|
|
config.serverConfig = Ikev2ServerConfig::fromJson(json);
|
|
|
|
QString lastConfigStr = json.value(configKey::lastConfig).toString();
|
|
if (!lastConfigStr.isEmpty()) {
|
|
QJsonDocument doc = QJsonDocument::fromJson(lastConfigStr.toUtf8());
|
|
if (doc.isObject()) {
|
|
config.clientConfig = Ikev2ClientConfig::fromJson(doc.object());
|
|
}
|
|
}
|
|
|
|
return config;
|
|
}
|
|
|
|
bool Ikev2ProtocolConfig::hasClientConfig() const
|
|
{
|
|
return clientConfig.has_value();
|
|
}
|
|
|
|
void Ikev2ProtocolConfig::setClientConfig(const Ikev2ClientConfig& config)
|
|
{
|
|
clientConfig = config;
|
|
}
|
|
|
|
void Ikev2ProtocolConfig::clearClientConfig()
|
|
{
|
|
clientConfig.reset();
|
|
}
|
|
|
|
} // namespace amnezia
|
|
|