Only tell authenticated clients about matchmaker info (#466)

* Only tell authenticated clients about matchmaker info

* Added test for unauthenticated matchmaker messages

server/__init__.py

@@ -101,7 +101,7 @@ def report_dirties():
             player_service.clear_dirty()
 
             if len(dirty_queues) > 0:
-                ctx.broadcast_raw(encode_queues(dirty_queues))
+                ctx.broadcast_raw(encode_queues(dirty_queues), lambda lobby_conn: lobby_conn.authenticated)
 
             if len(dirty_players) > 0:
                 ctx.broadcast_raw(encode_players(dirty_players), lambda lobby_conn: lobby_conn.authenticated)

server/matchmaker/matchmaker_queue.py

@@ -75,7 +75,7 @@ async def queue_pop_timer(self) -> None:
 
             self.game_service.mark_dirty(self)
 
-    def time_until_next_pop(self) -> int:
+    def time_until_next_pop(self) -> float:
         """ Calculate how long we should wait for the next queue to pop based
         on a moving average of the amount of people in the queue.
 
@@ -93,7 +93,7 @@ def time_until_next_pop(self) -> int:
         x = mean(self.last_queue_amounts)
         self._logger.debug("Moving average of %s queue size: %f", self.queue_name, x)
         # Essentially y = max_time / (x+1) with a scale factor
-        return int(config.QUEUE_POP_TIME_MAX / (x / config.QUEUE_POP_TIME_SCALE_FACTOR + 1))
+        return config.QUEUE_POP_TIME_MAX / (x / config.QUEUE_POP_TIME_SCALE_FACTOR + 1)
 
     async def search(self, search: Search) -> None:
         """

tests/integration_tests/test_matchmaker.py

@@ -1,7 +1,5 @@
 import asyncio
 
-from server import config
-
 from .conftest import connect_and_sign_in, read_until_command
 
 # Need to save the old sleep here otherwise the mocker recursively patches it
@@ -62,7 +60,7 @@ async def test_game_matchmaking(loop, lobby_server, mocker):
 
 async def test_matchmaker_info_message(lobby_server, mocker):
     mocker.patch('server.matchmaker.matchmaker_queue.time', return_value=1_562_000_000)
-    mocker.patch('server.matchmaker.matchmaker_queue.config.QUEUE_POP_TIME_MAX', return_value=1)
+    mocker.patch('server.matchmaker.matchmaker_queue.config.QUEUE_POP_TIME_MAX', 1)
 
     _, _, proto = await connect_and_sign_in(
         ('ladder1', 'ladder1'),

tests/integration_tests/test_server.py

@@ -1,3 +1,5 @@
+import asyncio
+
 import pytest
 from server import VisibilityState
 
@@ -114,6 +116,29 @@ async def test_player_info_broadcast(loop, lobby_server):
     p2.close()
 
 
+@pytest.mark.slow
+async def test_info_broadcast_authenticated(loop, lobby_server):
+    proto1 = await connect_client(lobby_server)
+    proto2 = await connect_client(lobby_server)
+    proto3 = await connect_client(lobby_server)
+
+    await perform_login(proto1, ('test', 'test_password'))
+    await perform_login(proto2, ('Rhiza', 'puff_the_magic_dragon'))
+    proto1.send_message({
+        "command": "game_matchmaking",
+        "state": "start",
+        "mod": "ladder1v1",
+        "faction": "uef"
+    })
+    await proto1.drain()
+    # Will timeout if the message is never received
+    await read_until_command(proto2, "matchmaker_info")
+    with pytest.raises(asyncio.TimeoutError):
+        await asyncio.wait_for(proto3.read_message(), 0.2)
+        # Unauthenticated connections should not receive the message
+        assert False
+
+
 @pytest.mark.slow
 async def test_public_host(loop, lobby_server, player_service):
     # TODO: This test can't fail, why is it here?