mirror of
https://github.com/nextcloud/server.git
synced 2026-02-27 18:37:17 +01:00
feat: Add bases and gidNumber attribute to ldap:test-user-settings output
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user