lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

VPN: WireGuard: Status - show proper name when public keys overlap between instances. closes https://github.com/opnsense/core/issues/7265

Browse Source 
With this commit, each peer is identified by its interface name and its public key
This commit is contained in:
Ad Schellevis 2024-03-16 09:42:29 +01:00
parent 8071c278e1
commit 15e477393f
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php
View File

@ -72,20 +72,29 @@ class ServiceController extends ApiMutableServiceControllerBase
{
$payload = json_decode((new Backend())->configdRun("wireguard show") ?? '', true);
$records = !empty($payload) && !empty($payload['records']) ? $payload['records'] : [];
$key_descriptions = [];
$ifnames = [];
$key_descriptions = []; /* descriptions per interface + pub-key */
$ifnames = []; /* interface / instance names */
$peers = [];
foreach ((new Client())->clients->client->iterateItems() as $key => $client) {
$key_descriptions[(string)$client->pubkey] = (string)$client->name;
$peers[$key] = ['name' => (string)$client->name , 'pubkey' => (string)$client->pubkey];
}
foreach ((new Server())->servers->server->iterateItems() as $key => $server) {
$key_descriptions[(string)$server->pubkey] = (string)$server->name;
$ifnames[(string)$server->interface] = (string)$server->name;
$if = (string)$server->interface;
$key_descriptions[$if . '-' . $server->pubkey] = (string)$server->name;
foreach (explode(',', (string)$server->peers) as $peer) {
if (!empty($peers[$peer])) {
$key_descriptions[$if . '-' . $peers[$peer]['pubkey']] = $peers[$peer]['name'];
}
}
$ifnames[$if] = (string)$server->name;
}
foreach ($records as &$record) {
if (!empty($record['public-key']) && !empty($key_descriptions[$record['public-key']])) {
$record['name'] = $key_descriptions[$record['public-key']];
} else {
$record['name'] = '';
$record['name'] = '';
if (!empty($record['public-key'])) {
$key = $record['if'] . '-' . $record['public-key'];
if (!empty($key_descriptions[$key])) {
$record['name'] = $key_descriptions[$key];
}
}
$record['ifname'] = $ifnames[$record['if']];
}