2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fixed resolving a users accesspermission into associated groups

Browse source
This commit is contained in:
Jenny Danzmayr 2023-12-19 17:35:22 +01:00
parent 334dc9c09a
commit b1df8264c6
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/c3nav/mapdata/models/access.py
View file

@ -53,14 +53,17 @@ class AccessRestrictionGroup(TitledMixin, models.Model):
@classmethod @classmethod
def qs_for_request(cls, request): def qs_for_request(cls, request):
return cls.objects.filter(cls.q_for_request(request)).distinct() return cls.objects.filter(cls.q_for_request(request))
@classmethod @classmethod
def q_for_request(cls, request): def q_for_request(cls, request):
if request.user.is_authenticated and request.user.is_superuser: if request.user.is_authenticated and request.user.is_superuser:
return Q() return Q()
all_permissions = AccessPermission.get_all_access_restrictions()
permissions = AccessPermission.get_for_request(request) permissions = AccessPermission.get_for_request(request)
return Q(Q(accessrestrictions=None) | Q(accessrestrictions__pk__in=permissions)) # now we filter out groups where the user doesn't have a permission for all members
filter_perms = all_permissions - permissions
return ~Q(accessrestrictions__pk__in=filter_perms)
def default_valid_until(): def default_valid_until():
@ -189,7 +192,7 @@ class AccessPermission(models.Model):
return permissions return permissions
@staticmethod @staticmethod
def get_all_access_restrictions(): def get_all_access_restrictions() -> set[int]:
cache_key = 'all_access_restrictions:%s' % MapUpdate.current_cache_key() cache_key = 'all_access_restrictions:%s' % MapUpdate.current_cache_key()
access_restriction_ids = cache.get(cache_key, None) access_restriction_ids = cache.get(cache_key, None)
if access_restriction_ids is None: if access_restriction_ids is None:
@ -198,7 +201,7 @@ class AccessPermission(models.Model):
return access_restriction_ids return access_restriction_ids
@classmethod @classmethod
def get_for_request(cls, request): def get_for_request(cls, request) -> set[int]:
if not request or not request.user.is_authenticated: if not request or not request.user.is_authenticated:
return set() return set()