From dc1447fb771cea07a932b59391c8895cae8c7e12 Mon Sep 17 00:00:00 2001
From: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
Date: Thu, 28 Jul 2022 16:33:49 +0100
Subject: [PATCH] Clean(platform): Clean appKey method and usage (#11336)

* removing appKey from information table in baseConf and 22.10 update script

* removing appKey from NotifyMasterService.php

* removing appKey from CentreonRemoteServer.php

* applying suggested changes

* Applying suggested changes

Co-authored-by: Kevin Duret <kduret@centreon.com>
---
 .../Application/Webservice/CentreonRemoteServer.php | 13 ++-----------
 .../Domain/Service/NotifyMasterService.php          |  9 ---------
 www/install/createTables.sql                        |  1 -
 www/install/steps/process/insertBaseConf.php        |  2 --
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/CentreonRemote/Application/Webservice/CentreonRemoteServer.php b/src/CentreonRemote/Application/Webservice/CentreonRemoteServer.php
index 40768c67cfe..8bfd90de78f 100644
--- a/src/CentreonRemote/Application/Webservice/CentreonRemoteServer.php
+++ b/src/CentreonRemote/Application/Webservice/CentreonRemoteServer.php
@@ -109,14 +109,6 @@ public function postAddToWaitList(): string
             throw new \RestBadRequestException('Can not access your address.');
         }
 
-        if (
-            !isset($_POST['app_key'])
-            || !$_POST['app_key']
-            || empty($appKey = filter_var($_POST['app_key'], FILTER_SANITIZE_STRING))
-        ) {
-            throw new \RestBadRequestException('Please send \'app_key\' in the request.');
-        }
-
         if (
             !isset($_POST['version'])
             || !$_POST['version']
@@ -147,15 +139,14 @@ public function postAddToWaitList(): string
         }
 
         $createdAt = date('Y-m-d H:i:s');
-        $insertQuery = "INSERT INTO `remote_servers` (`ip`, `app_key`, `version`, `is_connected`,
+        $insertQuery = "INSERT INTO `remote_servers` (`ip`, `version`, `is_connected`,
             `created_at`, `http_method`, `http_port`, `no_check_certificate`)
-            VALUES (:ip, :app_key, :version, 0, '{$createdAt}',
+            VALUES (:ip, :version, 0, '{$createdAt}',
                 :http_method, :http_port, :no_check_certificate
             )";
 
         $insert = $this->pearDB->prepare($insertQuery);
         $insert->bindValue(':ip', $ip, \PDO::PARAM_STR);
-        $insert->bindValue(':app_key', $appKey, \PDO::PARAM_STR);
         $insert->bindValue(':version', $version, \PDO::PARAM_STR);
         $insert->bindValue(':http_method', $httpScheme, \PDO::PARAM_STR);
         $insert->bindValue(':http_port', $httpPort, \PDO::PARAM_INT);
diff --git a/src/CentreonRemote/Domain/Service/NotifyMasterService.php b/src/CentreonRemote/Domain/Service/NotifyMasterService.php
index d5b0295f933..9af5d665ddb 100644
--- a/src/CentreonRemote/Domain/Service/NotifyMasterService.php
+++ b/src/CentreonRemote/Domain/Service/NotifyMasterService.php
@@ -93,19 +93,10 @@ public function pingMaster($ip, $data, $noCheckCertificate = false, $noProxy = f
 
         $url = "{$ip}/centreon/api/external.php?object=centreon_remote_server&action=addToWaitList";
         $repository = $this->dbManager->getRepository(InformationsRepository::class);
-        $applicationKey = $repository->getOneByKey('appKey');
         $version = $repository->getOneByKey('version');
 
-        if (empty($applicationKey)) {
-            return [
-                'status' => self::FAIL,
-                'details' => self::NO_APP_KEY
-            ];
-        }
-
         try {
             $curlData = [
-                'app_key' => $applicationKey->getValue(),
                 'version' => $version->getValue(),
                 'http_method' => $data['remoteHttpMethod'] ?? 'http',
                 'http_port' => $data['remoteHttpPort'] ?? '',
diff --git a/www/install/createTables.sql b/www/install/createTables.sql
index aa1a86c661d..c72f2449beb 100644
--- a/www/install/createTables.sql
+++ b/www/install/createTables.sql
@@ -2321,7 +2321,6 @@ CREATE TABLE IF NOT EXISTS contact_feature (
 CREATE TABLE IF NOT EXISTS `remote_servers` (
   `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
   `ip` VARCHAR(255) NOT NULL,
-  `app_key` VARCHAR(40) NOT NULL,
   `version` VARCHAR(16) NOT NULL,
   `is_connected` TINYINT(1) NOT NULL DEFAULT 0,
   `created_at` TIMESTAMP NOT NULL,
diff --git a/www/install/steps/process/insertBaseConf.php b/www/install/steps/process/insertBaseConf.php
index 5a2fe96e73a..95f3e2bab70 100644
--- a/www/install/steps/process/insertBaseConf.php
+++ b/www/install/steps/process/insertBaseConf.php
@@ -138,9 +138,7 @@
 $link->exec("INSERT INTO `options` (`key`, `value`) VALUES ('gmt','" . $timezoneId . "')");
 
 # Generate random key for this instance and set it to be not central and not remote
-$uniqueKey = md5(uniqid(rand(), true));
 $informationsTableInsert = "INSERT INTO `informations` (`key`,`value`) VALUES
-    ('appKey', '{$uniqueKey}'),
     ('isRemote', 'no'),
     ('isCentral', 'yes')";