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
346 lines
13 KiB
C++
346 lines
13 KiB
C++
#include "awgProtocolConfig.h"
|
|
|
|
#include <QJsonDocument>
|
|
#include <QJsonArray>
|
|
|
|
#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 AwgServerConfig::toJson() const
|
|
{
|
|
QJsonObject obj;
|
|
|
|
if (!port.isEmpty()) {
|
|
obj[configKey::port] = this->port;
|
|
}
|
|
if (!transportProto.isEmpty()) {
|
|
obj[configKey::transportProto] = transportProto;
|
|
}
|
|
if (!protocolVersion.isEmpty()) {
|
|
obj[configKey::protocolVersion] = protocolVersion;
|
|
}
|
|
if (!subnetAddress.isEmpty()) {
|
|
obj[configKey::subnetAddress] = subnetAddress;
|
|
}
|
|
if (!subnetCidr.isEmpty()) {
|
|
obj[configKey::subnetCidr] = subnetCidr;
|
|
}
|
|
|
|
if (!junkPacketCount.isEmpty()) {
|
|
obj[configKey::junkPacketCount] = junkPacketCount;
|
|
}
|
|
if (!junkPacketMinSize.isEmpty()) {
|
|
obj[configKey::junkPacketMinSize] = junkPacketMinSize;
|
|
}
|
|
if (!junkPacketMaxSize.isEmpty()) {
|
|
obj[configKey::junkPacketMaxSize] = junkPacketMaxSize;
|
|
}
|
|
if (!initPacketJunkSize.isEmpty()) {
|
|
obj[configKey::initPacketJunkSize] = initPacketJunkSize;
|
|
}
|
|
if (!responsePacketJunkSize.isEmpty()) {
|
|
obj[configKey::responsePacketJunkSize] = responsePacketJunkSize;
|
|
}
|
|
if (!cookieReplyPacketJunkSize.isEmpty()) {
|
|
obj[configKey::cookieReplyPacketJunkSize] = cookieReplyPacketJunkSize;
|
|
}
|
|
if (!transportPacketJunkSize.isEmpty()) {
|
|
obj[configKey::transportPacketJunkSize] = transportPacketJunkSize;
|
|
}
|
|
|
|
if (!initPacketMagicHeader.isEmpty()) {
|
|
obj[configKey::initPacketMagicHeader] = initPacketMagicHeader;
|
|
}
|
|
if (!responsePacketMagicHeader.isEmpty()) {
|
|
obj[configKey::responsePacketMagicHeader] = responsePacketMagicHeader;
|
|
}
|
|
if (!underloadPacketMagicHeader.isEmpty()) {
|
|
obj[configKey::underloadPacketMagicHeader] = underloadPacketMagicHeader;
|
|
}
|
|
if (!transportPacketMagicHeader.isEmpty()) {
|
|
obj[configKey::transportPacketMagicHeader] = transportPacketMagicHeader;
|
|
}
|
|
|
|
obj[configKey::specialJunk1] = specialJunk1;
|
|
obj[configKey::specialJunk2] = specialJunk2;
|
|
obj[configKey::specialJunk3] = specialJunk3;
|
|
obj[configKey::specialJunk4] = specialJunk4;
|
|
obj[configKey::specialJunk5] = specialJunk5;
|
|
|
|
if (isThirdPartyConfig) {
|
|
obj[configKey::isThirdPartyConfig] = isThirdPartyConfig;
|
|
}
|
|
|
|
return obj;
|
|
}
|
|
|
|
AwgServerConfig AwgServerConfig::fromJson(const QJsonObject& json)
|
|
{
|
|
AwgServerConfig config;
|
|
|
|
config.port = json.value(configKey::port).toString();
|
|
config.transportProto = json.value(configKey::transportProto).toString();
|
|
config.protocolVersion = json.value(configKey::protocolVersion).toString();
|
|
config.subnetAddress = json.value(configKey::subnetAddress).toString();
|
|
config.subnetCidr = json.value(configKey::subnetCidr).toString();
|
|
|
|
config.junkPacketCount = json.value(configKey::junkPacketCount).toString();
|
|
config.junkPacketMinSize = json.value(configKey::junkPacketMinSize).toString();
|
|
config.junkPacketMaxSize = json.value(configKey::junkPacketMaxSize).toString();
|
|
config.initPacketJunkSize = json.value(configKey::initPacketJunkSize).toString();
|
|
config.responsePacketJunkSize = json.value(configKey::responsePacketJunkSize).toString();
|
|
config.cookieReplyPacketJunkSize = json.value(configKey::cookieReplyPacketJunkSize).toString();
|
|
config.transportPacketJunkSize = json.value(configKey::transportPacketJunkSize).toString();
|
|
|
|
config.initPacketMagicHeader = json.value(configKey::initPacketMagicHeader).toString();
|
|
config.responsePacketMagicHeader = json.value(configKey::responsePacketMagicHeader).toString();
|
|
config.underloadPacketMagicHeader = json.value(configKey::underloadPacketMagicHeader).toString();
|
|
config.transportPacketMagicHeader = json.value(configKey::transportPacketMagicHeader).toString();
|
|
|
|
config.specialJunk1 = json.value(configKey::specialJunk1).toString();
|
|
config.specialJunk2 = json.value(configKey::specialJunk2).toString();
|
|
config.specialJunk3 = json.value(configKey::specialJunk3).toString();
|
|
config.specialJunk4 = json.value(configKey::specialJunk4).toString();
|
|
config.specialJunk5 = json.value(configKey::specialJunk5).toString();
|
|
|
|
config.isThirdPartyConfig = json.value(configKey::isThirdPartyConfig).toBool(false);
|
|
|
|
return config;
|
|
}
|
|
|
|
QJsonObject AwgClientConfig::toJson() const
|
|
{
|
|
QJsonObject obj;
|
|
|
|
if (!nativeConfig.isEmpty()) {
|
|
obj[configKey::config] = nativeConfig;
|
|
}
|
|
if (!hostName.isEmpty()) {
|
|
obj[configKey::hostName] = hostName;
|
|
}
|
|
if (port > 0) {
|
|
obj[configKey::port] = port;
|
|
}
|
|
if (!clientIp.isEmpty()) {
|
|
obj[configKey::clientIp] = clientIp;
|
|
}
|
|
if (!clientPrivateKey.isEmpty()) {
|
|
obj[configKey::clientPrivKey] = clientPrivateKey;
|
|
}
|
|
if (!clientPublicKey.isEmpty()) {
|
|
obj[configKey::clientPubKey] = clientPublicKey;
|
|
}
|
|
if (!serverPublicKey.isEmpty()) {
|
|
obj[configKey::serverPubKey] = serverPublicKey;
|
|
}
|
|
if (!presharedKey.isEmpty()) {
|
|
obj[configKey::pskKey] = presharedKey;
|
|
}
|
|
if (!clientId.isEmpty()) {
|
|
obj[configKey::clientId] = clientId;
|
|
}
|
|
|
|
if (!allowedIps.isEmpty()) {
|
|
QJsonArray arr;
|
|
for (const QString& ip : allowedIps) {
|
|
arr.append(ip);
|
|
}
|
|
obj[configKey::allowedIps] = arr;
|
|
}
|
|
if (!persistentKeepAlive.isEmpty()) {
|
|
obj[configKey::persistentKeepAlive] = persistentKeepAlive;
|
|
}
|
|
if (!mtu.isEmpty()) {
|
|
obj[configKey::mtu] = mtu;
|
|
}
|
|
|
|
if (!junkPacketCount.isEmpty()) {
|
|
obj[configKey::junkPacketCount] = junkPacketCount;
|
|
}
|
|
if (!junkPacketMinSize.isEmpty()) {
|
|
obj[configKey::junkPacketMinSize] = junkPacketMinSize;
|
|
}
|
|
if (!junkPacketMaxSize.isEmpty()) {
|
|
obj[configKey::junkPacketMaxSize] = junkPacketMaxSize;
|
|
}
|
|
if (!initPacketJunkSize.isEmpty()) {
|
|
obj[configKey::initPacketJunkSize] = initPacketJunkSize;
|
|
}
|
|
if (!responsePacketJunkSize.isEmpty()) {
|
|
obj[configKey::responsePacketJunkSize] = responsePacketJunkSize;
|
|
}
|
|
if (!cookieReplyPacketJunkSize.isEmpty()) {
|
|
obj[configKey::cookieReplyPacketJunkSize] = cookieReplyPacketJunkSize;
|
|
}
|
|
if (!transportPacketJunkSize.isEmpty()) {
|
|
obj[configKey::transportPacketJunkSize] = transportPacketJunkSize;
|
|
}
|
|
|
|
if (!initPacketMagicHeader.isEmpty()) {
|
|
obj[configKey::initPacketMagicHeader] = initPacketMagicHeader;
|
|
}
|
|
if (!responsePacketMagicHeader.isEmpty()) {
|
|
obj[configKey::responsePacketMagicHeader] = responsePacketMagicHeader;
|
|
}
|
|
if (!underloadPacketMagicHeader.isEmpty()) {
|
|
obj[configKey::underloadPacketMagicHeader] = underloadPacketMagicHeader;
|
|
}
|
|
if (!transportPacketMagicHeader.isEmpty()) {
|
|
obj[configKey::transportPacketMagicHeader] = transportPacketMagicHeader;
|
|
}
|
|
|
|
obj[configKey::specialJunk1] = specialJunk1;
|
|
obj[configKey::specialJunk2] = specialJunk2;
|
|
obj[configKey::specialJunk3] = specialJunk3;
|
|
obj[configKey::specialJunk4] = specialJunk4;
|
|
obj[configKey::specialJunk5] = specialJunk5;
|
|
|
|
if (isObfuscationEnabled) {
|
|
obj[configKey::isObfuscationEnabled] = isObfuscationEnabled;
|
|
}
|
|
|
|
return obj;
|
|
}
|
|
|
|
AwgClientConfig AwgClientConfig::fromJson(const QJsonObject& json)
|
|
{
|
|
AwgClientConfig config;
|
|
|
|
config.nativeConfig = json.value(configKey::config).toString();
|
|
config.hostName = json.value(configKey::hostName).toString();
|
|
config.port = json.value(configKey::port).toInt(0);
|
|
config.clientIp = json.value(configKey::clientIp).toString();
|
|
config.clientPrivateKey = json.value(configKey::clientPrivKey).toString();
|
|
config.clientPublicKey = json.value(configKey::clientPubKey).toString();
|
|
config.serverPublicKey = json.value(configKey::serverPubKey).toString();
|
|
config.presharedKey = json.value(configKey::pskKey).toString();
|
|
config.clientId = json.value(configKey::clientId).toString();
|
|
|
|
QJsonArray allowedIpsArr = json.value(configKey::allowedIps).toArray();
|
|
for (const QJsonValue& val : allowedIpsArr) {
|
|
config.allowedIps.append(val.toString());
|
|
}
|
|
config.persistentKeepAlive = json.value(configKey::persistentKeepAlive).toString();
|
|
config.mtu = json.value(configKey::mtu).toString();
|
|
|
|
config.junkPacketCount = json.value(configKey::junkPacketCount).toString();
|
|
config.junkPacketMinSize = json.value(configKey::junkPacketMinSize).toString();
|
|
config.junkPacketMaxSize = json.value(configKey::junkPacketMaxSize).toString();
|
|
config.initPacketJunkSize = json.value(configKey::initPacketJunkSize).toString();
|
|
config.responsePacketJunkSize = json.value(configKey::responsePacketJunkSize).toString();
|
|
config.cookieReplyPacketJunkSize = json.value(configKey::cookieReplyPacketJunkSize).toString();
|
|
config.transportPacketJunkSize = json.value(configKey::transportPacketJunkSize).toString();
|
|
|
|
config.initPacketMagicHeader = json.value(configKey::initPacketMagicHeader).toString();
|
|
config.responsePacketMagicHeader = json.value(configKey::responsePacketMagicHeader).toString();
|
|
config.underloadPacketMagicHeader = json.value(configKey::underloadPacketMagicHeader).toString();
|
|
config.transportPacketMagicHeader = json.value(configKey::transportPacketMagicHeader).toString();
|
|
|
|
config.specialJunk1 = json.value(configKey::specialJunk1).toString();
|
|
config.specialJunk2 = json.value(configKey::specialJunk2).toString();
|
|
config.specialJunk3 = json.value(configKey::specialJunk3).toString();
|
|
config.specialJunk4 = json.value(configKey::specialJunk4).toString();
|
|
config.specialJunk5 = json.value(configKey::specialJunk5).toString();
|
|
|
|
config.isObfuscationEnabled = json.value(configKey::isObfuscationEnabled).toBool(false);
|
|
|
|
return config;
|
|
}
|
|
|
|
QJsonObject AwgProtocolConfig::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;
|
|
}
|
|
|
|
AwgProtocolConfig AwgProtocolConfig::fromJson(const QJsonObject& json)
|
|
{
|
|
AwgProtocolConfig config;
|
|
|
|
config.serverConfig = AwgServerConfig::fromJson(json);
|
|
|
|
QString lastConfigStr = json.value(configKey::lastConfig).toString();
|
|
if (!lastConfigStr.isEmpty()) {
|
|
QJsonDocument doc = QJsonDocument::fromJson(lastConfigStr.toUtf8());
|
|
if (doc.isObject()) {
|
|
config.clientConfig = AwgClientConfig::fromJson(doc.object());
|
|
}
|
|
}
|
|
|
|
return config;
|
|
}
|
|
|
|
bool AwgProtocolConfig::hasClientConfig() const
|
|
{
|
|
return clientConfig.has_value();
|
|
}
|
|
|
|
void AwgProtocolConfig::setClientConfig(const AwgClientConfig& config)
|
|
{
|
|
clientConfig = config;
|
|
}
|
|
|
|
void AwgProtocolConfig::clearClientConfig()
|
|
{
|
|
clientConfig.reset();
|
|
}
|
|
|
|
bool AwgServerConfig::hasEqualServerSettings(const AwgServerConfig& other) const
|
|
{
|
|
if (subnetAddress != other.subnetAddress || port != other.port ||
|
|
junkPacketCount != other.junkPacketCount ||
|
|
junkPacketMinSize != other.junkPacketMinSize || junkPacketMaxSize != other.junkPacketMaxSize ||
|
|
initPacketJunkSize != other.initPacketJunkSize || responsePacketJunkSize != other.responsePacketJunkSize ||
|
|
initPacketMagicHeader != other.initPacketMagicHeader ||
|
|
responsePacketMagicHeader != other.responsePacketMagicHeader ||
|
|
underloadPacketMagicHeader != other.underloadPacketMagicHeader ||
|
|
transportPacketMagicHeader != other.transportPacketMagicHeader ||
|
|
specialJunk1 != other.specialJunk1 || specialJunk2 != other.specialJunk2 ||
|
|
specialJunk3 != other.specialJunk3 || specialJunk4 != other.specialJunk4 ||
|
|
specialJunk5 != other.specialJunk5) {
|
|
return false;
|
|
}
|
|
|
|
bool isV2 = protocolVersion == protocols::awg::awgV2;
|
|
if (isV2) {
|
|
if (cookieReplyPacketJunkSize != other.cookieReplyPacketJunkSize ||
|
|
transportPacketJunkSize != other.transportPacketJunkSize) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool AwgProtocolConfig::isHeadersEqual(const QString &h1, const QString &h2, const QString &h3, const QString &h4)
|
|
{
|
|
return (h1 == h2) || (h1 == h3) || (h1 == h4) || (h2 == h3) || (h2 == h4) || (h3 == h4);
|
|
}
|
|
|
|
bool AwgProtocolConfig::isPacketSizeEqual(int s1, int s2, int s3, int s4)
|
|
{
|
|
int initSize = AwgConstant::messageInitiationSize + s1;
|
|
int responseSize = AwgConstant::messageResponseSize + s2;
|
|
int cookieSize = AwgConstant::messageCookieReplySize + s3;
|
|
int transportSize = AwgConstant::messageTransportSize + s4;
|
|
|
|
return (initSize == responseSize || initSize == cookieSize || initSize == transportSize || responseSize == cookieSize
|
|
|| responseSize == transportSize || cookieSize == transportSize);
|
|
}
|
|
|
|
} // namespace amnezia
|
|
|