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
110 lines
4.8 KiB
C++
110 lines
4.8 KiB
C++
#include "awgConfigurator.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/containerConfig.h"
|
|
#include "core/models/protocols/awgProtocolConfig.h"
|
|
|
|
#include <QJsonDocument>
|
|
#include <QJsonObject>
|
|
|
|
using namespace amnezia;
|
|
|
|
AwgConfigurator::AwgConfigurator(SshSession* sshSession, QObject *parent)
|
|
: WireguardConfigurator(sshSession, true, parent)
|
|
{
|
|
}
|
|
|
|
ProtocolConfig AwgConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const ContainerConfig &containerConfig,
|
|
const DnsSettings &dnsSettings,
|
|
ErrorCode &errorCode)
|
|
{
|
|
const AwgServerConfig* serverConfig = nullptr;
|
|
const AwgClientConfig* clientConfig = nullptr;
|
|
|
|
if (auto* awgProtocolConfig = containerConfig.getAwgProtocolConfig()) {
|
|
serverConfig = &awgProtocolConfig->serverConfig;
|
|
if (awgProtocolConfig->clientConfig.has_value()) {
|
|
clientConfig = &awgProtocolConfig->clientConfig.value();
|
|
}
|
|
}
|
|
|
|
ProtocolConfig wireguardConfig = WireguardConfigurator::createConfig(credentials, container, containerConfig, dnsSettings, errorCode);
|
|
if (errorCode != ErrorCode::NoError) {
|
|
return AwgProtocolConfig{};
|
|
}
|
|
|
|
WireGuardProtocolConfig* wgConfig = wireguardConfig.as<WireGuardProtocolConfig>();
|
|
if (!wgConfig || !wgConfig->clientConfig.has_value()) {
|
|
errorCode = ErrorCode::InternalError;
|
|
return AwgProtocolConfig{};
|
|
}
|
|
|
|
QString awgConfig = wgConfig->clientConfig->nativeConfig;
|
|
|
|
QMap<QString, QString> configMap;
|
|
auto configLines = awgConfig.split("\n");
|
|
for (auto &line : configLines) {
|
|
auto trimmedLine = line.trimmed();
|
|
if (trimmedLine.startsWith("[") && trimmedLine.endsWith("]")) {
|
|
continue;
|
|
} else {
|
|
QStringList parts = trimmedLine.split(" = ");
|
|
if (parts.count() == 2) {
|
|
configMap.insert(parts[0].trimmed(), parts[1].trimmed());
|
|
}
|
|
}
|
|
}
|
|
|
|
AwgProtocolConfig protocolConfig;
|
|
if (serverConfig) {
|
|
protocolConfig.serverConfig = *serverConfig;
|
|
}
|
|
|
|
AwgClientConfig newClientConfig;
|
|
newClientConfig.nativeConfig = awgConfig;
|
|
newClientConfig.hostName = wgConfig->clientConfig->hostName;
|
|
newClientConfig.port = wgConfig->clientConfig->port;
|
|
newClientConfig.clientIp = wgConfig->clientConfig->clientIp;
|
|
newClientConfig.clientPrivateKey = wgConfig->clientConfig->clientPrivateKey;
|
|
newClientConfig.clientPublicKey = wgConfig->clientConfig->clientPublicKey;
|
|
newClientConfig.serverPublicKey = wgConfig->clientConfig->serverPublicKey;
|
|
newClientConfig.presharedKey = wgConfig->clientConfig->presharedKey;
|
|
newClientConfig.clientId = wgConfig->clientConfig->clientId;
|
|
newClientConfig.allowedIps = wgConfig->clientConfig->allowedIps;
|
|
newClientConfig.persistentKeepAlive = wgConfig->clientConfig->persistentKeepAlive;
|
|
|
|
QString mtu = protocols::awg::defaultMtu;
|
|
if (clientConfig && !clientConfig->mtu.isEmpty()) {
|
|
mtu = clientConfig->mtu;
|
|
}
|
|
newClientConfig.mtu = mtu;
|
|
|
|
newClientConfig.junkPacketCount = configMap.value(configKey::junkPacketCount);
|
|
newClientConfig.junkPacketMinSize = configMap.value(configKey::junkPacketMinSize);
|
|
newClientConfig.junkPacketMaxSize = configMap.value(configKey::junkPacketMaxSize);
|
|
newClientConfig.initPacketJunkSize = configMap.value(configKey::initPacketJunkSize);
|
|
newClientConfig.responsePacketJunkSize = configMap.value(configKey::responsePacketJunkSize);
|
|
newClientConfig.initPacketMagicHeader = configMap.value(configKey::initPacketMagicHeader);
|
|
newClientConfig.responsePacketMagicHeader = configMap.value(configKey::responsePacketMagicHeader);
|
|
newClientConfig.underloadPacketMagicHeader = configMap.value(configKey::underloadPacketMagicHeader);
|
|
newClientConfig.transportPacketMagicHeader = configMap.value(configKey::transportPacketMagicHeader);
|
|
newClientConfig.specialJunk1 = configMap.value(configKey::specialJunk1);
|
|
newClientConfig.specialJunk2 = configMap.value(configKey::specialJunk2);
|
|
newClientConfig.specialJunk3 = configMap.value(configKey::specialJunk3);
|
|
newClientConfig.specialJunk4 = configMap.value(configKey::specialJunk4);
|
|
newClientConfig.specialJunk5 = configMap.value(configKey::specialJunk5);
|
|
|
|
if (container == DockerContainer::Awg2) {
|
|
newClientConfig.cookieReplyPacketJunkSize = configMap.value(configKey::cookieReplyPacketJunkSize);
|
|
newClientConfig.transportPacketJunkSize = configMap.value(configKey::transportPacketJunkSize);
|
|
}
|
|
|
|
newClientConfig.isObfuscationEnabled = false;
|
|
|
|
protocolConfig.setClientConfig(newClientConfig);
|
|
|
|
return protocolConfig;
|
|
}
|