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

avoid race conditions in x-processed-geometry-update

Browse source
This commit is contained in:
Laura Klünder 2024-09-17 22:21:20 +02:00
parent 3399d2c1ed
commit e70bf8aac5
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/c3nav/mapdata/views.py
View file

@ -333,6 +333,8 @@ def tile(request, level, zoom, x, y, theme, access_permissions: Optional[set] =
return HttpResponse('use %s instead of /map/' % settings.TILE_CACHE_SERVER, return HttpResponse('use %s instead of /map/' % settings.TILE_CACHE_SERVER,
status=400, content_type='text/plain') status=400, content_type='text/plain')
processed_geometry_update = str(MapUpdate.last_processed_geometry_update()[0])
zoom = int(zoom) zoom = int(zoom)
if not (-2 <= zoom <= 5): if not (-2 <= zoom <= 5):
raise Http404 raise Http404
@ -426,7 +428,7 @@ def tile(request, level, zoom, x, y, theme, access_permissions: Optional[set] =
response['Cache-Control'] = 'no-cache' response['Cache-Control'] = 'no-cache'
response['Vary'] = 'Cookie' response['Vary'] = 'Cookie'
if access_permissions is not None: if access_permissions is not None:
response['X-Processed-Geometry-Update'] = str(MapUpdate.last_processed_geometry_update()[0]) response['X-Processed-Geometry-Update'] = processed_geometry_update
return response return response
@ -457,6 +459,8 @@ def map_history(request, level, mode, filetype):
@etag(lambda *args, **kwargs: MapUpdate.current_processed_geometry_cache_key()) @etag(lambda *args, **kwargs: MapUpdate.current_processed_geometry_cache_key())
@no_language() @no_language()
def get_cache_package(request, filetype): def get_cache_package(request, filetype):
processed_geometry_update = str(MapUpdate.last_processed_geometry_update()[0])
enforce_tile_secret_auth(request) enforce_tile_secret_auth(request)
filename = 'package.' + filetype filename = 'package.' + filetype
@ -476,5 +480,5 @@ def get_cache_package(request, filetype):
response['Content-Length'] = size response['Content-Length'] = size
if content_disposition := content_disposition_header(False, filename): if content_disposition := content_disposition_header(False, filename):
response["Content-Disposition"] = content_disposition response["Content-Disposition"] = content_disposition
response['X-Processed-Geometry-Update'] = str(MapUpdate.last_processed_geometry_update()[0]) response['X-Processed-Geometry-Update'] = processed_geometry_update
return response return response