Skip to content

Prevent crash in some user backend methods #1251

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
julien-nc merged 1 commit into from
Nov 13, 2025
Merged

Prevent crash in some user backend methods #1251

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion lib/Db/Id4MeMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
namespace OCA\UserOIDC\Db;

use OCP\AppFramework\Db\QBMapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;

/**
Expand All @@ -31,7 +32,7 @@ public function findByIdentifier(string $identifier): Id4Me {
$qb->select('*')
->from($this->getTableName())
->where(
$qb->expr()->eq('identifier', $qb->createNamedParameter($identifier))
$qb->expr()->eq('identifier', $qb->createNamedParameter($identifier, IQueryBuilder::PARAM_STR))
);

return $this->findEntity($qb);
Expand Down
5 changes: 3 additions & 2 deletions lib/Db/ProviderMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use OCP\AppFramework\Db\QBMapper;
use OCP\DB\Exception;

use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;

/**
Expand All @@ -36,7 +37,7 @@ public function getProvider(int $id): Provider {
$qb->select('*')
->from($this->getTableName())
->where(
$qb->expr()->eq('id', $qb->createNamedParameter($id))
$qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT))
);

return $this->findEntity($qb);
Expand All @@ -56,7 +57,7 @@ public function findProviderByIdentifier(string $identifier): Provider {
$qb->select('*')
->from($this->getTableName())
->where(
$qb->expr()->eq('identifier', $qb->createNamedParameter($identifier))
$qb->expr()->eq('identifier', $qb->createNamedParameter($identifier, IQueryBuilder::PARAM_STR))
);

return $this->findEntity($qb);
Expand Down
47 changes: 32 additions & 15 deletions lib/Db/UserMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use OCP\AppFramework\Db\IMapperException;
use OCP\AppFramework\Db\QBMapper;
use OCP\Cache\CappedMemoryCache;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IConfig;
use OCP\IDBConnection;

Expand Down Expand Up @@ -47,7 +48,7 @@ public function getUser(string $uid): User {
$qb->select('*')
->from($this->getTableName())
->where(
$qb->expr()->eq('user_id', $qb->createNamedParameter($uid))
$qb->expr()->eq('user_id', $qb->createNamedParameter($uid, IQueryBuilder::PARAM_STR))
);

/** @var User $user */
Expand All @@ -56,7 +57,7 @@ public function getUser(string $uid): User {
return $user;
}

public function find(string $search, $limit = null, $offset = null): array {
public function find(string $search, ?int $limit = null, ?int $offset = null): array {
$qb = $this->db->getQueryBuilder();

$oidcSystemConfig = $this->config->getSystemValue('user_oidc', []);
Expand All @@ -72,23 +73,31 @@ public function find(string $search, $limit = null, $offset = null): array {
->where($qb->expr()->iLike('user_id', $qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($search) . '%')))
->orWhere($qb->expr()->iLike('display_name', $qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($search) . '%')))
->orWhere($qb->expr()->iLike('configvalue', $qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($search) . '%')))
->orderBy($qb->func()->lower('user_id'), 'ASC')
->setMaxResults($limit)
->setFirstResult($offset);
->orderBy($qb->func()->lower('user_id'), 'ASC');
if ($limit !== null) {
$qb->setMaxResults($limit);
}
if ($offset !== null) {
$qb->setFirstResult($offset);
}
} else {
$qb->select('user_id', 'display_name')
->from($this->getTableName())
->where($qb->expr()->iLike('user_id', $qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($search) . '%')))
->orWhere($qb->expr()->iLike('display_name', $qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($search) . '%')))
->orderBy($qb->func()->lower('user_id'), 'ASC')
->setMaxResults($limit)
->setFirstResult($offset);
->orderBy($qb->func()->lower('user_id'), 'ASC');
if ($limit !== null) {
$qb->setMaxResults($limit);
}
if ($offset !== null) {
$qb->setFirstResult($offset);
}
}

return $this->findEntities($qb);
}

public function findDisplayNames(string $search, $limit = null, $offset = null): array {
public function findDisplayNames(string $search, ?int $limit = null, ?int $offset = null): array {
$qb = $this->db->getQueryBuilder();

$oidcSystemConfig = $this->config->getSystemValue('user_oidc', []);
Expand All @@ -104,17 +113,25 @@ public function findDisplayNames(string $search, $limit = null, $offset = null):
->where($qb->expr()->iLike('user_id', $qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($search) . '%')))
->orWhere($qb->expr()->iLike('display_name', $qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($search) . '%')))
->orWhere($qb->expr()->iLike('configvalue', $qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($search) . '%')))
->orderBy($qb->func()->lower('user_id'), 'ASC')
->setMaxResults($limit)
->setFirstResult($offset);
->orderBy($qb->func()->lower('user_id'), 'ASC');
if ($limit !== null) {
$qb->setMaxResults($limit);
}
if ($offset !== null) {
$qb->setFirstResult($offset);
}
} else {
$qb->select('user_id', 'display_name')
->from($this->getTableName())
->where($qb->expr()->iLike('user_id', $qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($search) . '%')))
->orWhere($qb->expr()->iLike('display_name', $qb->createPositionalParameter('%' . $this->db->escapeLikeParameter($search) . '%')))
->orderBy($qb->func()->lower('user_id'), 'ASC')
->setMaxResults($limit)
->setFirstResult($offset);
->orderBy($qb->func()->lower('user_id'), 'ASC');
if ($limit !== null) {
$qb->setMaxResults($limit);
}
if ($offset !== null) {
$qb->setFirstResult($offset);
}
}

$result = $qb->executeQuery();
Expand Down
20 changes: 19 additions & 1 deletion lib/User/Backend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,29 @@ public function deleteUser($uid): bool {
}
}

public function getUsers($search = '', $limit = null, $offset = null) {
public function getUsers($search = '', $limit = null, $offset = null): array {
if (!is_string($search)
|| ($limit !== null && !is_int($limit))
|| ($offset !== null && !is_int($offset))
) {
return [];
}
return array_map(function ($user) {
return $user->getUserId();
}, $this->userMapper->find($search, $limit, $offset));
}

public function userExists($uid): bool {
if (!is_string($uid)) {
return false;
}
return $this->userMapper->userExists($uid);
}

public function getDisplayName($uid): string {
if (!is_string($uid)) {
return (string)$uid;
}
try {
$user = $this->userMapper->getUser($uid);
} catch (DoesNotExistException $e) {
Expand All @@ -104,6 +116,12 @@ public function getDisplayName($uid): string {
}

public function getDisplayNames($search = '', $limit = null, $offset = null): array {
if (!is_string($search)
|| ($limit !== null && !is_int($limit))
|| ($offset !== null && !is_int($offset))
) {
return [];
}
return $this->userMapper->findDisplayNames($search, $limit, $offset);
}

Expand Down
Loading