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

added getting cloud config for cloak

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-10-23 23:55:01 +05:00
parent 4ae9cddcce
commit 3e03002ead
2 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

29
client/ui/controllers/cloudController.cpp
View file

@ -31,8 +31,8 @@ QString CloudController::genCertificateRequest(ServiceTypeId serviceTypeId)
{ {
case ServiceTypeId::AmneziaFreeRuWG: return ""; case ServiceTypeId::AmneziaFreeRuWG: return "";
case ServiceTypeId::AmneziaFreeRuCloak: { case ServiceTypeId::AmneziaFreeRuCloak: {
auto data = OpenVpnConfigurator::createCertRequest(); m_certRequest = OpenVpnConfigurator::createCertRequest();
return data.request; return m_certRequest.request;
} }
case ServiceTypeId::AmneziaFreeRuAWG: return ""; case ServiceTypeId::AmneziaFreeRuAWG: return "";
case ServiceTypeId::AmneziaFreeRuReverseWG: return ""; case ServiceTypeId::AmneziaFreeRuReverseWG: return "";
@ -41,6 +41,23 @@ QString CloudController::genCertificateRequest(ServiceTypeId serviceTypeId)
} }
} }
void CloudController::processCloudConfig(ServiceTypeId serviceTypeId, QString &config)
{
switch (serviceTypeId)
{
case ServiceTypeId::AmneziaFreeRuWG: return;
case ServiceTypeId::AmneziaFreeRuCloak: {
config.replace("<key>", "<key>\n");
config.replace("$OPENVPN_PRIV_KEY", m_certRequest.privKey);
return;
}
case ServiceTypeId::AmneziaFreeRuAWG: return;
case ServiceTypeId::AmneziaFreeRuReverseWG: return;
case ServiceTypeId::AmneziaFreeRuReverseCloak: return;
case ServiceTypeId::AmneziaFreeRuReverseAWG: return;
}
}
bool CloudController::updateServerConfigFromCloud() bool CloudController::updateServerConfigFromCloud()
{ {
auto serverConfig = m_serversModel->getDefaultServerConfig(); auto serverConfig = m_serversModel->getDefaultServerConfig();
@ -53,7 +70,7 @@ bool CloudController::updateServerConfigFromCloud()
QNetworkRequest request; QNetworkRequest request;
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QString endpoint = serverConfig.value(config_key::apiEdnpoint).toString(); QString endpoint = serverConfig.value(config_key::apiEdnpoint).toString();
request.setUrl(endpoint.replace("https", "http")); // request.setUrl(endpoint.replace("https", "http")); // todo remove
ServiceTypeId serviceTypeId = static_cast<ServiceTypeId>(serverConfig.value(config_key::serviceTypeId).toInt()); ServiceTypeId serviceTypeId = static_cast<ServiceTypeId>(serverConfig.value(config_key::serviceTypeId).toInt());
@ -85,7 +102,11 @@ bool CloudController::updateServerConfigFromCloud()
ba = ba_uncompressed; ba = ba_uncompressed;
} }
QJsonObject cloudConfig = QJsonDocument::fromJson(ba).object(); QString configStr = ba;
processCloudConfig(serviceTypeId, configStr);
QJsonObject cloudConfig = QJsonDocument::fromJson(configStr.toUtf8()).object();
serverConfig.insert("cloudConfig", cloudConfig); serverConfig.insert("cloudConfig", cloudConfig);
serverConfig.insert(config_key::dns1, cloudConfig.value(config_key::dns1)); serverConfig.insert(config_key::dns1, cloudConfig.value(config_key::dns1));
serverConfig.insert(config_key::dns2, cloudConfig.value(config_key::dns2)); serverConfig.insert(config_key::dns2, cloudConfig.value(config_key::dns2));

5
client/ui/controllers/cloudController.h
View file

@ -5,6 +5,7 @@
#include "ui/models/containers_model.h" #include "ui/models/containers_model.h"
#include "ui/models/servers_model.h" #include "ui/models/servers_model.h"
#include "configurators/openvpn_configurator.h"
class CloudController : public QObject class CloudController : public QObject
{ {
@ -36,8 +37,12 @@ private:
QString genPublicKey(ServiceTypeId serviceTypeId); QString genPublicKey(ServiceTypeId serviceTypeId);
QString genCertificateRequest(ServiceTypeId serviceTypeId); QString genCertificateRequest(ServiceTypeId serviceTypeId);
void processCloudConfig(ServiceTypeId serviceTypeId, QString &config);
QSharedPointer<ServersModel> m_serversModel; QSharedPointer<ServersModel> m_serversModel;
QSharedPointer<ContainersModel> m_containersModel; QSharedPointer<ContainersModel> m_containersModel;
OpenVpnConfigurator::ConnectionData m_certRequest;
}; };
#endif // CLOUDCONTROLLER_H #endif // CLOUDCONTROLLER_H