From a3c273bad4d676c0afb8bcf7ff88f0588dc776dc Mon Sep 17 00:00:00 2001 From: Trysdyn Black Date: Thu, 6 Mar 2025 21:01:44 -0800 Subject: [PATCH] Don't de-dupe additions to live stream list De-duping those additions seems like a good idea, but we found out that in some cases, OME will emit open and closes for streams while they're still live. De-duping those resulted in streams erroneously being removed from the live list. One such scenario is someone trying to "Steal" and already live key. OME will emit an open and an immediate close as the connection is rejected. The close was removing the still-live stream from the list. Fixes #9 --- admission.py | 6 +++++- status.py | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/admission.py b/admission.py index 1e4c5b3..254ce03 100644 --- a/admission.py +++ b/admission.py @@ -88,7 +88,11 @@ def handle_notify() -> None: stream_list = config.LAST_STREAM_LIST.copy() # Remove or add the changed stream, as appropriate - if cherrypy.request.update_opening and cherrypy.request.update_stream not in stream_list: + # NOTE: This can result in the list containing duplicates; we need to de-dupe before we use it + # This is necessary because OME emits open and close events for rejections due to key + # already being in use. Without dupes, this scenario would knock the stream out of the + # list entirely. + if cherrypy.request.update_opening: stream_list.append(cherrypy.request.update_stream) if not cherrypy.request.update_opening and cherrypy.request.update_stream in stream_list: diff --git a/status.py b/status.py index 6a759cb..d44d7e0 100644 --- a/status.py +++ b/status.py @@ -30,8 +30,10 @@ class Status: # Use config.LAST_STREAM_LIST here because this is a cache of the last # stream list the last time the list of streams changed. It should be # accurate. + # We de-dupe because the cached list can end up with duplicates but + # in all cases, one live entry should mean that stream is live. for s_vhost, s_app, s_stream in config.LAST_STREAM_LIST: - if s_vhost == vhost and s_app == app: + if s_vhost == vhost and s_app == app and s_stream not in streams: streams.append(s_stream) return streams