Reallow split packets to be processed

Author: Chrezm

server/network/ao_protocol.py

@@ -105,7 +105,7 @@ def connection_lost(self, exc):
         self.server.remove_client(self.client)
         self.ping_timeout.cancel()
 
-    def _get_messages(self):
+    def _get_messages(self) -> str:
         """ Parses out full messages from the buffer.
 
         :return: yields messages
@@ -115,13 +115,20 @@ def _get_messages(self):
             self.buffer = spl[1]
             yield spl[0]
 
+    def _shortened_buffer(self) -> str:
+        short_buffer = self.buffer
+        if len(short_buffer) >= 512:
+            short_buffer = short_buffer[:500] + '...' + short_buffer[-12:]
+
+        return f'{short_buffer} ({len(self.buffer)} bytes)'
+
     def _process_message(self, msg):
         if len(msg) < 2:
             # This immediatelly kills any client that does not even try to follow the proper
             # client protocol
             msg = self.buffer if len(self.buffer) < 512 else self.buffer[:512] + '...'
             logger.log_server(f'Terminated {self.client.get_ipreal()} (packet too short): '
-                              f'sent {msg} ({len(self.buffer)} bytes)')
+                              f'sent {self._shortened_buffer()}.')
             self.client.disconnect()
             return False
 
@@ -175,9 +182,8 @@ def data_received(self, data):
         self.buffer = self.buffer.translate({ord(c): None for c in '\0'})
 
         if len(self.buffer) > 8192:
-            msg = self.buffer if len(self.buffer) < 512 else self.buffer[:512] + '...'
             logger.log_server(f'Terminated {self.client.get_ipreal()} (packet too long): '
-                              f'sent {msg} ({len(self.buffer)} bytes)')
+                              f'sent {self._shortened_buffer()}.')
             self.client.disconnect()
             return
 
@@ -187,14 +193,19 @@ def data_received(self, data):
             if not self._process_message(msg):
                 return
 
-        if not found_message:
+        if found_message:
+            return
+
+        # Check if valid packet split by evil router on client side
+        buffer_command = self.buffer.split('#')[0]
+        if buffer_command not in self._net_cmd_dispatcher:
             # This immediatelly kills any client that does not even try to follow the proper
             # client protocol
-            msg = self.buffer if len(self.buffer) < 512 else self.buffer[:512] + '...'
             logger.log_server(f'Terminated {self.client.get_ipreal()} (packet syntax '
-                              f'unrecognized): sent {msg} ({len(self.buffer)} bytes)')
+                              f'unrecognized): sent {self._shortened_buffer()}.')
             self.client.disconnect()
 
+
     def _validate_net_cmd(self, args, *types, needs_auth=True):
         """ Makes sure the net command's arguments match expectations.
 

server/tsuserver.py

@@ -69,8 +69,8 @@ def __init__(self, protocol: AOProtocol = None,
         self.release = 4
         self.major_version = 3
         self.minor_version = 4
-        self.segment_version = 'post1'
-        self.internal_version = '220821b'
+        self.segment_version = 'post2'
+        self.internal_version = 'M220829a'
         version_string = self.get_version_string()
         self.software = 'TsuserverDR {}'.format(version_string)
         self.version = 'TsuserverDR {} ({})'.format(version_string, self.internal_version)