Merge pull request #506 from itsmng/telemetry-data

Telemetry data
itsmng · Dec 12, 2024 · ce440f2 · ce440f2
2 parents a3a2629 + 07e1c74
commit ce440f2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/ajax/telemetry.php b/ajax/telemetry.php
@@ -38,12 +38,15 @@
 
 if (!($_SESSION['telemetry_from_install'] ?? false)) {
     Session::checkRight("config", READ);
+    $hide_sensitive_data = false;
+} else {
+    $hide_sensitive_data = true;
 }
 
 echo Html::css("public/lib/prismjs.css");
 echo Html::script("public/lib/prismjs.js");
 
-$infos = Telemetry::getTelemetryInfos();
+$infos = Telemetry::getTelemetryInfos($hide_sensitive_data);
 echo "<p>" . __("We only collect the following data : plugins usage, performance and responsiveness statistics about user interface features, memory, and hardware configuration.") . "</p>";
 echo "<pre><code class='language-json'>";
 echo json_encode($infos, JSON_PRETTY_PRINT);

diff --git a/inc/define.php b/inc/define.php
@@ -33,7 +33,7 @@
 
 // Last version of GLPI only for plugin compatibility
 define('GLPI_VERSION', '9.5.13');
-define('ITSM_VERSION', '2.0.2');
+define('ITSM_VERSION', '2.0.3');
 if (substr(ITSM_VERSION, -4) === '-dev') {
     //for dev version
     define('ITSM_PREVER', str_replace('-dev', '', ITSM_VERSION));

diff --git a/inc/telemetry.class.php b/inc/telemetry.class.php
@@ -47,15 +47,15 @@ public static function getTypeName($nb = 0)
      *
      * @return array
      */
-    public static function getTelemetryInfos()
+    public static function getTelemetryInfos(bool $hide_sensitive_data = false): array
     {
         $data = [
-           'glpi'   => self::grabGlpiInfos(),
+           'glpi'   => self::grabGlpiInfos($hide_sensitive_data),
            'system' => [
-              'db'           => self::grabDbInfos(),
-              'web_server'   => self::grabWebserverInfos(),
-              'php'          => self::grabPhpInfos(),
-              'os'           => self::grabOsInfos()
+              'db'           => self::grabDbInfos($hide_sensitive_data),
+              'web_server'   => self::grabWebserverInfos($hide_sensitive_data),
+              'php'          => self::grabPhpInfos($hide_sensitive_data),
+              'os'           => self::grabOsInfos($hide_sensitive_data)
            ]
         ];
 
@@ -67,13 +67,13 @@ public static function getTelemetryInfos()
      *
      * @return array
      */
-    public static function grabGlpiInfos()
+    public static function grabGlpiInfos($hide_sensitive_data = false)
     {
         global $CFG_GLPI;
 
         $glpi = [
-           'uuid'               => self::getInstanceUuid(),
-           'version'            => ITSM_VERSION,
+           'uuid'               => $hide_sensitive_data ? 'REDACTED' : self::getInstanceUuid(),
+           'version'            => $hide_sensitive_data ? 'REDACTED' : ITSM_VERSION,
            'plugins'            => [],
            'default_language'   => $CFG_GLPI['language'],
            'install_mode'       => GLPI_INSTALL_MODE,
@@ -97,7 +97,7 @@ public static function grabGlpiInfos()
         foreach ($plugins->getList(['directory', 'version']) as $plugin) {
             $glpi['plugins'][] = [
                'key'       => $plugin['directory'],
-               'version'   => $plugin['version']
+               'version'   => $hide_sensitive_data ? 'REDACTED' : $plugin['version']
             ];
         }
 
@@ -117,7 +117,7 @@ public static function grabGlpiInfos()
      *
      * @return array
      */
-    public static function grabDbInfos()
+    public static function grabDbInfos($hide_sensitive_data = false)
     {
         global $DB;
 
@@ -131,7 +131,7 @@ public static function grabDbInfos()
 
         $db = [
            'engine'    => $dbinfos['Server Software'],
-           'version'   => $dbinfos['Server Version'],
+           'version'   => $hide_sensitive_data ? 'REDACTED' : $dbinfos['Server Version'],
            'size'      => $size_res['dbsize'],
            'log_size'  => '',
            'sql_mode'  => $dbinfos['Server SQL Mode']
@@ -145,7 +145,7 @@ public static function grabDbInfos()
      *
      * @return array
      */
-    public static function grabWebserverInfos()
+    public static function grabWebserverInfos($hide_sensitive_data = false)
     {
         global $CFG_GLPI;
 
@@ -174,7 +174,7 @@ public static function grabWebserverInfos()
             $header_matches = [];
             if (preg_match('/^Server: (?<engine>[^ ]+)\/(?<version>[^ ]+)/im', $headers, $header_matches)) {
                 $server['engine']  = $header_matches['engine'];
-                $server['version'] = $header_matches['version'];
+                $server['version'] = $hide_sensitive_data ? 'REDACTED' : $header_matches['version'];
             }
         }
 
@@ -186,10 +186,10 @@ public static function grabWebserverInfos()
      *
      * @return array
      */
-    public static function grabPhpInfos()
+    public static function grabPhpInfos($hide_sensitive_data = false)
     {
         $php = [
-           'version'   => str_replace(PHP_EXTRA_VERSION, '', PHP_VERSION),
+           'version'   => $hide_sensitive_data ? 'REDACTED' : str_replace(PHP_EXTRA_VERSION, '', PHP_VERSION),
            'modules'   => get_loaded_extensions(),
            'setup'     => [
               'max_execution_time'    => ini_get('max_execution_time'),
@@ -209,7 +209,7 @@ public static function grabPhpInfos()
      *
      * @return array
      */
-    public static function grabOsInfos()
+    public static function grabOsInfos($hide_sensitive_data = false)
     {
         $distro = false;
         if (file_exists('/etc/redhat-release')) {
@@ -218,7 +218,7 @@ public static function grabOsInfos()
         $os = [
            'family'       => php_uname('s'),
            'distribution' => ($distro ?: ''),
-           'version'      => php_uname('r')
+           'version'      => $hide_sensitive_data ? 'REDACTED' : php_uname('r')
         ];
         return $os;
     }

diff --git a/inc/update.class.php b/inc/update.class.php
@@ -621,6 +621,7 @@ public function doUpdates($current_version = null)
             case "2.0.0":
             case "2.0.1":
             case "2.0.2":
+            case "2.0.3":
                 include_once "{$updir}itsm_update_151_200.php";
                 update151to200();