netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

net/wireguard - minor regression in addClient, not adding created uuid. closes https://github.com/opnsense/plugins/issues/3663

Browse Source
This commit is contained in:
Ad Schellevis
2023-11-10 18:46:37 +01:00
parent 07133a134a
commit 47ccdcc078
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/wireguard/Makefile
+1
View File
@@ -1,5 +1,6 @@
PLUGIN_NAME= wireguard
PLUGIN_VERSION= 2.5
PLUGIN_REVISION= 1
PLUGIN_COMMENT= WireGuard VPN service kernel implementation
PLUGIN_DEPENDS= wireguard-kmod
PLUGIN_CONFLICTS= wireguard-go
net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ClientController.php
+7 -1
View File
@@ -73,6 +73,7 @@ class ClientController extends ApiMutableModelControllerBase
public function setClientAction($uuid)
{
$add_uuid = null;
if (!empty($this->request->getPost(static::$internalModelName)) && $this->request->isPost()) {
$servers = [];
if (!empty($this->request->getPost(static::$internalModelName)['servers'])) {
@@ -83,6 +84,7 @@ class ClientController extends ApiMutableModelControllerBase
if (empty($uuid)) {
// add new client, generate uuid
$uuid = $mdl->servers->generateUUID();
$add_uuid = $uuid;
}
foreach ($mdl->servers->server->iterateItems() as $key => $node) {
$peers = array_filter(explode(',', (string)$node->peers));
@@ -99,7 +101,11 @@ class ClientController extends ApiMutableModelControllerBase
*/
$mdl->serializeToConfig(false, true);
}
return $this->setBase('client', 'clients.client', $uuid);
$result = $this->setBase('client', 'clients.client', $uuid);
if (!empty($add_uuid) && $result['result'] == 'saved') {
$result['uuid'] = $add_uuid;
}
return $result;
}
public function toggleClientAction($uuid)