fernando/luos
1
0
Fork 0
Code Releases Activity

TASK-207 Merge for ldap and ldapAdvanced

Browse Source
This commit is contained in:
Brayan Pereyra
2025-09-12 16:21:53 +00:00
parent 9cb66f4a4e
commit ea87d8aac6
20 changed files with 1011 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
workflow/engine/classes/LdapAdvanced.php
View File

@@ -443,28 +443,35 @@ class LdapAdvanced
*/
public function log($link, $text)
{
$logFile = PATH_DATA . "log/ldapAdvanced.log";
$logFile = PATH_DATA . 'logs/ldapAdvanced.log';
if (!file_exists($logFile) || is_writable($logFile)) {
$fpt = fopen($logFile, "a");
$ldapErrorMsg = "";
$ldapErrorNr = 0;
if ($link != null) {
$ldapErrorNr = ldap_errno($link);
if ($ldapErrorNr != 0) {
$ldapErrorMsg = ldap_error($link);
$text = $ldapErrorMsg . " : " . $text;
}
}
// Log format: date hour ipaddress workspace ldapErrorNr
fwrite($fpt, sprintf("%s %s %s %s %s \n", date("Y-m-d H:i:s"), getenv("REMOTE_ADDR"), config("system.workspace"), $ldapErrorNr, $text));
fclose($fpt);
} else {
error_log("file $logFile is not writable ");
// Validate log file exists and is writable
if (!file_exists($logFile)) {
error_log("Log file does not exist: $logFile");
throw new Exception("Log file does not exist: $logFile");
}
if (!is_writable($logFile)) {
error_log("Log file is not writable: $logFile");
throw new Exception("Log file is not writable: $logFile");
}
$fpt = fopen($logFile, "a");
$ldapErrorMsg = "";
$ldapErrorNr = 0;
if ($link != null) {
$ldapErrorNr = ldap_errno($link);
if ($ldapErrorNr != 0) {
$ldapErrorMsg = ldap_error($link);
$text = $ldapErrorMsg . " : " . $text;
}
}
// Log format: date hour ipaddress workspace ldapErrorNr
fwrite($fpt, sprintf("%s %s %s %s %s \n", date("Y-m-d H:i:s"), getenv("REMOTE_ADDR"), config("system.workspace"), $ldapErrorNr, $text));
fclose($fpt);
}
/**
@@ -1638,7 +1645,7 @@ class LdapAdvanced
$attributes = $authSource['AUTH_SOURCE_DATA']['AUTH_SOURCE_GRID_ATTRIBUTE'];
}
$usrRole = 'PROCESSMAKER_OPERATOR';
$usrRole = 'LURANA_OPERATOR';
if (!empty($authSource['AUTH_SOURCE_DATA']['USR_ROLE'])) {
$usrRole = $authSource['AUTH_SOURCE_DATA']['USR_ROLE'];
}
@@ -2272,7 +2279,7 @@ class LdapAdvanced
$sLastname = $user['sLastname'];
$sEmail = $user['sEmail'];
$sDn = $user['sDN'];
$usrRole = empty($user['usrRole']) ? 'PROCESSMAKER_OPERATOR' : $user['usrRole'];
$usrRole = empty($user['usrRole']) ? 'LURANA_OPERATOR' : $user['usrRole'];
$data = [];
$data['USR_USERNAME'] = $sUsername;