klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2026-04-20 18:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix hidden user can't search itself

Browse Source
This commit is contained in:
Antoine Bartuccio
2026-04-18 18:09:04 +02:00
parent 1d525ca6d4
commit 8b18999514
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/models.py
View File

@@ -131,7 +131,9 @@ class UserQuerySet(models.QuerySet):
if user.has_perm("core.view_hidden_user"): if user.has_perm("core.view_hidden_user"):
return self return self
if user.has_perm("core.view_user"): if user.has_perm("core.view_user"):
return self.filter(Q(is_viewable=True) | Q(whitelisted_users=user)) return self.filter(
Q(is_viewable=True) | Q(whitelisted_users=user) | Q(pk=user.pk)
)
if user.is_anonymous: if user.is_anonymous:
return self.none() return self.none()
return self.filter(id=user.id) return self.filter(id=user.id)

16
core/tests/test_user.py
View File

@@ -410,12 +410,20 @@ class TestUserQuerySetViewableBy:
assert set(viewable) == set(users) assert set(viewable) == set(users)
@pytest.mark.parametrize( @pytest.mark.parametrize(
"user_factory", [old_subscriber_user.make, subscriber_user.make] "user_factory",
[
old_subscriber_user.make,
lambda: old_subscriber_user.make(is_viewable=False),
subscriber_user.make,
lambda: subscriber_user.make(is_viewable=False),
],
) )
def test_subscriber(self, users: list[User], user_factory): def test_can_search(self, users: list[User], user_factory):
user = user_factory() user = user_factory()
viewable = User.objects.filter(id__in=[u.id for u in users]).viewable_by(user) viewable = User.objects.filter(
assert set(viewable) == {users[0], users[1]} id__in=[u.id for u in [*users, user]]
).viewable_by(user)
assert set(viewable) == {user, users[0], users[1]}
def test_whitelist(self, users: list[User]): def test_whitelist(self, users: list[User]):
user = subscriber_user.make() user = subscriber_user.make()