Skip to content

[stable20] Avoid PHP errors when the LDAP attribute is not found #29314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 5 commits into from
Nov 4, 2021
Merged

[stable20] Avoid PHP errors when the LDAP attribute is not found #29314

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
355bf52
Avoid PHP errors when the LDAP attribute is not found
come-nc Oct 12, 2021
3f8ea18
Use Psr\Log\LoggerInterface in OCA\User_LDAP\Access
come-nc Oct 12, 2021
63f29ca
Fix two mistakes in previous migration to LoggerInterface in OCA\User…
come-nc Oct 14, 2021
07c9dc0
Use Psr\Log\LoggerInterface where it can easily be used in user_ldap
come-nc Oct 14, 2021
349f4f6
Fix Access constructor call
come-nc Oct 28, 2021
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
Next Next commit
Avoid PHP errors when the LDAP attribute is not found 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @blizzz
come-nc authored and blizzz committed Oct 29, 2021
commit 355bf525082c80343dde27d6630c20ec45a8d1d9
6 changes: 5 additions & 1 deletion apps/user_ldap/lib/Access.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ public function dn2ocname($fdn, $ldapName = null, $isUser = true, &$newlyMapped

if (is_null($ldapName)) {
$ldapName = $this->readAttribute($fdn, $nameAttribute, $filter);
if (!isset($ldapName[0]) && empty($ldapName[0])) {
if (!isset($ldapName[0]) || empty($ldapName[0])) {
\OCP\Util::writeLog('user_ldap', 'No or empty name for ' . $fdn . ' with filter ' . $filter . '.', ILogger::DEBUG);
return false;
}
Expand All @@ -566,6 +566,10 @@ public function dn2ocname($fdn, $ldapName = null, $isUser = true, &$newlyMapped
$usernameAttribute = (string)$this->connection->ldapExpertUsernameAttr;
if ($usernameAttribute !== '') {
$username = $this->readAttribute($fdn, $usernameAttribute);
if (!isset($username[0]) || empty($username[0])) {
\OCP\Util::writeLog('user_ldap', 'No or empty username (' . $usernameAttribute . ') for ' . $fdn . '.', ILogger::DEBUG);
return false;
}
$username = $username[0];
} else {
$username = $uuid;
Expand Down