From 53896e6361e2e90df6f45336ca9995225081f313 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 22 May 2026 10:34:09 +0200 Subject: [PATCH] security/netbird: sync with master --- security/netbird/Makefile | 2 +- security/netbird/pkg-descr | 1 + .../OPNsense/Netbird/Api/AuthenticationController.php | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/security/netbird/Makefile b/security/netbird/Makefile index 68e48360d..daad61986 100644 --- a/security/netbird/Makefile +++ b/security/netbird/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= netbird PLUGIN_VERSION= 1.3 -PLUGIN_REVISION= 1 +PLUGIN_REVISION= 2 PLUGIN_DEPENDS= netbird PLUGIN_COMMENT= Peer-to-peer VPN that seamlessly connects your devices PLUGIN_MAINTAINER= dev@netbird.io diff --git a/security/netbird/pkg-descr b/security/netbird/pkg-descr index 6c5a02adb..81a12a7ac 100644 --- a/security/netbird/pkg-descr +++ b/security/netbird/pkg-descr @@ -24,3 +24,4 @@ Plugin Changelog * Added netbird_devices() so that wt0 is a volatile interface (contributed by Myah Mitchell) * Added IP Mapping option and authentication banner (contributed by Konstantinos Spartalis) +* Fix setupKey usage after UpdateOnlyTextField introduction diff --git a/security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/AuthenticationController.php b/security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/AuthenticationController.php index 1e75efa08..55daf590c 100644 --- a/security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/AuthenticationController.php +++ b/security/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/AuthenticationController.php @@ -77,10 +77,12 @@ class AuthenticationController extends ApiMutableModelControllerBase $backend->configdRun("netbird down"); } - $managementUrl = $mdl->managementUrl->__toString(); - $setupKey = $mdl->setupKey->__toString(); - $result = $backend->configdpRun("netbird up-setup-key", array($managementUrl, $setupKey)); + $result = $backend->configdpRun('netbird up-setup-key', [ + $mdl->managementUrl->getValue(), + $mdl->setupKey->getValue() + ]); + return ['result' => trim($result)]; }