Merge pull request #766 from amnezia-vpn/feature/native-wg-psk

Add support for native WG configs without PSK parameter

client/daemon/daemon.cpp

@@ -248,9 +248,10 @@ bool Daemon::parseConfig(const QJsonObject& obj, InterfaceConfig& config) {
 
   GETVALUE("privateKey", config.m_privateKey, String);
   GETVALUE("serverPublicKey", config.m_serverPublicKey, String);
-  GETVALUE("serverPskKey", config.m_serverPskKey, String);
   GETVALUE("serverPort", config.m_serverPort, Double);
 
+  config.m_serverPskKey = obj.value("serverPskKey").toString();
+
   if (!obj.contains("deviceMTU") || obj.value("deviceMTU").toString().toInt() == 0)
   {
     config.m_deviceMTU = 1420;

client/platforms/linux/daemon/wireguardutilslinux.cpp

@@ -199,7 +199,9 @@ bool WireguardUtilsLinux::updatePeer(const InterfaceConfig& config) {
     QTextStream out(&message);
     out << "set=1\n";
     out << "public_key=" << QString(publicKey.toHex()) << "\n";
-    out << "preshared_key=" << QString(pskKey.toHex()) << "\n";
+    if (!config.m_serverPskKey.isNull()) {
+        out << "preshared_key=" << QString(pskKey.toHex()) << "\n";
+    }
     if (!config.m_serverIpv4AddrIn.isNull()) {
         out << "endpoint=" << config.m_serverIpv4AddrIn << ":";
     } else if (!config.m_serverIpv6AddrIn.isNull()) {

client/platforms/macos/daemon/wireguardutilsmacos.cpp

@@ -199,7 +199,9 @@ bool WireguardUtilsMacos::updatePeer(const InterfaceConfig& config) {
   QTextStream out(&message);
   out << "set=1\n";
   out << "public_key=" << QString(publicKey.toHex()) << "\n";
-  out << "preshared_key=" << QString(pskKey.toHex()) << "\n";
+  if (!config.m_serverPskKey.isNull()) {
+    out << "preshared_key=" << QString(pskKey.toHex()) << "\n";
+  }
   if (!config.m_serverIpv4AddrIn.isNull()) {
     out << "endpoint=" << config.m_serverIpv4AddrIn << ":";
   } else if (!config.m_serverIpv6AddrIn.isNull()) {

client/platforms/windows/daemon/wireguardutilswindows.cpp

@@ -148,7 +148,9 @@ bool WireguardUtilsWindows::updatePeer(const InterfaceConfig& config) {
   QTextStream out(&message);
   out << "set=1\n";
   out << "public_key=" << QString(publicKey.toHex()) << "\n";
-  out << "preshared_key=" << QString(pskKey.toHex()) << "\n";
+  if (!config.m_serverPskKey.isNull()) {
+    out << "preshared_key=" << QString(pskKey.toHex()) << "\n";
+  }
   if (!config.m_serverIpv4AddrIn.isNull()) {
     out << "endpoint=" << config.m_serverIpv4AddrIn << ":";
   } else if (!config.m_serverIpv6AddrIn.isNull()) {

client/ui/qml/Pages2/PageShareFullAccess.qml

@@ -112,7 +112,7 @@ PageType {
 
                         shareConnectionDrawer.headerText = qsTr("Accessing ") + serverSelector.text
                         shareConnectionDrawer.configContentHeaderText = qsTr("File with accessing settings to ") + serverSelector.text
-                        // serverSelector.close()
+                        serverSelector.close()
                     }
 
                     Component.onCompleted: {