sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: Add bases and gidNumber attribute to ldap:test-user-settings output 

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
pull/51218/head
Côme Chilliet 2025-03-04 10:05:50 +07:00
parent d2c142397d
commit 71759bf856
No known key found for this signature in database
GPG Key ID: A3E2F658B28C760A
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/user_ldap/lib/Command/TestUserSettings.php
Unescape Escape View File

@ -101,6 +101,8 @@ class TestUserSettings extends Command {
$output->writeln('');
$attributeNames = [
'ldapBase',
'ldapBaseUsers',
'ldapExpertUsernameAttr',
'ldapUuidUserAttribute',
'ldapExpertUUIDUserAttr',
@ -120,11 +122,17 @@ class TestUserSettings extends Command {
'ldapAttributeBiography',
'ldapAttributeBirthDate',
'ldapAttributePronouns',
'ldapGidNumber',
'hasGidNumber',
];
$output->writeln('Attributes set in configuration:');
foreach ($attributeNames as $attributeName) {
if ($connection->$attributeName !== '') {
$output->writeln("- $attributeName: <info>" . $connection->$attributeName . '</info>');
if (($connection->$attributeName !== '') && ($connection->$attributeName !== [])) {
if (\is_string($connection->$attributeName)) {
$output->writeln("- $attributeName: <info>" . $connection->$attributeName . '</info>');
} else {
$output->writeln("- $attributeName: <info>" . \json_encode($connection->$attributeName) . '</info>');
}
}
}
@ -134,6 +142,9 @@ class TestUserSettings extends Command {
if ($connection->ldapUuidUserAttribute !== 'auto') {
$attrs[] = strtolower($connection->ldapUuidUserAttribute);
}
if ($connection->hasGidNumber) {
$attrs[] = strtolower($connection->ldapGidNumber);
}
$attrs[] = 'memberof';
$attrs = array_values(array_unique($attrs));
$attributes = $access->readAttributes($knownDn, $attrs, $filter);
@ -170,6 +181,7 @@ class TestUserSettings extends Command {
$output->writeln('Group information:');
$attributeNames = [
'ldapBaseGroups',
'ldapDynamicGroupMemberURL',
'ldapGroupFilter',
'ldapGroupMemberAssocAttr',