From 4176d0130a87520f940630d3f067f8bfe0f80161 Mon Sep 17 00:00:00 2001 From: Mykola Baibuz Date: Sat, 20 Jan 2024 08:35:24 -0500 Subject: [PATCH] Fix import of some native WG configs --- client/ui/controllers/importController.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp index 44fc1cb96..734c17c39 100644 --- a/client/ui/controllers/importController.cpp +++ b/client/ui/controllers/importController.cpp @@ -239,7 +239,16 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data) // && !configMap.value("PresharedKey").isEmpty() && !configMap.value("PublicKey").isEmpty()) { lastConfig[config_key::client_priv_key] = configMap.value("PrivateKey"); lastConfig[config_key::client_ip] = configMap.value("Address"); - lastConfig[config_key::psk_key] = configMap.value("PresharedKey"); + if (!configMap.value("PresharedKey").isEmpty()) { + lastConfig[config_key::psk_key] = configMap.value("PresharedKey"); + } else if (!configMap.value("PreSharedKey").isEmpty()) { + lastConfig[config_key::psk_key] = configMap.value("PreSharedKey"); + } else { + qDebug() << "Failed to import profile"; + emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError)); + return QJsonObject(); + } + lastConfig[config_key::server_pub_key] = configMap.value("PublicKey"); // } else { // qDebug() << "Failed to import profile";