Updated Global search to include FDB data and other small improvements (librenms#20104)

Author: laf

app/Http/Controllers/Ajax/Search/DevicesSearchController.php

@@ -23,6 +23,8 @@ protected function groups(string $search, string $like, int $limit, ?User $user)
                 ->orWhere('serial', 'like', $like)
                 ->orWhere('notes', 'like', $like);
 
+            $mac = strtolower(str_replace([':', '-'], '', $search));
+
             if (preg_match('/^[0-9.]+$/', $search) && str_contains($search, '.')) {
                 $query->leftJoin('ports', 'ports.device_id', '=', 'devices.device_id')
                     ->leftJoin('ipv4_addresses', 'ipv4_addresses.port_id', '=', 'ports.port_id');
@@ -35,15 +37,22 @@ protected function groups(string $search, string $like, int $limit, ?User $user)
                 $query->leftJoin('ports', 'ports.device_id', '=', 'devices.device_id')
                     ->leftJoin('ipv6_addresses', 'ipv6_addresses.port_id', '=', 'ports.port_id');
                 $q->orWhere('ipv6_addresses.ipv6_address', 'like', $like)
+                    ->orWhere('ipv6_addresses.ipv6_compressed', 'like', $like)
                     ->orWhere('overwrite_ip', 'like', $like)
-                    ->orWhere('ports.ifPhysAddress', 'like', '%' . str_replace(':', '', $search) . '%');
+                    ->orWhere('ports.ifPhysAddress', 'like', '%' . $mac . '%');
                 if (\LibreNMS\Util\IPv6::isValid($search, false)) {
                     $q->orWhere('ip', '=', inet_pton($search));
                 }
-            } elseif (ctype_xdigit($mac = str_replace([':', '-'], '', $search))) {
+            } elseif (ctype_xdigit($mac)) {
                 $query->leftJoin('ports', 'ports.device_id', '=', 'devices.device_id');
                 $q->orWhere('ports.ifPhysAddress', 'like', '%' . $mac . '%');
             }
+
+            // A MAC-style search (with or without separators) can also match FDB entries
+            if (ctype_xdigit($mac)) {
+                $query->leftJoin('ports_fdb', 'ports_fdb.device_id', '=', 'devices.device_id');
+                $q->orWhere('ports_fdb.mac_address', 'like', '%' . $mac . '%');
+            }
         });
 
         $devices = $query->orderBy('display')->limit($limit)->get()