IfIndex from snmp is usually a string, cast inside function

Author: murrant

LibreNMS/Cache/Port.php

@@ -41,7 +41,7 @@ public function get(int $port_id): ?\App\Models\Port
      * Get a port from an ifIndex.
      * Must be constrained to a device, when $device is null, use primary device
      */
-    public function getByIfIndex(int $ifIndex, \App\Models\Device|int|null $device = null): ?\App\Models\Port
+    public function getByIfIndex(int|string|null $ifIndex, \App\Models\Device|int|null $device = null): ?\App\Models\Port
     {
         return $this->get((int) $this->getIdFromIfIndex($ifIndex, $device));
     }
@@ -59,9 +59,10 @@ public function getByIfName(string $ifName, \App\Models\Device|int|null $device
      * Get a port_id from an ifIndex.
      * Must be constrained to a device, when $device is null, use primary device
      */
-    public function getIdFromIfIndex(int $ifIndex, \App\Models\Device|int|null $device = null): ?int
+    public function getIdFromIfIndex(int|string|null $ifIndex, \App\Models\Device|int|null $device = null): ?int
     {
         $device_id = $this->deviceToId($device);
+        $ifIndex = (int) $ifIndex;
 
         if (! array_key_exists($device_id, $this->ifIndexMaps)) {
             $this->ifIndexMaps[$device_id] = \App\Models\Port::where('device_id', $device_id)->pluck('port_id', 'ifIndex')->all();

LibreNMS/OS/Shared/Cisco.php

@@ -470,7 +470,7 @@ public function pollNac()
                 $mac_address = Mac::parse($portAuthSessionEntryParameters['cafSessionClientMacAddress'])->hex();
 
                 $nac->put($mac_address, new PortsNac([
-                    'port_id' => (int) PortCache::getIdFromIfIndex((int) $ifIndex, $this->getDevice()),
+                    'port_id' => (int) PortCache::getIdFromIfIndex($ifIndex, $this->getDevice()),
                     'mac_address' => $mac_address,
                     'auth_id' => $auth_id,
                     'domain' => $portAuthSessionEntryParameters['cafSessionDomain'] ?? '',
@@ -696,7 +696,7 @@ public function discoverTransceivers(): Collection
             $ifIndex = $ent['ifIndex'] ?? null;
 
             return new Transceiver([
-                'port_id' => (int) PortCache::getIdFromIfIndex((int) $ifIndex, $this->getDevice()),
+                'port_id' => (int) PortCache::getIdFromIfIndex($ifIndex, $this->getDevice()),
                 'index' => $index,
                 'type' => $ent['entPhysicalDescr'] ?? null,
                 'vendor' => $ent['entPhysicalMfgName'] ?? null,
@@ -784,7 +784,7 @@ public function discoverQos(): Collection
 
                 $qos->push(new Qos([
                     'device_id' => $this->getDeviceId(),
-                    'port_id' => $parent ? null : PortCache::getIdFromIfIndex((int) $servicePolicies[$policyId]['cbQosIfIndex'], $this->getDevice()),
+                    'port_id' => $parent ? null : PortCache::getIdFromIfIndex($servicePolicies[$policyId]['cbQosIfIndex'], $this->getDevice()),
                     'type' => $dbtype,
                     'title' => $title,
                     'tooltip' => $tooltip,

includes/html/pages/device/edit/snmp.inc.php

@@ -38,7 +38,7 @@
             $device->features = null;
             $device->hardware = $_POST['hardware'];
             $device->icon = null;
-            $device->os = $_POST['os'] ? $_POST['os_id'] : 'ping';
+            $device->os = $_POST['os'] ? strip_tags($_POST['os_id']) : 'ping';
             $device->snmp_disable = 1;
             $device->sysName = $_POST['sysName'] ?: null;
             $device->version = null;
@@ -211,7 +211,7 @@
     <label for='os' class='col-sm-2 control-label'>OS (optional)</label>
     <div class='col-sm-4'>
     <input id='os' class='form-control' name='os' value='" . htmlspecialchars(Config::get("os.{$device->os}.text")) . "'/>
-    <input type='hidden' id='os_id' class='form-control' name='os_id' value='" . $device->os . "'/>
+    <input type='hidden' id='os_id' class='form-control' name='os_id' value='" . htmlspecialchars($string)->os . "'/>
     </div>
     </div>
     </div>