From c0fe840fd18b7bcc4e7c5054658b150d75c3f2aa Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 14 Dec 2022 19:58:59 +0100
Subject: [PATCH] VPN/IPsec new MVC module -  hook MVC descriptions in
 VPN->IPsec->Status Overview

---
 .../OPNsense/IPsec/Api/SessionsController.php | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/IPsec/Api/SessionsController.php b/src/opnsense/mvc/app/controllers/OPNsense/IPsec/Api/SessionsController.php
index da01194cf..d5a92815b 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/IPsec/Api/SessionsController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/IPsec/Api/SessionsController.php
@@ -31,6 +31,8 @@ namespace OPNsense\IPsec\Api;
 use OPNsense\Base\ApiControllerBase;
 use OPNsense\Core\Backend;
 use OPNsense\Core\Config;
+use OPNsense\IPsec\Swanctl;
+
 
 /**
  * Class SessionsController
@@ -57,18 +59,25 @@ class SessionsController extends ApiControllerBase
         if (!empty($config->ipsec->phase1)) {
             foreach ($config->ipsec->phase1 as $p1) {
                 if (!empty((string)$p1->ikeid)) {
-                    $phase1s[(string)$p1->ikeid] = $p1;
+                    $phase1s[(string)$p1->ikeid] = (string)$p1->descr;
                 }
             }
         }
+        foreach ((new Swanctl())->Connections->Connection->iterateItems() as $node_uuid => $node) {
+            $phase1s[(string)$node_uuid] = (string)$node->description;
+        }
         if (!empty($data)) {
             foreach ($data as $conn => $payload) {
                 $record = $payload;
-                $record['ikeid'] = substr(explode('-', $conn)[0], 3);
+                if (preg_match('/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/',$conn) == 1) {
+                    $record['ikeid'] = $conn;
+                } else {
+                    $record['ikeid'] = substr(explode('-', $conn)[0], 3);
+                }
                 $record['phase1desc'] = null;
                 $record['name'] = $conn;
                 if (!empty($phase1s[$record['ikeid']])) {
-                    $record['phase1desc'] = (string)$phase1s[$record['ikeid']]->descr;
+                    $record['phase1desc'] = $phase1s[$record['ikeid']];
                 }
                 $record['connected'] = !empty($record['sas']);
                 unset($record['children']);
@@ -95,12 +104,20 @@ class SessionsController extends ApiControllerBase
             foreach ($config->ipsec->phase2 as $p2) {
                 if (!empty((string)$p2->reqid)) {
                     $reqids[(string)$p2->reqid] = [
-                        "ikeid" => (string)$p2->ikeid,
-                        "phase2desc" => (string)$p2->descr
+                        'ikeid' => (string)$p2->ikeid,
+                        'phase2desc' => (string)$p2->descr
                     ];
                 }
             }
         }
+
+        $phase2s = [];
+        foreach ((new Swanctl())->children->child->iterateItems() as $node_uuid => $node) {
+            $phase2s[(string)$node_uuid] = [
+                'ikeid' => (string)$node->connection,
+                'phase2desc' => (string)$node->description
+            ];
+        }
         if (!empty($data[$selected_conn]) && !empty($data[$selected_conn]['sas'])) {
             foreach ($data[$selected_conn]['sas'] as $sa) {
                 if (!empty($sa['child-sas'])) {
@@ -109,6 +126,8 @@ class SessionsController extends ApiControllerBase
                         $record['remote-host'] = $sa['remote-host'];
                         if (!empty($reqids[$csa['reqid']])) {
                             $record = array_merge($record, $reqids[$csa['reqid']]);
+                        } elseif (!empty($phase2s[$csa['name']])) {
+                            $record = array_merge($record, $phase2s[$csa['name']]);
                         }
                         foreach ($record as $key => $val) {
                             if (is_array($val)) {