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

VPN: WireGuard - hook wireguard empty devices during bootup, using wireguard_devices() plugin system. This should make sure services and components, such as the firewall, are able to use the device before being setup. closes https://github.com/opnsense/core/issues/6909

Browse Source 
A minor modification was needed in wg-service-control.php to make sure a configure would be executed if wgX exists without configuration
This commit is contained in:
Ad Schellevis
2023-10-04 18:23:25 +02:00
parent 07b652f22c
commit a7a94cce56
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/wireguard/src/etc/inc/plugins.inc.d/wireguard.inc
+24 -1
View File
@@ -100,7 +100,30 @@ function wireguard_xmlrpc_sync()
function wireguard_devices()
{
return [['pattern' => '^wg', 'volatile' => true]];
$names = [];
foreach ((new OPNsense\Wireguard\Server())->servers->server->iterateItems() as $key => $node) {
if (!empty((string)$node->enabled)) {
$names[(string)$node->interface] = [
'descr' => sprintf('%s (Wireguard - %s)', (string)$node->interface, (string)$node->name),
'ifdescr' => (string)$node->name,
'name' => (string)$node->interface
];
}
}
return [[
'function' => 'wireguard_prepare', /* XXX only (empty) device creation */
'configurable' => false,
'pattern' => '^wg',
'type' => 'wireguard',
'volatile' => true,
'names' => $names,
]];
}
function wireguard_prepare($device)
{
mwexecf('/sbin/ifconfig wg create name %s', $device);
mwexecf('/sbin/ifconfig %s group wireguard', $device);
}
function wireguard_configure()
net/wireguard/src/opnsense/scripts/Wireguard/wg-service-control.php
+5 -1
View File
@@ -225,7 +225,11 @@ if (isset($opts['h']) || empty($args) || !in_array($args[0], ['start', 'stop', '
case 'configure':
if (
@md5_file($node->cnfFilename) != get_stat_hash($statHandle)['file'] ||
!isset($ifdetails[(string)$node->interface])
!isset($ifdetails[(string)$node->interface]) || (
// Interface has been setup, but without configuration
empty($ifdetails[(string)$node->interface]['ipv4']) &&
empty($ifdetails[(string)$node->interface]['ipv6'])
)
) {
if (get_stat_hash($statHandle)['interface'] != wg_reconfigure_hash($node)) {
// Fluent reloading not supported for this instance, make sure the user is informed