Skip to content

[stable23] Fix ldap:check-user method for newly created LDAP users #31306

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
blizzz merged 4 commits into from
Feb 22, 2022
Merged

[stable23] Fix ldap:check-user method for newly created LDAP users #31306

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbfaeab
Fix ldap:check-user method for newly created LDAP users
come-nc Jan 31, 2022
6e7ed28
Remove parenthesis around return in apps/user_ldap/lib/Command/CheckU…
come-nc Feb 7, 2022
9c34638
Improve typing in apps/user_ldap/lib/Command/CheckUser.php
come-nc Feb 7, 2022
c29ba3a
Make it explicit that a DN can be used for ldap:check-user
come-nc Feb 7, 2022
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
Fix ldap:check-user method for newly created LDAP users 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Feb 22, 2022
commit bbfaeabdf3c7bf60fc1fae8725aa7fc107235a0a
26 changes: 11 additions & 15 deletions apps/user_ldap/lib/Command/CheckUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,21 +90,23 @@ protected function execute(InputInterface $input, OutputInterface $output): int
try {
$uid = $input->getArgument('ocName');
$this->isAllowed($input->getOption('force'));
$this->confirmUserIsMapped($uid);
$wasMapped = $this->userWasMapped($uid);
$exists = $this->backend->userExistsOnLDAP($uid, true);
if ($exists === true) {
$output->writeln('The user is still available on LDAP.');
if ($input->getOption('update')) {
$this->updateUser($uid, $output);
}
return 0;
} elseif ($wasMapped) {
$this->dui->markUser($uid);
$output->writeln('The user does not exists on LDAP anymore.');
$output->writeln('Clean up the user\'s remnants by: ./occ user:delete "'
. $uid . '"');
return 0;
} else {
throw new \Exception('The given user is not a recognized LDAP user.');
}

$this->dui->markUser($uid);
$output->writeln('The user does not exists on LDAP anymore.');
$output->writeln('Clean up the user\'s remnants by: ./occ user:delete "'
. $uid . '"');
return 0;
} catch (\Exception $e) {
$output->writeln('<error>' . $e->getMessage(). '</error>');
return 1;
Expand All @@ -114,16 +116,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
/**
* checks whether a user is actually mapped
* @param string $ocName the username as used in Nextcloud
* @throws \Exception
* @return true
*/
protected function confirmUserIsMapped($ocName) {
protected function userWasMapped(string $ocName): bool {
$dn = $this->mapping->getDNByName($ocName);
if ($dn === false) {
throw new \Exception('The given user is not a recognized LDAP user.');
}

return true;
return ($dn !== false);
}

/**
Expand Down