Add checks

Fix uninstall

Author: tsmr

hook.php

@@ -331,8 +331,17 @@ function plugin_addressing_uninstall()
     //Delete rights associated with the plugin
     $profileRight = new ProfileRight();
 
+    // getAllRights() only exposes the main 'plugin_addressing' right (both of its
+    // entries share that $rightname); installation (createFirstAccess /
+    // migrateProfiles) additionally registers the dedicated
+    // 'plugin_addressing_use_ping_in_equipment' right. Purge both explicitly,
+    // otherwise the ping right stays orphaned in glpi_profilerights after uninstall.
+    $right_names = ['plugin_addressing_use_ping_in_equipment'];
     foreach (Profile::getAllRights() as $right) {
-        $profileRight->deleteByCriteria(['name' => $right['field']]);
+        $right_names[] = $right['field'];
+    }
+    foreach (array_unique($right_names) as $right_name) {
+        $profileRight->deleteByCriteria(['name' => $right_name]);
     }
 
     Profile::removeRightsFromSession();

src/Ping_Equipment.php

@@ -159,9 +159,9 @@ public function ping($system, $ip, $return = "list")
             case 0:
                 // linux ping
                 if ($return == "true") {
-                    exec("ping -c 1 -w 1 " . escapeshellarg($ip), $list);
+                    exec("ping -n -c 1 -w 1 " . escapeshellarg($ip), $list);
                 } else {
-                    exec("ping -c 1 -w 1 " . escapeshellarg($ip), $list, $error);
+                    exec("ping -n -c 1 -w 1 " . escapeshellarg($ip), $list, $error);
                 }
                 $nb = count($list);
                 if (isset($nb) && $return == "true") {
@@ -210,9 +210,9 @@ public function ping($system, $ip, $return = "list")
             case 3:
                 // BSD ping
                 if ($return == "true") {
-                    exec("ping -c 1 -W 1 " . escapeshellarg($ip), $list);
+                    exec("ping -n -c 1 -W 1 " . escapeshellarg($ip), $list);
                 } else {
-                    exec("ping -c 1 -W 1 " . escapeshellarg($ip), $list, $error);
+                    exec("ping -n -c 1 -W 1 " . escapeshellarg($ip), $list, $error);
                 }
                 $nb = count($list);
                 if (isset($nb) && $return == "true") {
@@ -227,9 +227,9 @@ public function ping($system, $ip, $return = "list")
             case 4:
                 // MacOSX ping
                 if ($return == "true") {
-                    exec("ping -c 1 -t 1 " . escapeshellarg($ip), $list);
+                    exec("ping -n -c 1 -t 1 " . escapeshellarg($ip), $list);
                 } else {
-                    exec("ping -c 1 -t 1 " . escapeshellarg($ip), $list, $error);
+                    exec("ping -n -c 1 -t 1 " . escapeshellarg($ip), $list, $error);
                 }
                 $nb = count($list);
                 if (isset($nb) && $return == "true") {
@@ -242,7 +242,14 @@ public function ping($system, $ip, $return = "list")
                 break;
         }
         if ($return == "list") {
-            $list_str = implode('<br />', $list);
+            // Ping output is external, attacker-influenced data (notably the reverse-DNS
+            // PTR of the target IP on Unix). It is echoed as text/html by ajax/ping.php,
+            // so escape every line before joining with the intended <br /> separators to
+            // prevent reflected XSS; the <br /> tags stay as the only markup emitted.
+            $list_str = implode('<br />', array_map(
+                static fn($line): string => htmlspecialchars((string) $line, ENT_QUOTES, 'UTF-8'),
+                $list,
+            ));
 
             return [$list_str, $error];
         } else {