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

fixed filling in the wg private key

Browse source
This commit is contained in:
vladimir.kuznetsov 2024-01-30 00:47:22 +07:00
parent f7b9d2bae7
commit 3edb6755b4
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/ui/controllers/apiController.cpp
View file

@ -35,7 +35,7 @@ void ApiController::processCloudConfig(const QString &protocol, const ApiControl
config.replace("$OPENVPN_PRIV_KEY", apiPayloadData.certRequest.privKey); config.replace("$OPENVPN_PRIV_KEY", apiPayloadData.certRequest.privKey);
return; return;
} else if (protocol == configKey::awg) { } else if (protocol == configKey::awg) {
config.replace("$WIREGUARD_CLIENT_PRIVATE_KEY", apiPayloadData.wireGUardClientPubKey); config.replace("$WIREGUARD_CLIENT_PRIVATE_KEY", apiPayloadData.wireGuardClientPrivKey);
} }
return; return;
} }
@ -47,7 +47,7 @@ ApiController::ApiPayloadData ApiController::generateApiPayloadData(const QStrin
apiPayload.certRequest = OpenVpnConfigurator::createCertRequest(); apiPayload.certRequest = OpenVpnConfigurator::createCertRequest();
} else if (protocol == configKey::awg) { } else if (protocol == configKey::awg) {
auto connData = WireguardConfigurator::genClientKeys(); auto connData = WireguardConfigurator::genClientKeys();
apiPayload.wireGUardClientPubKey = connData.clientPubKey; apiPayload.wireGuardClientPubKey = connData.clientPubKey;
apiPayload.wireGuardClientPrivKey = connData.clientPrivKey; apiPayload.wireGuardClientPrivKey = connData.clientPrivKey;
} }
return apiPayload; return apiPayload;
@ -59,7 +59,7 @@ QJsonObject ApiController::fillApiPayload(const QString &protocol, const ApiCont
if (protocol == configKey::cloak) { if (protocol == configKey::cloak) {
obj[configKey::certificate] = apiPayloadData.certRequest.request; obj[configKey::certificate] = apiPayloadData.certRequest.request;
} else if (protocol == configKey::awg) { } else if (protocol == configKey::awg) {
obj[configKey::publicKey] = apiPayloadData.wireGUardClientPubKey; obj[configKey::publicKey] = apiPayloadData.wireGuardClientPubKey;
} }
return obj; return obj;
} }

2
client/ui/controllers/apiController.h
View file

@ -26,7 +26,7 @@ private:
OpenVpnConfigurator::ConnectionData certRequest; OpenVpnConfigurator::ConnectionData certRequest;
QString wireGuardClientPrivKey; QString wireGuardClientPrivKey;
QString wireGUardClientPubKey; QString wireGuardClientPubKey;
}; };
ApiPayloadData generateApiPayloadData(const QString &protocol); ApiPayloadData generateApiPayloadData(const QString &protocol);