From a18406fade9fb627dbb353825ece6d8eba437991 Mon Sep 17 00:00:00 2001
From: Stephan de Wit <stephan.de.wit@deciso.com>
Date: Thu, 27 Jul 2023 10:49:05 +0200
Subject: [PATCH] dhcp: interface description might not exist

---
 .../controllers/OPNsense/DHCPv4/Api/LeasesController.php    | 6 +++---
 .../controllers/OPNsense/DHCPv6/Api/LeasesController.php    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php
index 508c81e86..92c976222 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php
@@ -137,14 +137,14 @@ class LeasesController extends ApiControllerBase
                 $if = $config->interfaces->{$lease['if']};
                 if (!empty((string)$if->ipaddr)) {
                     $intf = $lease['if'];
-                    $intf_descr = (string)$if->descr;
+                    $intf_descr = (string)$if->descr ?: strtoupper($intf);
                 }
             } else {
                 /* interface not known, check range */
                 foreach ($if_ranges as $if_name => $if_range) {
                     if (!empty($lease['address']) && Util::isIPInCIDR($lease['address'], $if_range)) {
                         $intf = $if_name;
-                        $intf_descr = (string)$config->interfaces->$if_name->descr;
+                        $intf_descr = (string)$config->interfaces->$if_name->descr ?: strtoupper($if_name);
                         break;
                     }
                 }
@@ -153,7 +153,7 @@ class LeasesController extends ApiControllerBase
             $leases[$idx]['if'] = $intf;
             $leases[$idx]['if_descr'] = $intf_descr;
 
-            if (!empty($intf) && !array_key_exists($intf, $interfaces)) {
+            if (!empty($intf_descr) && !array_key_exists($intf, $interfaces)) {
                 $interfaces[$intf] = $intf_descr;
             }
         }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php
index f4e492e3c..3861894d5 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php
@@ -170,13 +170,13 @@ class LeasesController extends ApiControllerBase
                 $if = $config->interfaces->{$lease['if']};
                 if (!empty((string)$if->ipaddrv6) && Util::isIpAddress((string)$if->ipaddrv6)) {
                     $intf = $lease['if'];
-                    $intf_descr = (string)$if->descr;
+                    $intf_descr = (string)$if->descr ?: strtoupper($intf);
                 }
             } else {
                 foreach ($if_ranges as $if_name => $if_range) {
                     if (!empty($lease['address']) && Util::isIPInCIDR($lease['address'], $if_range)) {
                         $intf = $if_name;
-                        $intf_descr = (string)$config->interfaces->$if_name->descr;
+                        $intf_descr = (string)$config->interfaces->$if_name->descr ?: strtoupper($if_name);
                         break;
                     }
                 }
@@ -185,7 +185,7 @@ class LeasesController extends ApiControllerBase
             $leases[$idx]['if'] = $intf;
             $leases[$idx]['if_descr'] = $intf_descr;
 
-            if (!empty($intf) && !array_key_exists($intf, $interfaces)) {
+            if (!empty($intf_descr) && !array_key_exists($intf, $interfaces)) {
                 $interfaces[$intf] = $intf_descr;
             }
         }