Skip to content

armgit / meet

Public Imported from GitHub
0

Open source video conferencing app powered by LiveKit. Built with Django and React.

🔒️(backend) derive connection-test room max age from token TTL

lebaudantoineb593516802d5
diff --git a/src/backend/core/api/viewsets.py b/src/backend/core/api/viewsets.py
index 1f5401c7..bbaa1da4 100644
--- a/src/backend/core/api/viewsets.py
+++ b/src/backend/core/api/viewsets.py
@@ -1612,9 +1612,13 @@ class DiagnosticsViewSet(viewsets.ViewSet):
# eject someone who stays connected. Schedule a hard DeleteRoom when Celery
# is available.
if settings.CELERY_ENABLED:
+ max_age = (
+ settings.CONNECTION_TEST_TOKEN_TTL_SECONDS
+ + settings.CONNECTION_TEST_ROOM_EXTRA_AGE_SECONDS
+ )
delete_connection_test_room.apply_async(
args=[room],
- countdown=settings.CONNECTION_TEST_ROOM_MAX_AGE_SECONDS,
+ countdown=max_age,
)
return drf_response.Response(
diff --git a/src/backend/core/tests/test_api_diagnostics.py b/src/backend/core/tests/test_api_diagnostics.py
index f018ddba..8a35d48b 100644
--- a/src/backend/core/tests/test_api_diagnostics.py
+++ b/src/backend/core/tests/test_api_diagnostics.py
@@ -118,14 +118,15 @@ def test_api_diagnostics_connection_schedules_room_deletion(
"""When Celery is enabled, schedule a hard room delete after max age."""
settings.CELERY_ENABLED = True
- settings.CONNECTION_TEST_ROOM_MAX_AGE_SECONDS = 300
+ settings.CONNECTION_TEST_TOKEN_TTL_SECONDS = 300
+ settings.CONNECTION_TEST_ROOM_EXTRA_AGE_SECONDS = 10
settings.CONNECTION_TEST_ROOM_PREFIX = "connection-test"
response = client.post("/api/v1.0/diagnostics/connection/")
assert response.status_code == 200
room = response.json()["livekit"]["room"]
- mock_apply_async.assert_called_once_with(args=[room], countdown=300)
+ mock_apply_async.assert_called_once_with(args=[room], countdown=310)
@mock.patch("core.api.viewsets.delete_connection_test_room.apply_async")
diff --git a/src/backend/meet/settings.py b/src/backend/meet/settings.py
index f9accbdc..ddcaa402 100755
--- a/src/backend/meet/settings.py
+++ b/src/backend/meet/settings.py
@@ -675,9 +675,13 @@ class Base(Configuration):
environ_name="CONNECTION_TEST_TOKEN_TTL_SECONDS",
environ_prefix=None,
)
- CONNECTION_TEST_ROOM_MAX_AGE_SECONDS = values.PositiveIntegerValue(
- 300,
- environ_name="CONNECTION_TEST_ROOM_MAX_AGE_SECONDS",
+ # The effective room max age is always computed as
+ # CONNECTION_TEST_TOKEN_TTL_SECONDS + this value. Token expiration does
+ # not automatically delete rooms, so once that age is reached, the
+ # cleanup worker will explicitly delete the room if it still exists.
+ CONNECTION_TEST_ROOM_EXTRA_AGE_SECONDS = values.PositiveIntegerValue(
+ 10,
+ environ_name="CONNECTION_TEST_ROOM_EXTRA_AGE_SECONDS",
environ_prefix=None,
)
CONNECTION_TEST_ROOM_PREFIX = values.Value(