Skip to content

wip #978

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

Closed
kesselb wants to merge 1 commit into from
Closed

wip #978

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 17 additions & 7 deletions lib/UserResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,25 @@ public function __construct(IUserManager $userManager) {
* @throws NoUserFoundException
*/
public function findExistingUserId(string $rawUidCandidate, bool $force = false): string {
if ($force) {
$this->ensureUser($rawUidCandidate);
if ($force)
{
$usersFound=$this->ensureUser($rawUidCandidate);
if(count($usersFound) != 1)
{
throw new NoUserFoundException('User' . $rawUidCandidate . ' not valid or not found');
Copy link
Member

@blizzz blizzz Aug 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will work on maybe 99% of the cases, but not where the search attributes are configured in a way that would not reliably find the user.

Should not throw but continue with previous behaviour.

}
$user = array_keys($usersFound)[0];
Copy link
Member

@blizzz blizzz Aug 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a risk that more records are returned and that the first one is not the correct one.

It would be acceptable to cycle through the result and compare with the uid candidate (after sanitizing), for instance.

}
if ($this->userManager->userExists($rawUidCandidate)) {
return $rawUidCandidate;
else
{
$user=$rawUidCandidate;
}
if ($this->userManager->userExists($user)) {
return $user;
}
try {
$sanitized = $this->sanitizeUserIdCandidate($rawUidCandidate);
} catch (\InvalidArgumentException) {
} catch (\InvalidArgumentException $e) {
$sanitized = '';
}
if ($this->userManager->userExists($sanitized)) {
Expand All @@ -57,13 +67,13 @@ public function userExists(string $uid, bool $force = false): bool {
try {
$this->findExistingUserId($uid, $force);
return true;
} catch (NoUserFoundException) {
} catch (NoUserFoundException $e) {
return false;
}
}

protected function ensureUser($search) {
$this->userManager->search($search);
return $this->userManager->search($search);
}

/**
Expand Down
Loading