Merge branch 'collab-bugfixes-6' into 'main'

Collab bugfixes 6

See merge request reportcreator/reportcreator!540

api/src/reportcreator_api/utils/channels.py

@@ -8,6 +8,7 @@
 from rest_framework.response import Response
 
 from reportcreator_api.pentests.models.collab import CollabEvent
+from reportcreator_api.utils import logging
 from reportcreator_api.utils.utils import omit_keys
 
 
@@ -64,6 +65,7 @@ async def post(self, request, *args, **kwargs):
         consumer = await self.get_consumer(action='write', client_id=data['client_id'])
 
         # Dispatch incoming messages
+        error = None
         for msg in request.data.get('messages', []):
             msg_type = msg.get('type')
             if msg_type == 'collab.ping':
@@ -72,6 +74,12 @@ async def post(self, request, *args, **kwargs):
                 await consumer.receive_json(msg)
             except ValidationError:
                 continue
+            except Exception as ex:
+                logging.exception(ex)
+                # Raise error after processing all events
+                error = ex
+        if error:
+            raise error
 
         # Get events since version (including responses to incoming messages)
         events = CollabEvent.objects \

deploy/sysreptor.nginx

@@ -24,9 +24,9 @@ server {
 	ssl_stapling on;
 	ssl_stapling_verify on;
 
-  # Large timeouts for long running websocket connections
-	proxy_read_timeout 8h;
-	proxy_send_timeout 8h;
+  # Timeouts for long running websocket connections and long PDF rendering tasks
+	proxy_read_timeout 5m;
+	proxy_send_timeout 5m;
 	client_max_body_size 0;
 
 	location / {