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
203 lines
7.6 KiB
C++
203 lines
7.6 KiB
C++
#include "xrayConfigurator.h"
|
|
|
|
#include <QFile>
|
|
#include <QJsonDocument>
|
|
#include <QJsonObject>
|
|
#include <QJsonArray>
|
|
#include <QUuid>
|
|
#include "logger.h"
|
|
|
|
#include "core/utils/containerEnum.h"
|
|
#include "core/utils/containers/containerUtils.h"
|
|
#include "core/utils/protocolEnum.h"
|
|
#include "core/utils/selfhosted/sshSession.h"
|
|
#include "core/utils/selfhosted/scriptsRegistry.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/xrayProtocolConfig.h"
|
|
|
|
namespace {
|
|
Logger logger("XrayConfigurator");
|
|
}
|
|
|
|
XrayConfigurator::XrayConfigurator(SshSession* sshSession, QObject *parent)
|
|
: ConfiguratorBase(sshSession, parent)
|
|
{
|
|
}
|
|
|
|
QString XrayConfigurator::prepareServerConfig(const ServerCredentials &credentials, DockerContainer container,
|
|
const ContainerConfig &containerConfig,
|
|
const DnsSettings &dnsSettings,
|
|
ErrorCode &errorCode)
|
|
{
|
|
// Generate new UUID for client
|
|
QString clientId = QUuid::createUuid().toString(QUuid::WithoutBraces);
|
|
|
|
// Get current server config
|
|
QString currentConfig = m_sshSession->getTextFileFromContainer(
|
|
container, credentials, amnezia::protocols::xray::serverConfigPath, errorCode);
|
|
|
|
if (errorCode != ErrorCode::NoError) {
|
|
logger.error() << "Failed to get server config file";
|
|
return "";
|
|
}
|
|
|
|
// Parse current config as JSON
|
|
QJsonDocument doc = QJsonDocument::fromJson(currentConfig.toUtf8());
|
|
if (doc.isNull() || !doc.isObject()) {
|
|
logger.error() << "Failed to parse server config JSON";
|
|
errorCode = ErrorCode::InternalError;
|
|
return "";
|
|
}
|
|
|
|
QJsonObject serverConfig = doc.object();
|
|
|
|
// Validate server config structure
|
|
if (!serverConfig.contains(amnezia::protocols::xray::inbounds)) {
|
|
logger.error() << "Server config missing 'inbounds' field";
|
|
errorCode = ErrorCode::InternalError;
|
|
return "";
|
|
}
|
|
|
|
QJsonArray inbounds = serverConfig[amnezia::protocols::xray::inbounds].toArray();
|
|
if (inbounds.isEmpty()) {
|
|
logger.error() << "Server config has empty 'inbounds' array";
|
|
errorCode = ErrorCode::InternalError;
|
|
return "";
|
|
}
|
|
|
|
QJsonObject inbound = inbounds[0].toObject();
|
|
if (!inbound.contains(amnezia::protocols::xray::settings)) {
|
|
logger.error() << "Inbound missing 'settings' field";
|
|
errorCode = ErrorCode::InternalError;
|
|
return "";
|
|
}
|
|
|
|
QJsonObject settings = inbound[amnezia::protocols::xray::settings].toObject();
|
|
if (!settings.contains(amnezia::protocols::xray::clients)) {
|
|
logger.error() << "Settings missing 'clients' field";
|
|
errorCode = ErrorCode::InternalError;
|
|
return "";
|
|
}
|
|
|
|
QJsonArray clients = settings[amnezia::protocols::xray::clients].toArray();
|
|
|
|
// Create configuration for new client
|
|
QJsonObject clientConfig {
|
|
{amnezia::protocols::xray::id, clientId},
|
|
{amnezia::protocols::xray::flow, "xtls-rprx-vision"}
|
|
};
|
|
|
|
clients.append(clientConfig);
|
|
|
|
// Update config
|
|
settings[amnezia::protocols::xray::clients] = clients;
|
|
inbound[amnezia::protocols::xray::settings] = settings;
|
|
inbounds[0] = inbound;
|
|
serverConfig[amnezia::protocols::xray::inbounds] = inbounds;
|
|
|
|
// Save updated config to server
|
|
QString updatedConfig = QJsonDocument(serverConfig).toJson();
|
|
errorCode = m_sshSession->uploadTextFileToContainer(
|
|
container,
|
|
credentials,
|
|
updatedConfig,
|
|
amnezia::protocols::xray::serverConfigPath,
|
|
libssh::ScpOverwriteMode::ScpOverwriteExisting
|
|
);
|
|
if (errorCode != ErrorCode::NoError) {
|
|
logger.error() << "Failed to upload updated config";
|
|
return "";
|
|
}
|
|
|
|
// Restart container
|
|
QString restartScript = QString("sudo docker restart $CONTAINER_NAME");
|
|
errorCode = m_sshSession->runScript(
|
|
credentials,
|
|
m_sshSession->replaceVars(restartScript, amnezia::genBaseVars(credentials, container, dnsSettings.primaryDns, dnsSettings.secondaryDns))
|
|
);
|
|
|
|
if (errorCode != ErrorCode::NoError) {
|
|
logger.error() << "Failed to restart container";
|
|
return "";
|
|
}
|
|
|
|
return clientId;
|
|
}
|
|
|
|
ProtocolConfig XrayConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
|
|
const ContainerConfig &containerConfig,
|
|
const DnsSettings &dnsSettings,
|
|
ErrorCode &errorCode)
|
|
{
|
|
const XrayServerConfig* serverConfig = nullptr;
|
|
if (auto* xrayConfig = containerConfig.protocolConfig.as<XrayProtocolConfig>()) {
|
|
serverConfig = &xrayConfig->serverConfig;
|
|
}
|
|
|
|
QString xrayClientId = prepareServerConfig(credentials, container, containerConfig, dnsSettings, errorCode);
|
|
if (errorCode != ErrorCode::NoError || xrayClientId.isEmpty()) {
|
|
logger.error() << "Failed to prepare server config";
|
|
errorCode = ErrorCode::InternalError;
|
|
return XrayProtocolConfig{};
|
|
}
|
|
|
|
amnezia::ScriptVars vars = amnezia::genBaseVars(credentials, container, dnsSettings.primaryDns, dnsSettings.secondaryDns);
|
|
vars.append(amnezia::genProtocolVarsForContainer(container, containerConfig));
|
|
QString config = m_sshSession->replaceVars(amnezia::scriptData(ProtocolScriptType::xray_template, container), vars);
|
|
|
|
if (config.isEmpty()) {
|
|
logger.error() << "Failed to get config template";
|
|
errorCode = ErrorCode::InternalError;
|
|
return XrayProtocolConfig{};
|
|
}
|
|
|
|
QString xrayPublicKey =
|
|
m_sshSession->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::PublicKeyPath, errorCode);
|
|
if (errorCode != ErrorCode::NoError || xrayPublicKey.isEmpty()) {
|
|
logger.error() << "Failed to get public key";
|
|
errorCode = ErrorCode::InternalError;
|
|
return XrayProtocolConfig{};
|
|
}
|
|
xrayPublicKey.replace("\n", "");
|
|
|
|
QString xrayShortId =
|
|
m_sshSession->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::shortidPath, errorCode);
|
|
if (errorCode != ErrorCode::NoError || xrayShortId.isEmpty()) {
|
|
logger.error() << "Failed to get short ID";
|
|
errorCode = ErrorCode::InternalError;
|
|
return XrayProtocolConfig{};
|
|
}
|
|
xrayShortId.replace("\n", "");
|
|
|
|
if (!config.contains("$XRAY_CLIENT_ID") || !config.contains("$XRAY_PUBLIC_KEY") || !config.contains("$XRAY_SHORT_ID")) {
|
|
logger.error() << "Config template missing required variables:"
|
|
<< "XRAY_CLIENT_ID:" << !config.contains("$XRAY_CLIENT_ID")
|
|
<< "XRAY_PUBLIC_KEY:" << !config.contains("$XRAY_PUBLIC_KEY")
|
|
<< "XRAY_SHORT_ID:" << !config.contains("$XRAY_SHORT_ID");
|
|
errorCode = ErrorCode::InternalError;
|
|
return XrayProtocolConfig{};
|
|
}
|
|
|
|
config.replace("$XRAY_CLIENT_ID", xrayClientId);
|
|
config.replace("$XRAY_PUBLIC_KEY", xrayPublicKey);
|
|
config.replace("$XRAY_SHORT_ID", xrayShortId);
|
|
|
|
XrayProtocolConfig protocolConfig;
|
|
if (serverConfig) {
|
|
protocolConfig.serverConfig = *serverConfig;
|
|
}
|
|
|
|
XrayClientConfig clientConfig;
|
|
clientConfig.nativeConfig = config;
|
|
clientConfig.localPort = "";
|
|
clientConfig.id = xrayClientId;
|
|
|
|
protocolConfig.setClientConfig(clientConfig);
|
|
|
|
return protocolConfig;
|
|
}
|