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

fix cache invalidation for access restrictions and one more mysterious can_grant=None

Browse source
This commit is contained in:
Laura Klünder 2024-12-15 17:25:37 +00:00
parent 9e5ce6f829
commit 7ddff6a382
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -241,9 +241,9 @@ class AccessPermission(models.Model):
if session_token: if session_token:
if user_id: if user_id:
raise ValueError raise ValueError
return ('mapdata:session_access_permission:%s' % session_token) return ('mapdata:session_access_permissions:%s' % session_token)
elif user_id: elif user_id:
return 'mapdata:user_access_permission:%d' % user_id return 'mapdata:user_access_permissions:%d' % user_id
raise ValueError raise ValueError
@staticmethod @staticmethod
@ -312,7 +312,7 @@ class AccessPermission(models.Model):
return permissions return permissions
@classmethod @classmethod
def get_for_request(cls, request, can_grant: bool = False) -> set[int]: def get_for_request(cls, request, can_grant: bool = None) -> set[int]:
# todo: look, for some reason can_grant=False is coded to do the same as can_grant=True. why? # todo: look, for some reason can_grant=False is coded to do the same as can_grant=True. why?
if not request: if not request:
return AccessRestriction.get_all_public() return AccessRestriction.get_all_public()
@ -322,13 +322,15 @@ class AccessPermission(models.Model):
cache_key = cls.request_access_permission_key(request) cache_key = cls.request_access_permission_key(request)
access_restriction_ids = cache.get(cache_key, None) access_restriction_ids = cache.get(cache_key, None)
if access_restriction_ids is None or True: if access_restriction_ids is None:
permissions = cls.get_for_request_with_expire_date(request, can_grant=can_grant) permissions = cls.get_for_request_with_expire_date(request, can_grant=can_grant)
print("can_grant", can_grant)
print(permissions)
access_restriction_ids = set(permissions.keys()) access_restriction_ids = set(permissions.keys())
expire_date = min((e for e in permissions.values() if e), default=timezone.now() + timedelta(seconds=120)) expire_date = min((e for e in permissions.values() if e), default=timezone.now() + timedelta(seconds=120))
cache.set(cache_key, access_restriction_ids, max(0.0, (expire_date - timezone.now()).total_seconds())) cache.set(cache_key, access_restriction_ids, min(300, (expire_date - timezone.now()).total_seconds()))
return set(access_restriction_ids) | (set() if can_grant else AccessRestriction.get_all_public()) return set(access_restriction_ids) | (set() if can_grant else AccessRestriction.get_all_public())
@classmethod @classmethod