Explorar o código

Fixes #2492: Sanitize hostname and port values returned through LLDP

Jeremy Stretch %!s(int64=7) %!d(string=hai) anos
pai
achega
44d3606ce1
Modificáronse 1 ficheiros con 4 adicións e 2 borrados
  1. 4 2
      netbox/templates/dcim/device_lldp_neighbors.html

+ 4 - 2
netbox/templates/dcim/device_lldp_neighbors.html

@@ -64,8 +64,10 @@ $(document).ready(function() {
                 }
                 }
 
 
                 // Clean up hostnames/interfaces learned via LLDP
                 // Clean up hostnames/interfaces learned via LLDP
-                var lldp_device = neighbor['hostname'].split(".")[0];  // Strip off any trailing domain name
-                var lldp_interface = neighbor['port'].split(".")[0];   // Strip off any trailing subinterface ID
+                var neighbor_host = neighbor['hostname'] || ""; // sanitize hostname if it's null to avoid breaking the split func
+                var neighbor_port = neighbor['port'] || ""; // sanitize port if it's null to avoid breaking the split func
+                var lldp_device = neighbor_host.split(".")[0];  // Strip off any trailing domain name
+                var lldp_interface = neighbor_port.split(".")[0];   // Strip off any trailing subinterface ID
 
 
                 // Add LLDP neighbors to table
                 // Add LLDP neighbors to table
                 row.children('td.device').html(lldp_device);
                 row.children('td.device').html(lldp_device);