Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

fix(ldap): correct double slashes in the saved DN - for 19.04.x #8121

Merged
merged 5 commits into from
Nov 25, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion www/class/centreonAuth.LDAP.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ public function updateUserDn()

if ($this->ldap->rebind()) {
$userDn = $this->ldap->findUserDn($contactAlias);
$userDn = $this->pearDB->escape($userDn);
if (false === $userDn) {
$this->CentreonLog->insertLog(3, "LDAP AUTH - Error : No DN for user " . $contactAlias);
return false;
Expand Down
32 changes: 28 additions & 4 deletions www/install/php/Update-19.04.5.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,40 @@
);
}

// 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.
// 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 is NULL"
);
} catch (\PDOException $e) {
$centreonLog->insertLog(
2,
"UPGRADE : 19.04.5 Unable to delete ldap auto-imported users with empty contact_name"
"UPGRADE : 19.04.5 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 = $this->pearDB->query(
"SELECT contact_id, contact_name, contact_ldap_dn FROM contact WHERE ar_id is NOT NULL"
);
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 = $this->pearDB->prepare(
"UPDATE contact SET contact_ldap_dn = :newDn WHERE contact_id = :contactId"
);
$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.04.5 Unable to correct the LDAP DN data"
);
}