Differential D20930 Diff 57970 libs/editor/settings/wireguardinterfacewidget.cpp

Changeset View

Standalone View

View Options

libs/editor/settings/wireguardinterfacewidget.cpp

  • This file was added.
1​/*
2​ Copyright 2019 Bruce Anderson <banderson19com@san.rr.com>
3​
4​ This library is free software; you can redistribute it and/or
5​ modify it under the terms of the GNU Lesser General Public
6​ License as published by the Free Software Foundation; either
7​ version 2.1 of the License, or (at your option) version 3, or any
8​ later version accepted by the membership of KDE e.V. (or its
9​ successor approved by the membership of KDE e.V.), which shall
10​ act as a proxy defined in Section 6 of version 3 of the license.
11​
12​ This library is distributed in the hope that it will be useful,
13​ but WITHOUT ANY WARRANTY; without even the implied warranty of
14​ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15​ Lesser General Public License for more details.
16​
17​ You should have received a copy of the GNU Lesser General Public
18​ License along with this library. If not, see <http://www.gnu.org/licenses/>.
19​*/
20​#include "debug.h"
21​#include "wireguardinterfacewidget.h"
22​#include "wireguardtabwidget.h"
23​#include "ui_wireguardinterfacewidget.h"
24​#include "uiutils.h"
25​#include "simpleipv4addressvalidator.h"
26​#include "simpleiplistvalidator.h"
27​#include "wireguardkeyvalidator.h"
28​
29​#include <QStandardItemModel>
30​
31​#include <NetworkManagerQt/Utils>
32​#include <NetworkManagerQt/WireguardSetting>
33​#include <NetworkManagerQt/Ipv4Setting>
34​#include <NetworkManagerQt/Ipv6Setting>
35​#include <KColorScheme>
36​#include <KConfig>
37​#include <KConfigGroup>
38​
39​// Tags used in a WireGuard .conf file - Used for importing
40​#define PNM_WG_CONF_TAG_INTERFACE "[Interface]"
41​#define PNM_WG_CONF_TAG_ADDRESS "Address"
42​#define PNM_WG_CONF_TAG_LISTEN_PORT "ListenPort"
43​#define PNM_WG_CONF_TAG_MTU "MTU"
44​#define PNM_WG_CONF_TAG_DNS "DNS"
45​#define PNM_WG_CONF_TAG_FWMARK "FwMark"
46​#define PNM_WG_CONF_TAG_PRIVATE_KEY "PrivateKey"
47​#define PNM_WG_CONF_TAG_PEER "[Peer]"
48​#define PNM_WG_CONF_TAG_PUBLIC_KEY "PublicKey"
49​#define PNM_WG_CONF_TAG_PRESHARED_KEY "PresharedKey"
50​#define PNM_WG_CONF_TAG_ALLOWED_IPS "AllowedIPs"
51​#define PNM_WG_CONF_TAG_ENDPOINT "Endpoint"
52​#define PNM_WG_CONF_TAG_PERSISTENT_KEEPALIVE "PersistentKeepalive"
53​#define PNM_WG_CONF_TAG_TABLE "Table"
54​#define PNM_WG_CONF_TAG_PRE_UP "PreUp"
55​#define PNM_WG_CONF_TAG_POST_UP "PostUp"
56​#define PNM_WG_CONF_TAG_PRE_DOWN "PreDown"
57​#define PNM_WG_CONF_TAG_POST_DOWN "PostDown"
58​
59​#define PNM_WG_KEY_PEERS "peers"
60​#define PNM_WG_KEY_MTU "mtu"
61​#define PNM_WG_KEY_PEER_ROUTES "peer-routes"
62​#define PNM_WG_PEER_KEY_ALLOWED_IPS "allowed-ips"
63​#define PNM_WG_PEER_KEY_ENDPOINT "endpoint"
64​#define PNM_WG_PEER_KEY_PERSISTENT_KEEPALIVE "persistent-keepalive"
65​#define PNM_WG_PEER_KEY_PRESHARED_KEY "preshared-key"
66​#define PNM_WG_PEER_KEY_PRESHARED_KEY_FLAGS "preshared-key-flags"
67​#define PNM_WG_PEER_KEY_PUBLIC_KEY "public-key"
68​
69​// Keys for the NetworkManager configuration
70​#define PNM_SETTING_WIREGUARD_SETTING_NAME "wireguard"
71​
72​#define PNM_WG_KEY_FWMARK "fwmark"
73​#define PNM_WG_KEY_LISTEN_PORT "listen-port"
74​#define PNM_WG_KEY_PRIVATE_KEY "private-key"
75​#define PNM_WG_KEY_PRIVATE_KEY_FLAGS "private-key-flags"
76​
77​class WireGuardInterfaceWidget::Private
78​{
79​public:
80​ Private();
81​ ~Private();
82​
83​ Ui_WireGuardInterfaceProp ui;
84​ NetworkManager::WireGuardSetting::Ptr setting;
85​ KSharedConfigPtr config;
86​ QPalette warningPalette;
87​ QPalette normalPalette;
88​ WireGuardKeyValidator *keyValidator;
89​ QRegularExpressionValidator *fwmarkValidator;
90​ QIntValidator *mtuValidator;
91​ QIntValidator *portValidator;
92​ bool privateKeyValid;
93​ bool fwmarkValid;
94​ bool listenPortValid;
95​ bool peersValid;
96​ NMVariantMapList peers;
97​};
98​
99​WireGuardInterfaceWidget::Private::Private(void)
100​ : privateKeyValid(false)
101​ , fwmarkValid(true)
102​ , listenPortValid(true)
103​ , peersValid(false)
104​{
105​}
106​
107​WireGuardInterfaceWidget::Private::~Private()
108​{
109​ delete keyValidator;
110​ delete fwmarkValidator;
111​ delete mtuValidator;
112​ delete portValidator;
113​}
114​
115​WireGuardInterfaceWidget::WireGuardInterfaceWidget(const NetworkManager::Setting::Ptr &setting, QWidget *parent, Qt::WindowFlags f)
jgrulichUnsubmitted
Done

Coding style.

Should be:

WireGuardInterfaceWidget::WireGuardInterfaceWidget(const NetworkManager::Setting::Ptr &setting, QWidget* parent, Qt::WindowFlags f)
    : SettingWidget(setting, parent, f)
    , d(new Private)
jgrulich: Coding style. Should be: ``` WireGuardInterfaceWidget::WireGuardInterfaceWidget(const…
116​ : SettingWidget(setting, parent, f)
117​ , d(new Private)
118​{
119​ d->ui.setupUi(this);
120​ d->setting = setting.staticCast<NetworkManager::WireGuardSetting>();
121​ d->config = KSharedConfig::openConfig();
122​ d->warningPalette = KColorScheme::createApplicationPalette(d->config);
123​ d->normalPalette = KColorScheme::createApplicationPalette(d->config);
124​ KColorScheme::adjustBackground(d->warningPalette, KColorScheme::NegativeBackground, QPalette::Base,
125​ KColorScheme::ColorSet::View, d->config);
126​
127​ KColorScheme::adjustBackground(d->normalPalette, KColorScheme::NormalBackground, QPalette::Base,
128​ KColorScheme::ColorSet::View, d->config);
129​
130​ connect(d->ui.privateKeyLineEdit, &PasswordField::textChanged, this, &WireGuardInterfaceWidget::checkPrivateKeyValid);
131​ connect(d->ui.privateKeyLineEdit, &PasswordField::passwordOptionChanged, this, &WireGuardInterfaceWidget::checkPrivateKeyValid);
132​ connect(d->ui.fwmarkLineEdit, &QLineEdit::textChanged, this, &WireGuardInterfaceWidget::checkFwmarkValid);
133​ connect(d->ui.listenPortLineEdit, &QLineEdit::textChanged, this, &WireGuardInterfaceWidget::checkListenPortValid);
134​ connect(d->ui.btnPeers, &QPushButton::clicked, this, &WireGuardInterfaceWidget::showPeers);
135​
136​ d->ui.privateKeyLineEdit->setPasswordModeEnabled(true);
137​ d->ui.privateKeyLineEdit->setPasswordOptionsEnabled(true);
138​
139​ // This is done as a private variable rather than a local variable so it can be
140​ // used both here and to validate the private key later
141​ d->keyValidator = new WireGuardKeyValidator(this);
142​
143​ // Create validator for listen port
144​ d->portValidator = new QIntValidator(nullptr);
145​ d->portValidator->setBottom(0);
146​ d->portValidator->setTop(65535);
147​
148​ // Create a validator for the fwmark input. Acceptable
149​ // inputs are: "off" and numbers in either decimal
150​ // or hex (with 0x prefix)
151​ d->fwmarkValidator = new QRegularExpressionValidator(QRegularExpression("(off)|([0-9]{0,10})|(0x[0-9a-fA-F]{1,8})"));
152​ d->ui.fwmarkLineEdit->setValidator(d->fwmarkValidator);
153​
154​ // Create a validator for the MTU field.
155​ d->mtuValidator = new QIntValidator(nullptr);
156​ d->mtuValidator->setBottom(0);
157​ d->ui.mtuLineEdit->setValidator(d->mtuValidator);
158​
159​ // Default Peer Routes to true
160​ d->ui.peerRouteCheckBox->setChecked(true);
161​
162​ // Connect for setting check
163​ watchChangedSetting();
164​
165​ KAcceleratorManager::manage(this);
166​
167​ if (setting && !setting->isNull()) {
168​ loadConfig(d->setting);
169​ }
170​
171​ // Set the initial backgrounds on all the widgets
172​ checkPrivateKeyValid();
173​}
174​
175​WireGuardInterfaceWidget::~WireGuardInterfaceWidget()
176​{
177​ delete d;
178​}
179​
180​void WireGuardInterfaceWidget::loadConfig(const NetworkManager::Setting::Ptr &setting)
181​{
182​ NetworkManager::WireGuardSetting::Ptr wireGuardSetting = setting.staticCast<NetworkManager::WireGuardSetting>();
183​ d->ui.privateKeyLineEdit->setText(wireGuardSetting->privateKey());
jgrulichUnsubmitted
Done

I would preffer:

if (wireGuardSetting->listenPort() != 0)

It's more readable. Same for code below.

jgrulich: I would preffer: ``` if (wireGuardSetting->listenPort() != 0) ``` It's more readable. Same…
184​
185​ if (wireGuardSetting->listenPort() != 0)
186​ d->ui.listenPortLineEdit->setText(QString::number(wireGuardSetting->listenPort()));
187​ else
188​ d->ui.listenPortLineEdit->clear();
189​
190​ if (wireGuardSetting->fwmark() != 0)
191​ d->ui.fwmarkLineEdit->setText(QString::number(wireGuardSetting->fwmark()));
192​ else
193​ d->ui.fwmarkLineEdit->clear();
194​
195​ if (wireGuardSetting->mtu() != 0)
196​ d->ui.mtuLineEdit->setText(QString::number(wireGuardSetting->mtu()));
197​ else
198​ d->ui.mtuLineEdit->clear();
199​
200​ d->ui.peerRouteCheckBox->setChecked(wireGuardSetting->peerRoutes());
201​
202​ NetworkManager::Setting::SecretFlags type = wireGuardSetting->privateKeyFlags();
203​ switch (type) {
204​ case NetworkManager::Setting::AgentOwned:
205​ d->ui.privateKeyLineEdit->setPasswordOption(PasswordField::StoreForUser);
206​ break;
207​ case NetworkManager::Setting::None:
208​ d->ui.privateKeyLineEdit->setPasswordOption(PasswordField::StoreForAllUsers);
209​ break;
210​ // Not saved is not a valid option for the private key so set it to StoreForUser instead
211​ case NetworkManager::Setting::NotSaved:
212​ d->ui.privateKeyLineEdit->setPasswordOption(PasswordField::StoreForUser);
213​ break;
214​ case NetworkManager::Setting::NotRequired:
215​ d->ui.privateKeyLineEdit->setPasswordOption(PasswordField::NotRequired);
216​ break;
217​ }
218​
219​ d->peers = wireGuardSetting->peers();
220​ loadSecrets(setting);
221​}
222​
223​void WireGuardInterfaceWidget::loadSecrets(const NetworkManager::Setting::Ptr &setting)
224​{
225​ NetworkManager::WireGuardSetting::Ptr wireGuardSetting = setting.staticCast<NetworkManager::WireGuardSetting>();
226​ if (wireGuardSetting) {
227​ const QString key = wireGuardSetting->privateKey();
228​ if (!key.isEmpty())
229​ d->ui.privateKeyLineEdit->setText(key);
230​
231​ const NMVariantMapList peers = wireGuardSetting->peers();
232​ if (!peers.isEmpty()) {
233​ // For each of the peers returned, see if it contains a preshared key
234​ for (QList<QVariantMap>::const_iterator i = peers.cbegin(); i != peers.cend(); i++) {
235​ if (i->contains(PNM_WG_PEER_KEY_PRESHARED_KEY)) {
236​ // We have a preshared key so find the matching public key in the local peer list
237​ QString currentPublicKey = (*i)[PNM_WG_PEER_KEY_PUBLIC_KEY].toString();
238​ if (!currentPublicKey.isEmpty()) {
239​ for (QList<QVariantMap>::iterator j = d->peers.begin(); j != d->peers.end(); j++) {
240​ if ((*j)[PNM_WG_PEER_KEY_PUBLIC_KEY].toString() == currentPublicKey) {
241​ (*j)[PNM_WG_PEER_KEY_PRESHARED_KEY] = (*i)[PNM_WG_PEER_KEY_PRESHARED_KEY].toString();
242​ break;
243​ }
244​ }
245​ }
246​ }
247​ }
248​ }
249​ }
250​ // On the assumption that a saved configuration is valid (because how could it be saved if it
251​ // wasn't valid) then the peers section is valid unless it didn't get a preshared key if one
jgrulichUnsubmitted
Done

Remove empty line

jgrulich: Remove empty line
252​ // is required, so a simple minded "validity" check is done here. Real validity checks are done
253​ // when the peers widget is open which is the only time changes which might be invalid are
254​ // possible.
255​ d->peersValid = true;
256​ for (QList<QVariantMap>::iterator j = d->peers.begin(); j != d->peers.end(); j++) {
257​ if ((*j).contains(PNM_WG_PEER_KEY_PRESHARED_KEY_FLAGS)
258​ && (*j)[PNM_WG_PEER_KEY_PRESHARED_KEY_FLAGS] != NetworkManager::Setting::NotRequired
259​ && (!(*j).contains(PNM_WG_PEER_KEY_PRESHARED_KEY)
260​ || (*j)[PNM_WG_PEER_KEY_PRESHARED_KEY].toString().isEmpty())) {
261​ d->peersValid = false;
262​ break;
263​ }
264​ }
265​}
266​
267​QVariantMap WireGuardInterfaceWidget::setting() const
268​{
269​ NetworkManager::WireGuardSetting wgSetting;
270​ QString val = d->ui.fwmarkLineEdit->displayText();
271​
272​ if (!val.isEmpty())
273​ wgSetting.setFwmark(val.toUInt());
274​
275​ val = d->ui.listenPortLineEdit->displayText();
276​ if (!val.isEmpty())
277​ wgSetting.setListenPort(val.toUInt());
278​
279​ val = d->ui.mtuLineEdit->displayText();
280​ if (!val.isEmpty())
281​ wgSetting.setMtu(val.toUInt());
282​
283​ val = d->ui.privateKeyLineEdit->text();
284​ if (!val.isEmpty())
285​ wgSetting.setPrivateKey(val);
286​
287​ wgSetting.setPeerRoutes(d->ui.peerRouteCheckBox->isChecked());
288​
289​ PasswordField::PasswordOption option = d->ui.privateKeyLineEdit->passwordOption();
290​ switch (option) {
291​ case PasswordField::StoreForUser:
292​ wgSetting.setPrivateKeyFlags(NetworkManager::Setting::AgentOwned);
293​ break;
294​ case PasswordField::StoreForAllUsers:
295​ wgSetting.setPrivateKeyFlags(NetworkManager::Setting::None);
296​ break;
297​ // Always Ask is not a valid option for the private key so set it to AgentOwned instead
298​ case PasswordField::AlwaysAsk:
299​ wgSetting.setPrivateKeyFlags(NetworkManager::Setting::AgentOwned);
300​ break;
301​ case PasswordField::NotRequired:
302​ wgSetting.setPrivateKeyFlags(NetworkManager::Setting::NotRequired);
303​ break;
304​ }
305​ wgSetting.setPeers(d->peers);
306​ return wgSetting.toMap();
307​}
308​
309​bool WireGuardInterfaceWidget::isValid() const
310​{
311​ return d->privateKeyValid
312​ && d->fwmarkValid
313​ && d->listenPortValid
314​ && d->peersValid;
315​}
316​
317​void WireGuardInterfaceWidget::checkPrivateKeyValid()
318​{
319​ int pos = 0;
320​ PasswordField *widget = d->ui.privateKeyLineEdit;
321​ QString value = widget->text();
322​ bool valid = (QValidator::Acceptable == d->keyValidator->validate(value, pos));
323​ d->privateKeyValid = valid;
324​ setBackground(widget, valid);
325​ slotWidgetChanged();
326​}
327​void WireGuardInterfaceWidget::checkFwmarkValid()
328​{
329​ int pos = 0;
330​ QLineEdit *widget = d->ui.fwmarkLineEdit;
331​ QString value = widget->displayText();
332​ d->fwmarkValid = QValidator::Acceptable == widget->validator()->validate(value, pos)
333​ || value.isEmpty();
334​ setBackground(widget, d->fwmarkValid);
335​ slotWidgetChanged();
336​}
337​
338​void WireGuardInterfaceWidget::checkListenPortValid()
339​{
340​ int pos = 0;
341​ QLineEdit *widget = d->ui.listenPortLineEdit;
342​ QString value = widget->displayText();
343​ d->listenPortValid = QValidator::Acceptable == d->portValidator->validate(value, pos)
344​ || value.isEmpty();
345​ setBackground(widget, d->listenPortValid);
346​ slotWidgetChanged();
347​}
348​
349​void WireGuardInterfaceWidget::setBackground(QWidget *w, bool result) const
350​{
351​ if (result)
352​ w->setPalette(d->normalPalette);
353​ else
354​ w->setPalette(d->warningPalette);
355​}
356​
357​QString WireGuardInterfaceWidget::supportedFileExtensions()
358​{
359​ return "*.conf";
360​}
361​
362​void WireGuardInterfaceWidget::showPeers()
363​{
364​ QPointer<WireGuardTabWidget> peers = new WireGuardTabWidget(d->peers, this);
365​
366​ connect(peers.data(), &WireGuardTabWidget::accepted,
367​ [peers, this] () {
368​ NMVariantMapList peersData = peers->setting();
369​ if (!peersData.isEmpty()) {
370​ d->peers = peersData;
371​ // The peers widget won't allow "OK" to be hit
372​ // unless all the peers are valid so no need to check
373​ d->peersValid = true;
374​ slotWidgetChanged();
375​ }
376​ });
377​ connect(peers.data(), &WireGuardTabWidget::finished,
378​ [peers] () {
379​ if (peers) {
380​ peers->deleteLater();
381​ }
382​ });
383​ peers->setModal(true);
384​ peers->show();
385​}
386​
387​NMVariantMapMap WireGuardInterfaceWidget::importConnectionSettings(const QString &fileName)
388​{
389​ NMVariantMapMap result;
390​
391​ QFile impFile(fileName);
392​ QList<NetworkManager::IpAddress> ipv4AddressList;
393​ QList<NetworkManager::IpAddress> ipv6AddressList;
394​
395​ if (!impFile.open(QFile::ReadOnly|QFile::Text)) {
396​ return result;
397​ }
398​
399​ const QString connectionName = QFileInfo(fileName).completeBaseName();
400​ NMStringMap dataMap;
401​ NMVariantMapList peers;
402​ QVariantMap ipv4Data;
403​ QVariantMap *currentPeer = nullptr;
404​ WireGuardKeyValidator keyValidator(nullptr);
405​ NetworkManager::Ipv4Setting ipv4Setting;
406​ NetworkManager::Ipv6Setting ipv6Setting;
407​ NetworkManager::WireGuardSetting wgSetting;
408​
409​ QString proxyType;
410​ QString proxyUser;
411​ QString proxyPasswd;
412​ bool havePrivateKey = false;
413​ bool haveIpv4Setting = false;
414​ bool haveIpv6Setting = false;
415​ // Set the "PEER" elements true because they
416​ // need to be true to allocate the
417​ // first [Peer] section below
418​ bool havePublicKey = true;
419​ bool haveAllowedIps = true;
420​ int pos = 0;
421​
422​ QTextStream in(&impFile);
423​ enum {IDLE, INTERFACE_SECTION, PEER_SECTION} currentState = IDLE;
424​
425​ ipv4Setting.setMethod(NetworkManager::Ipv4Setting::Disabled);
jgrulichUnsubmitted
Done

Coding style. The "else if" should be on the same line as the "}" bracket.

jgrulich: Coding style. The "else if" should be on the same line as the "}" bracket.
426​ ipv6Setting.setMethod(NetworkManager::Ipv6Setting::Ignored);
427​
428​ while (!in.atEnd()) {
429​ QStringList keyValue;
430​ QString line = in.readLine();
431​
432​ // Remove comments starting with '#'
433​ if (int index = line.indexOf('#') > 0)
434​ line.truncate(index);
435​
436​ // Ignore blank lines
437​ if (line.isEmpty())
438​ continue;
439​
440​ keyValue.clear();
441​ keyValue << line.split('=');
442​
443​ if (keyValue[0] == PNM_WG_CONF_TAG_INTERFACE) {
444​ currentState = INTERFACE_SECTION;
445​ continue;
446​ } else if (keyValue[0] == PNM_WG_CONF_TAG_PEER) {
447​ // Check to make sure the previous PEER section has
448​ // all the required elements. If not it's an error
449​ // so just return the empty result.
450​ if (!havePublicKey || !haveAllowedIps) {
451​ return result;
452​ } else {
453​ havePublicKey = false;
454​ haveAllowedIps = false;
455​ currentState = PEER_SECTION;
456​ peers.append(*(new QVariantMap));
457​ currentPeer = &peers[peers.size() - 1];
458​ continue;
459​ }
460​ }
461​
462​ // If we didn't get an '=' sign in the line, it's probably an error but
463​ // we're going to treat it as a comment and ignore it
464​ if (keyValue.length() < 2)
465​ continue;
466​
467​ QString key = keyValue[0].trimmed();
468​
469​ // If we are in the [Interface] section look for the possible tags
470​ if (currentState == INTERFACE_SECTION) {
471​ // Address
472​ if (key == PNM_WG_CONF_TAG_ADDRESS) {
473​ QStringList valueList = keyValue[1].split(',');
474​ if (valueList.isEmpty())
475​ return result;
476​
477​ for (const QString &address : valueList) {
478​ const QPair<QHostAddress, int> addressIn = QHostAddress::parseSubnet(address.trimmed());
479​ NetworkManager::IpAddress *addr = new NetworkManager::IpAddress;
480​ addr->setIp(addressIn.first);
481​ addr->setPrefixLength(addressIn.second);
482​ if (addressIn.first.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol) {
483​ ipv4AddressList.append(*addr);
jgrulichUnsubmitted
Done

Same here and below.

jgrulich: Same here and below.
484​ } else if (addressIn.first.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv6Protocol) {
485​ ipv6AddressList.append(*addr);
486​ } else { // Error condition
487​ return result;
488​ }
489​ }
490​ if (!ipv4AddressList.isEmpty()) {
491​ ipv4Setting.setAddresses(ipv4AddressList);
492​ ipv4Setting.setMethod(NetworkManager::Ipv4Setting::Manual);
493​ haveIpv4Setting = true;
494​ }
495​ if (!ipv6AddressList.isEmpty()) {
496​ ipv6Setting.setAddresses(ipv6AddressList);
497​ ipv6Setting.setMethod(NetworkManager::Ipv6Setting::Manual);
498​ haveIpv6Setting = true;
499​ }
500​ }
501​
502​ // Listen Port
503​ else if (key == PNM_WG_CONF_TAG_LISTEN_PORT) {
504​ uint val = keyValue[1].toUInt();
505​ if (val <= 65535)
506​ wgSetting.setListenPort(val);
507​ } else if (key == PNM_WG_CONF_TAG_PRIVATE_KEY) {
508​ QString val = keyValue[1].trimmed();
509​ // WireGuard keys present a slight problem because they
510​ // must end in '=' which is removed during the 'split' above
511​ // so if there are 3 parts and the 3 is empty, there must
512​ // have been an '=' so add it back on
513​ if (keyValue.size() == 3 && keyValue[2].isEmpty())
514​ val += "=";
515​ if (QValidator::Acceptable == keyValidator.validate(val, pos)) {
516​ wgSetting.setPrivateKey(val);
517​ havePrivateKey = true;
518​ }
519​ } else if (key == PNM_WG_CONF_TAG_DNS) {
520​ QStringList addressList = keyValue[1].split(',');
521​ QList<QHostAddress> ipv4DnsList;
522​ QList<QHostAddress> ipv6DnsList;
523​ if (!addressList.isEmpty()) {
524​ for (const QString &address : addressList) {
525​ const QPair<QHostAddress, int> addressIn = QHostAddress::parseSubnet(address.trimmed());
526​ if (addressIn.first.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol) {
527​ ipv4DnsList.append(addressIn.first);
528​ } else if (addressIn.first.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv6Protocol) {
529​ ipv6DnsList.append(addressIn.first);
530​ } else { // Error condition
531​ return result;
532​ }
533​ }
534​ }
535​
536​ // If there are any addresses put them on the correct tab and set the "method" to
537​ // "Automatic (Only addresses)" by setting "ignore-auto-dns=true"
538​ if (!ipv4DnsList.isEmpty()) {
539​ if (ipv4Setting.method() == NetworkManager::Ipv4Setting::Disabled)
540​ ipv4Setting.setMethod(NetworkManager::Ipv4Setting::Automatic);
541​ ipv4Setting.setIgnoreAutoDns(true);
542​ ipv4Setting.setDns(ipv4DnsList);
543​ haveIpv4Setting = true;
544​ }
545​
546​ if (!ipv6DnsList.isEmpty()) {
547​ ipv6Setting.setMethod(NetworkManager::Ipv6Setting::Automatic);
548​ ipv6Setting.setIgnoreAutoDns(true);
549​ ipv6Setting.setDns(ipv6DnsList);
550​ haveIpv6Setting = true;
551​ }
552​ } else if (key == PNM_WG_CONF_TAG_MTU) {
553​ uint val = keyValue[1].toUInt();
554​ if (val > 0)
555​ wgSetting.setMtu(val);
556​ } else if (key == PNM_WG_CONF_TAG_FWMARK) {
557​ uint val;
558​ if (keyValue[1].trimmed().toLower() == QLatin1String("off"))
559​ val = 0;
560​ else
561​ val = keyValue[1].toUInt();
562​ wgSetting.setFwmark(val);
563​ } else if (key == PNM_WG_CONF_TAG_TABLE
564​ || key == PNM_WG_CONF_TAG_PRE_UP
565​ || key == PNM_WG_CONF_TAG_POST_UP
566​ || key == PNM_WG_CONF_TAG_PRE_DOWN
567​ || key == PNM_WG_CONF_TAG_POST_DOWN) {
568​ // plasma-nm does not handle these items
569​ } else {
jgrulichUnsubmitted
Done

The "{" bracket should be on the same line as the "else if". Same below.

jgrulich: The "{" bracket should be on the same line as the "else if". Same below.
570​ // We got a wrong field in the Interface section so it
571​ // is an error
572​ break;
573​ }
574​ } else if (currentState == PEER_SECTION) {
575​ // Public Key
576​ if (key == PNM_WG_CONF_TAG_PUBLIC_KEY) {
577​ QString val = keyValue[1].trimmed();
578​ // WireGuard keys present a slight problem because they
579​ // must end in '=' which is removed during the 'split' above
580​ // so if there are 3 parts and the 3 is empty, there must
581​ // have been an '=' so add it back on
582​ if (keyValue.size() == 3 && keyValue[2].isEmpty())
583​ val += "=";
584​
585​ if (QValidator::Acceptable == keyValidator.validate(val, pos)) {
586​ currentPeer->insert(PNM_WG_PEER_KEY_PUBLIC_KEY, val);
587​ havePublicKey = true;
588​ }
589​ } else if (key == PNM_WG_CONF_TAG_ALLOWED_IPS) {
590​ SimpleIpListValidator validator(nullptr, SimpleIpListValidator::WithCidr, SimpleIpListValidator::Both);
591​ QString val = keyValue[1].trimmed();
592​ if (QValidator::Acceptable == validator.validate(val, pos))
593​ {
594​ QStringList valList = val.split(',');
595​ for (QString& str : valList)
596​ str = str.trimmed();
597​ currentPeer->insert(PNM_WG_PEER_KEY_ALLOWED_IPS, valList);
598​ haveAllowedIps = true;
599​ }
600​ } else if (key == PNM_WG_CONF_TAG_ENDPOINT) {
601​ if (keyValue[1].length() > 0)
602​ currentPeer->insert(PNM_WG_PEER_KEY_ENDPOINT, keyValue[1].trimmed());
603​ } else if (key == PNM_WG_CONF_TAG_PRESHARED_KEY) {
604​ QString val = keyValue[1].trimmed();
605​ // WireGuard keys present a slight problem because they
606​ // must end in '=' which is removed during the 'split' above
607​ // so if there are 3 parts and the 3 is empty, there must
608​ // have been an '=' so add it back on
609​ if (keyValue.size() == 3 && keyValue[2].isEmpty())
610​ val += "=";
611​
612​ if (QValidator::Acceptable == keyValidator.validate(val, pos)) {
613​ currentPeer->insert(PNM_WG_PEER_KEY_PRESHARED_KEY, val);
614​ }
615​ }
616​ } else {
617​ return result;
618​ }
619​ }
620​ if (!havePrivateKey || !haveAllowedIps || !havePublicKey || !haveAllowedIps)
621​ return result;
jgrulichUnsubmitted
Done

The "{" bracket should be on the same line with the "if"

jgrulich: The "{" bracket should be on the same line with the "if"
622​
623​ QVariantMap conn;
624​ wgSetting.setPeers(peers);
625​ conn.insert("id", connectionName);
626​ conn.insert("interface-name", connectionName);
627​ conn.insert("type", "wireguard");
628​ conn.insert("autoconnect", "false");
629​ result.insert("connection", conn);
630​ result.insert("wireguard", wgSetting.toMap());
631​ if (haveIpv4Setting)
632​ result.insert("ipv4", ipv4Setting.toMap());
633​ if (haveIpv6Setting)
634​ result.insert("ipv6", ipv6Setting.toMap());
jgrulichUnsubmitted
Done

Please remove

jgrulich: Please remove
635​
636​ impFile.close();
637​ return result;
638​}