beenull/immich
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(server): do not leak people (#4710)

Browse source
This commit is contained in:
martin 2023-10-30 09:44:05 +01:00 committed by GitHub
parent 512f672e9e
commit cc3149c520
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
server/src/infra/repositories/person.repository.ts
View file

@ -103,15 +103,18 @@ export class PersonRepository implements IPersonRepository {
return this.personRepository.findOne({ where: { id: personId } }); return this.personRepository.findOne({ where: { id: personId } });
} }
getByName(userId: string, personName: string, { withHidden }: PersonNameSearchOptions): Promise<PersonEntity[]> { async getByName(
userId: string,
personName: string,
{ withHidden }: PersonNameSearchOptions,
): Promise<PersonEntity[]> {
const queryBuilder = this.personRepository const queryBuilder = this.personRepository
.createQueryBuilder('person') .createQueryBuilder('person')
.leftJoin('person.faces', 'face') .leftJoin('person.faces', 'face')
.where('person.ownerId = :userId', { userId }) .where(
.andWhere('LOWER(person.name) LIKE :nameStart OR LOWER(person.name) LIKE :nameAnywhere', { 'person.ownerId = :userId AND (LOWER(person.name) LIKE :nameStart OR LOWER(person.name) LIKE :nameAnywhere)',
nameStart: `${personName.toLowerCase()}%`, { userId, nameStart: `${personName.toLowerCase()}%`, nameAnywhere: `% ${personName.toLowerCase()}%` },
nameAnywhere: `% ${personName.toLowerCase()}%`, )
})
.groupBy('person.id') .groupBy('person.id')
.orderBy('COUNT(face.assetId)', 'DESC') .orderBy('COUNT(face.assetId)', 'DESC')
.limit(20); .limit(20);