Skip to content

LDAP: add fallback to mailPrimaryAddress when determining user domain #1508

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

Open
erik-saarts wants to merge 2 commits into
base: master
Choose a base branch
from
+24 −2
Open

LDAP: add fallback to mailPrimaryAddress when determining user domain #1508

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b069d66
LDAP: add fallback to mailPrimaryAddress when determining user domain
May 8, 2026
7d41001
LDAP: use ldapMapping email field for domain detection
May 8, 2026
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
26 changes: 24 additions & 2 deletions www/go/modules/community/ldapauthenticator/cli/controller/Sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,29 @@ private function getGOUserName(Record $record, Server $server): bool|string
}
}

$mailDomain = isset($record->mail[0]) ? explode('@', $record->mail[0])[1] : null;
// Determine email using LDAP mapping if available
$config = go()->getConfig();
$mapping = $config['ldapMapping'] ?? null;

$mail = null;

if (isset($mapping['email'])) {
if (is_callable($mapping['email'])) {
$mail = $mapping['email']($record);
} else {
$attr = strtolower($mapping['email']);
$mail = $record->{$attr}[0] ?? null;
}
}

// Fallback to default LDAP mail attribute
if (!$mail) {
$mail = $record->mail[0] ?? null;
}

$mailDomain = $mail && str_contains($mail, '@')
? explode('@', $mail, 2)[1]
: null;

if (empty($domain) || !in_array($domain, $this->domains)) {
go()->info("Using domain from mail property for " . $username);
Expand Down Expand Up @@ -527,4 +549,4 @@ private function logDeletes(array $deleteIds, int $totalInLDAP, int $maxDeletePe
throw new Exception("Delete Aborted because script was about to delete more then $maxDeletePercentage% (" . $percentageToDelete . "%, " . ($totalInGO - $totalInLDAP) . " groups)\n");
}
}
}
}