AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add xray support in apiConfigsController

Browse source
This commit is contained in:
vladimir.kuznetsov 2025-06-16 09:51:07 +08:00
parent a77387cc4b
commit 005cb164a5
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
client/ui/controllers/api/apiConfigsController.cpp
View file

@ -18,6 +18,7 @@ namespace
{ {
constexpr char cloak[] = "cloak"; constexpr char cloak[] = "cloak";
constexpr char awg[] = "awg"; constexpr char awg[] = "awg";
constexpr char xray[] = "xray";
constexpr char apiEndpoint[] = "api_endpoint"; constexpr char apiEndpoint[] = "api_endpoint";
constexpr char accessToken[] = "api_key"; constexpr char accessToken[] = "api_key";
@ -50,6 +51,8 @@ namespace
QString wireGuardClientPrivKey; QString wireGuardClientPrivKey;
QString wireGuardClientPubKey; QString wireGuardClientPubKey;
QString xrayUuid;
}; };
struct GatewayRequestData struct GatewayRequestData
@ -106,7 +109,10 @@ namespace
auto connData = WireguardConfigurator::genClientKeys(); auto connData = WireguardConfigurator::genClientKeys();
protocolData.wireGuardClientPubKey = connData.clientPubKey; protocolData.wireGuardClientPubKey = connData.clientPubKey;
protocolData.wireGuardClientPrivKey = connData.clientPrivKey; protocolData.wireGuardClientPrivKey = connData.clientPrivKey;
} else if (protocol == configKey::xray) {
protocolData.xrayUuid = QUuid::createUuid().toString(QUuid::WithoutBraces);
} }
return protocolData; return protocolData;
} }
@ -151,18 +157,19 @@ namespace
} }
auto container = containers.at(0).toObject(); auto container = containers.at(0).toObject();
QString containerName = ContainerProps::containerTypeToString(DockerContainer::Awg); QString containerName = ContainerProps::containerTypeToString(DockerContainer::Awg);
auto containerConfig = container.value(containerName).toObject(); auto serverProtocolConfig = container.value(containerName).toObject();
auto protocolConfig = QJsonDocument::fromJson(containerConfig.value(config_key::last_config).toString().toUtf8()).object(); auto clientProtocolConfig =
containerConfig[config_key::junkPacketCount] = protocolConfig.value(config_key::junkPacketCount); QJsonDocument::fromJson(serverProtocolConfig.value(config_key::last_config).toString().toUtf8()).object();
containerConfig[config_key::junkPacketMinSize] = protocolConfig.value(config_key::junkPacketMinSize); serverProtocolConfig[config_key::junkPacketCount] = clientProtocolConfig.value(config_key::junkPacketCount);
containerConfig[config_key::junkPacketMaxSize] = protocolConfig.value(config_key::junkPacketMaxSize); serverProtocolConfig[config_key::junkPacketMinSize] = clientProtocolConfig.value(config_key::junkPacketMinSize);
containerConfig[config_key::initPacketJunkSize] = protocolConfig.value(config_key::initPacketJunkSize); serverProtocolConfig[config_key::junkPacketMaxSize] = clientProtocolConfig.value(config_key::junkPacketMaxSize);
containerConfig[config_key::responsePacketJunkSize] = protocolConfig.value(config_key::responsePacketJunkSize); serverProtocolConfig[config_key::initPacketJunkSize] = clientProtocolConfig.value(config_key::initPacketJunkSize);
containerConfig[config_key::initPacketMagicHeader] = protocolConfig.value(config_key::initPacketMagicHeader); serverProtocolConfig[config_key::responsePacketJunkSize] = clientProtocolConfig.value(config_key::responsePacketJunkSize);
containerConfig[config_key::responsePacketMagicHeader] = protocolConfig.value(config_key::responsePacketMagicHeader); serverProtocolConfig[config_key::initPacketMagicHeader] = clientProtocolConfig.value(config_key::initPacketMagicHeader);
containerConfig[config_key::underloadPacketMagicHeader] = protocolConfig.value(config_key::underloadPacketMagicHeader); serverProtocolConfig[config_key::responsePacketMagicHeader] = clientProtocolConfig.value(config_key::responsePacketMagicHeader);
containerConfig[config_key::transportPacketMagicHeader] = protocolConfig.value(config_key::transportPacketMagicHeader); serverProtocolConfig[config_key::underloadPacketMagicHeader] = clientProtocolConfig.value(config_key::underloadPacketMagicHeader);
container[containerName] = containerConfig; serverProtocolConfig[config_key::transportPacketMagicHeader] = clientProtocolConfig.value(config_key::transportPacketMagicHeader);
container[containerName] = serverProtocolConfig;
containers.replace(0, container); containers.replace(0, container);
newServerConfig[config_key::containers] = containers; newServerConfig[config_key::containers] = containers;
configStr = QString(QJsonDocument(newServerConfig).toJson()); configStr = QString(QJsonDocument(newServerConfig).toJson());