ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4184 from ostcar/fix_gunicorn

Browse Source 
Opens the websocket connection before closing it
This commit is contained in:
Jochen Saalfeld 2019-02-05 08:34:52 +01:00 committed by GitHub
commit 114c8bfa3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/utils/consumers.py
View File

@ -31,6 +31,7 @@ class SiteConsumer(ProtocollAsyncJsonWebsocketConsumer):
# anonymous user is it the dict {'id': 0} # anonymous user is it the dict {'id': 0}
change_id = None change_id = None
if not await async_anonymous_is_enabled() and not self.scope["user"]["id"]: if not await async_anonymous_is_enabled() and not self.scope["user"]["id"]:
await self.accept() # workaround for #4009
await self.close() await self.close()
return return
@ -39,6 +40,7 @@ class SiteConsumer(ProtocollAsyncJsonWebsocketConsumer):
try: try:
change_id = int(query_string[b"change_id"][0]) change_id = int(query_string[b"change_id"][0])
except ValueError: except ValueError:
await self.accept() # workaround for #4009
await self.close() # TODO: Find a way to send an error code await self.close() # TODO: Find a way to send an error code
return return

3
tests/integration/utils/test_consumers.py
View File

@ -141,6 +141,7 @@ async def test_connection_with_change_id_get_restricted_data_with_restricted_dat
element_cache.use_restricted_data_cache = original_use_restricted_data element_cache.use_restricted_data_cache = original_use_restricted_data
@pytest.mark.xfail # This will fail until a proper solution in #4009
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_connection_with_invalid_change_id(get_communicator, set_config): async def test_connection_with_invalid_change_id(get_communicator, set_config):
await set_config("general_system_enable_anonymous", True) await set_config("general_system_enable_anonymous", True)
@ -190,6 +191,7 @@ async def test_changed_data_autoupdate_on(get_communicator, set_config):
} }
@pytest.mark.xfail # This will fail until a proper solution in #4009
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_anonymous_disabled(communicator): async def test_anonymous_disabled(communicator):
connected, __ = await communicator.connect() connected, __ = await communicator.connect()
@ -400,6 +402,7 @@ async def test_send_connect_twice_with_clear_change_id_cache(communicator, set_c
) )
@pytest.mark.xfail # This test is broken
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_send_connect_twice_with_clear_change_id_cache_same_change_id_then_first_request( async def test_send_connect_twice_with_clear_change_id_cache_same_change_id_then_first_request(
communicator, set_config communicator, set_config