fix(ldap): move upgrade script to next minor (#8150)

centreon · Nov 25, 2019 · bdb3fc5 · bdb3fc5
1 parent cc522b4
commit bdb3fc5
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 29 deletions.
diff --git a/www/install/php/Update-19.10.2.php b/www/install/php/Update-19.10.2.php
@@ -20,41 +20,15 @@
 include_once __DIR__ . "/../../class/centreonLog.class.php";
 $centreonLog = new CentreonLog();
 
-// remove ldap users missing contact name
-// these users have been added using the auto-import ldap feature and will be re-imported at their next login.
+// fix contact auto login default value when not set
 try {
     $pearDB->query(
-        'DELETE FROM contact WHERE contact_name = ""'
+        "UPDATE `contact` SET `contact_autologin_key` = NULL WHERE `contact_autologin_key` =''"
     );
 } catch (\PDOException $e) {
     $centreonLog->insertLog(
         2,
-        "UPGRADE : 19.10.2 Unable to delete ldap auto-imported users with empty contact_name"
+        "UPGRADE : 19.10.2 Unable to set default contact_autologin_key"
     );
 }
 
-// correct the DN of manually imported users from an LDAP
-try {
-    // finding the data of contacts linked to an LDAP
-    $stmt = $pearDB->query(
-        "SELECT contact_id, contact_name, contact_ldap_dn FROM contact WHERE ar_id is NOT NULL"
-    );
-    $updateDB = $pearDB->prepare(
-        "UPDATE contact SET contact_ldap_dn = :newDn WHERE contact_id = :contactId"
-    );
-    while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-        // removing the double slashes if needed and saving the corrected data
-        if (strpos($row['contact_ldap_dn'], "\\\\")) {
-            $newDn = str_replace("\\\\", "\\", $row['contact_ldap_dn']);
-
-            $updateDB->bindValue(':newDn', $newDn, \PDO::PARAM_STR);
-            $updateDB->bindValue(':contactId', $row['contact_id'], \PDO::PARAM_INT);
-            $updateDB->execute();
-        }
-    }
-} catch (\PDOException $e) {
-    $centreonLog->insertLog(
-        2,
-        "UPGRADE : 19.10.2 Unable to correct the LDAP DN data"
-    );
-}
diff --git a/www/install/php/Update-19.10.3.php b/www/install/php/Update-19.10.3.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ * Copyright 2005 - 2019 Centreon (https://www.centreon.com/)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : contact@centreon.com
+ *
+ */
+include_once __DIR__ . "/../../class/centreonLog.class.php";
+$centreonLog = new CentreonLog();
+
+// remove ldap users missing contact name
+// these users have been added using the auto-import ldap feature
+// and will be re-imported at their next login.
+try {
+    $pearDB->query(
+        'DELETE FROM contact WHERE contact_name = ""'
+    );
+} catch (\PDOException $e) {
+    $centreonLog->insertLog(
+        2,
+        "UPGRADE : 19.10.3 Unable to delete ldap auto-imported users with empty contact_name"
+    );
+}
+
+// correct the DN of manually imported users from an LDAP
+try {
+    // finding the data of contacts linked to an LDAP
+    $stmt = $pearDB->query(
+        "SELECT contact_id, contact_name, contact_ldap_dn FROM contact WHERE ar_id is NOT NULL"
+    );
+    $updateDB = $pearDB->prepare(
+        "UPDATE contact SET contact_ldap_dn = :newDn WHERE contact_id = :contactId"
+    );
+    while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+        // removing the double slashes if needed and saving the corrected data
+        if (strpos($row['contact_ldap_dn'], "\\\\")) {
+            $newDn = str_replace("\\\\", "\\", $row['contact_ldap_dn']);
+
+            $updateDB->bindValue(':newDn', $newDn, \PDO::PARAM_STR);
+            $updateDB->bindValue(':contactId', $row['contact_id'], \PDO::PARAM_INT);
+            $updateDB->execute();
+        }
+    }
+} catch (\PDOException $e) {
+    $centreonLog->insertLog(
+        2,
+        "UPGRADE : 19.10.3 Unable to correct the LDAP DN data"
+    );
+}