chore(release): merge release-22.04.next into 22.04.x

.github/CODEOWNERS

@@ -6,9 +6,6 @@
 /project/       @centreon/centreon-devops
 *.sh            @centreon/centreon-devops
 
-/.snyk				@centreon/centreon-security
-/sonar-project.properties	@centreon/centreon-security
-
 *.po            @centreon/centreon-documentation
 
 /src/                  @centreon/centreon-php

bin/registerServerTopology.sh

@@ -431,7 +431,7 @@ function request_to_remote() {
   fi
 
   # Prepare Remote Payload
-  REMOTE_PAYLOAD='{"isRemote":true,"platformName":"'"${CURRENT_NODE_NAME}"'","centralServerAddress":"'"${PARSED_URL[HOST]}"'","apiUsername":"'"${API_USERNAME}"'","apiCredentials":"'"${API_TARGET_PASSWORD}"'","apiScheme":"'"${PARSED_URL[SCHEME]}"'","apiPort":'"${PARSED_URL[PORT]}"',"apiPath":"'"${CENTREON_BASE_URI}"'",'"${PEER_VALIDATION}"
+  REMOTE_PAYLOAD='{"isRemote":true,"address":"'${PARSED_CURRENT_NODE_URL[HOST]}'","platformName":"'"${CURRENT_NODE_NAME}"'","centralServerAddress":"'"${PARSED_URL[HOST]}"'","apiUsername":"'"${API_USERNAME}"'","apiCredentials":"'"${API_TARGET_PASSWORD}"'","apiScheme":"'"${PARSED_URL[SCHEME]}"'","apiPort":'"${PARSED_URL[PORT]}"',"apiPath":"'"${CENTREON_BASE_URI}"'",'"${PEER_VALIDATION}"
   if [[ -n PROXY_PAYLOAD ]]; then
     REMOTE_PAYLOAD="${REMOTE_PAYLOAD}""${PROXY_PAYLOAD}"
   fi

ci/debian/centreon-web.postinst

@@ -63,4 +63,17 @@ if [ -n "$2" ]; then
   su - www-data -s /bin/bash -c "/usr/share/centreon/bin/console cache:clear --no-warmup"
 fi
 
+# Try auto configure timezone for php
+timezone=$(/usr/bin/php -r '
+  $timezoneName = timezone_name_from_abbr(trim(shell_exec("date \"+%Z\"")));
+  if (preg_match("/Time zone: (\S+)/", shell_exec("timedatectl"), $matches)) {
+    $timezoneName = $matches[1];
+  }
+  if (date_default_timezone_set($timezoneName) === false) {
+    $timezoneName = "UTC";
+  }
+  echo $timezoneName;
+' 2>/dev/null)
+sed -i "s#^date.timezone = .*#date.timezone = ${timezone}#" /etc/php/8.0/mods-available/centreon.ini
+
 exit 0

ci/debian/control

@@ -17,8 +17,7 @@ Package: centreon
 Architecture: all
 Depends: 
     centreon-central (>= ${centreon:version}~),
-    centreon-database (>= ${centreon:version}~),
-    sudo
+    centreon-database (>= ${centreon:version}~)
 Description: Centreon is a network, system, applicative supervision and monitoring tool,
  it is based upon the most effective Open Source monitoring engine : Nagios.
  Centreon provides a new frontend and new functionnalities to Nagios.
@@ -124,11 +123,9 @@ Depends:
     php8.0-readline,
     php8.0-sqlite3,
     php-pear,
-    ntp,
-    rrdtool,
-    bsd-mailx,
-    sudo,
-    nagios-images
+    rrdtool
+Recommends: ntp | bsd-mailx
+Suggests: nagios-images
 Description: This package contains WebUI files.
 
 Package: centreon-perl-libs

ci/debian/extra/centreon-web/centreon.ini

@@ -1 +1,5 @@
-date.timezone = UTC
+max_execution_time = 300
+session.use_strict_mode = 1
+session.gc_maxlifetime = 7200
+expose_php = Off
+date.timezone = UTC

config/json_validator/latest/Centreon/PlatformInformation/Update.json

@@ -10,6 +10,9 @@
     "isRemote": {
       "type": "boolean"
     },
+    "address": {
+      "type": "string"
+    },
     "centralServerAddress": {
       "type": "string"
     },

doc/API/centreon-api-v22.04.yaml

@@ -6730,6 +6730,10 @@ components:
           type: boolean
           example: true
           description: "Platform is a remote server"
+        address:
+          type: string
+          example: "10.0.0.1"
+          description: "The address of the platform"
         centralServerAddress:
           type: string
           example: "192.168.0.1"

install.sh

@@ -210,19 +210,21 @@ for binary in $BINARIES; do
 	fi
 done
 
-###### Mandatory step
-# ask if gorgone is already installed
-echo -e "\n$line"
-echo -e "\t$(gettext "Check mandatory gorgone service status")"
-echo -e "$line"
-
-yes_no_default "$(gettext "Is the Gorgone module already installed?")"
-if [ "$?" -ne 0 ] ; then
-    echo_failure "\n$(gettext "Gorgone is required.\nPlease install it before launching this script")" "$fail"
-    echo -e "\n\t$(gettext "Please read the documentation to manage the Gorgone daemon installation")"
-    echo -e "\t$(gettext "Available on github") : https://github.com/centreon/centreon-gorgone"
-    echo -e "\t$(gettext "or on the centreon documentation") : https://documentation.centreon.com/\n"
-    exit 1
+if [ "$silent_install" -ne 1 ] ; then 
+	###### Mandatory step
+	# ask if gorgone is already installed
+	echo -e "\n$line"
+	echo -e "\t$(gettext "Check mandatory gorgone service status")"
+	echo -e "$line"
+
+	yes_no_default "$(gettext "Is the Gorgone module already installed?")"
+	if [ "$?" -ne 0 ] ; then
+		echo_failure "\n$(gettext "Gorgone is required.\nPlease install it before launching this script")" "$fail"
+		echo -e "\n\t$(gettext "Please read the documentation to manage the Gorgone daemon installation")"
+		echo -e "\t$(gettext "Available on github") : https://github.com/centreon/centreon-gorgone"
+		echo -e "\t$(gettext "or on the centreon documentation") : https://documentation.centreon.com/\n"
+		exit 1
+	fi
 fi
 
 # Script stop if one binary wasn't found

lang/es_ES.UTF-8/LC_MESSAGES/messages.po

@@ -13125,11 +13125,11 @@ msgstr "cubo de basura"
 #~ msgid "No downtime scheduled for services"
 #~ msgstr "No hay tiempo de inactividad planificado para los servicios"
 
-#~ msgid "Host category"
-#~ msgstr "Categoría de anfitriones"
+ msgid "Host category"
+ msgstr "Categoría de anfitriones"
 
-#~ msgid "Service category"
-#~ msgstr "Categorias de servicio"
+ msgid "Service category"
+ msgstr "Categoria de servicio"
 
 #~ msgid "Inclusion"
 #~ msgstr "Inclusión"
@@ -15162,3 +15162,7 @@ msgstr ""
 
 #  msgid "Warning, maximum size exceeded for input '%s' (max: %d), it will be truncated upon saving"
 #  msgstr ""
+
+# msgid "Parent alias"
+# msgstr ""
+

lang/fr_FR.UTF-8/LC_MESSAGES/messages.po

@@ -4408,7 +4408,7 @@ msgstr "Sauvegarde du mot de passe LDAP"
 
 #: centreon-web/www/include/Administration/parameters/ldap/form.php:78
 msgid "Auto import users"
-msgstr "Import automatiques des utilisateurs"
+msgstr "Import automatique des utilisateurs"
 
 #: centreon-web/www/include/Administration/parameters/ldap/form.php:96
 msgid "Use service DNS"
@@ -13649,11 +13649,11 @@ msgstr "Configurer une plage de maintenance pour les services des hôtes"
 #~ msgid "No downtime scheduled for services"
 #~ msgstr "Aucune plage de maintenance planifiée pour les services"
 
-#~ msgid "Host category"
-#~ msgstr "Catégorie d'hôtes"
+ msgid "Host category"
+ msgstr "Catégorie d'hôtes"
 
-#~ msgid "Service category"
-#~ msgstr "Catégories de service"
+ msgid "Service category"
+ msgstr "Catégorie de service"
 
 #~ msgid "Inclusion"
 #~ msgstr "Inclusion"

lang/pt_BR.UTF-8/LC_MESSAGES/messages.po

@@ -11796,7 +11796,7 @@ msgstr "Escala"
 
 #: centreon-web/www/install/smarty_translate.php:414
 msgid "Service category"
-msgstr "Categoria do Serviço"
+msgstr "Categoria de Serviço"
 
 #: centreon-web/www/install/smarty_translate.php:438
 msgid "Service Scheduling Options"
@@ -15613,3 +15613,7 @@ msgstr ""
 
 #  msgid "Warning, maximum size exceeded for input '%s' (max: %d), it will be truncated upon saving"
 #  msgstr ""
+# msgid "Parent alias"
+# msgstr ""
+
+

lang/pt_PT.UTF-8/LC_MESSAGES/messages.po

@@ -11781,7 +11781,7 @@ msgstr "Grupo de traps SNMP"
 
 #: centreon-web/www/install/smarty_translate.php:387
 msgid "Host category"
-msgstr "Categoria do Host"
+msgstr "Categoria de Host"
 
 #: centreon-web/www/install/smarty_translate.php:393
 msgid "Informations"
@@ -15601,3 +15601,7 @@ msgstr ""
 
 #  msgid "Warning, maximum size exceeded for input '%s' (max: %d), it will be truncated upon saving"
 #  msgstr ""
+
+# msgid "Parent alias
+# msgstr ""
+

src/Centreon/Application/ApiPlatform.php

@@ -28,27 +28,27 @@
 class ApiPlatform
 {
     /**
-     * @var float
+     * @var string
      */
     private $version;
 
     /**
      * Get the API version
      *
-     * @return float
+     * @return string
      */
-    public function getVersion(): float
+    public function getVersion(): string
     {
         return $this->version;
     }
 
     /**
      * Set the API version
      *
-     * @param float $version
+     * @param string $version
      * @return $this
      */
-    public function setVersion(float $version): self
+    public function setVersion(string $version): self
     {
         $this->version = $version;
         return $this;

src/Centreon/Domain/Contact/Contact.php

@@ -162,6 +162,11 @@ class Contact implements UserInterface, ContactInterface
      */
     private $timezone;
 
+    /**
+     * @var int
+     */
+    private int $timezoneId;
+
     /**
      * @var string|null $locale locale of the user
      */
@@ -189,6 +194,25 @@ class Contact implements UserInterface, ContactInterface
      */
     private $theme;
 
+    /**
+     * @param int $timezoneId
+     * @return self
+     */
+    public function setTimezoneId(int $timezoneId): self
+    {
+        $this->timezoneId = $timezoneId;
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTimezoneId(): int
+    {
+        return $this->timezoneId;
+    }
+
     /**
      * @return int
      */

src/Centreon/Domain/Contact/Interfaces/ContactInterface.php

@@ -26,6 +26,11 @@
 
 interface ContactInterface
 {
+    /**
+     * @return int Returns the timezone id
+     */
+    public function getTimezoneId(): int;
+
     /**
      * @return int Returns the contact id
      */

src/Centreon/Domain/PlatformInformation/Model/PlatformInformation.php

@@ -40,6 +40,11 @@ class PlatformInformation
      */
     private $platformName;
 
+    /**
+     * @var string server address
+     */
+    private string $address = '127.0.0.1';
+
     /**
      * @var string|null central's address
      */
@@ -126,6 +131,25 @@ public function setPlatformName(?string $name): self
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getAddress(): string
+    {
+        return $this->address;
+    }
+
+    /**
+     * @param string $address
+     * @return $this
+     */
+    public function setAddress(string $address): self
+    {
+        $this->address = $address;
+
+        return $this;
+    }
+
     /**
      * @return string|null
      */

src/Centreon/Domain/PlatformInformation/Model/PlatformInformationFactory.php

@@ -54,6 +54,9 @@ public function createRemoteInformation(array $information): PlatformInformation
         $platformInformation = new PlatformInformation($isRemote);
         foreach ($information as $key => $value) {
             switch ($key) {
+                case 'address':
+                    $platformInformation->setAddress($value);
+                    break;
                 case 'centralServerAddress':
                     $platformInformation->setCentralServerAddress($value);
                     break;

src/Centreon/Domain/PlatformInformation/UseCase/V20/UpdatePartiallyPlatformInformation.php

@@ -241,6 +241,7 @@ private function convertCentralToRemote(
             $platformInformationToUpdate,
             $currentPlatformInformation
         );
+
         $this->remoteServerService->convertCentralToRemote(
             $platformInformationToUpdate
         );

src/Centreon/Domain/PlatformTopology/Model/PlatformPending.php

@@ -196,13 +196,11 @@ private function checkIpAddress(?string $address): ?string
     {
         // Check for valid IPv4 or IPv6 IP
         // or not sent address (in the case of Central's "parent_address")
-        if (null === $address || false !== filter_var($address, FILTER_VALIDATE_IP)) {
-            return $address;
-        }
-
-        // check for DNS to be resolved
-        $addressResolved = filter_var(gethostbyname($address), FILTER_VALIDATE_IP);
-        if (false === $addressResolved) {
+        if (
+            $address !== null
+            && ! filter_var($address, FILTER_VALIDATE_IP)
+            && ! filter_var($address, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)
+        ) {
             throw new \InvalidArgumentException(
                 sprintf(
                     _("The address '%s' of '%s' is not valid or not resolvable"),
@@ -212,7 +210,7 @@ private function checkIpAddress(?string $address): ?string
             );
         }
 
-        return $addressResolved;
+        return $address;
     }
 
     /**

src/Centreon/Domain/PlatformTopology/Model/PlatformRegistered.php

@@ -194,14 +194,11 @@ public function setHostname(?string $hostname): PlatformInterface
      */
     private function checkIpAddress(?string $address): ?string
     {
-        // Check for valid IPv4 or IPv6 IP
-        // or not sent address (in the case of Central's "parent_address")
-        if (null === $address || false !== filter_var($address, FILTER_VALIDATE_IP)) {
-            return $address;
-        }
-
-        // check for DNS to be resolved
-        if (false === filter_var(gethostbyname($address), FILTER_VALIDATE_IP)) {
+        if (
+            $address !== null
+            && ! filter_var($address, FILTER_VALIDATE_IP)
+            && ! filter_var($address, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)
+        ) {
             throw new \InvalidArgumentException(
                 sprintf(
                     _("The address '%s' of '%s' is not valid or not resolvable"),