Fix 4ca1fb4: properly fix not assuming proxy-protocol for SOCKS traff…

…ic (#282)
OpenTTD · Jul 5, 2023 · bbf1ddb · bbf1ddb
1 parent 4ca1fb4
commit bbf1ddb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/master_server/application/master_server_query.py b/master_server/application/master_server_query.py
@@ -34,7 +34,7 @@ async def send_via_socks():
                     transport, _ = await request
                     try:
                         data = await response
-                        protocol.datagram_received(data, server_addr)
+                        protocol.datagram_received(data, server_addr, is_socks=True)
                     finally:
                         transport.close()
 

diff --git a/master_server/openttd/udp.py b/master_server/openttd/udp.py
@@ -49,8 +49,8 @@ def connection_made(self, transport):
         else:
             self.is_ipv6 = False
 
-    def _detect_source_ip_port(self, socket_addr, data):
-        if not self.proxy_protocol or self.socks_proxy:
+    def _detect_source_ip_port(self, socket_addr, data, is_socks=False):
+        if not self.proxy_protocol or is_socks:
             source = Source(self, socket_addr, socket_addr[0], socket_addr[1])
             return source, data
 
@@ -81,9 +81,9 @@ async def guard(self, coro):
         except Exception:
             log.exception("Error while processing packet")
 
-    def datagram_received(self, data, socket_addr):
+    def datagram_received(self, data, socket_addr, is_socks=False):
         try:
-            source, data = self._detect_source_ip_port(socket_addr, data)
+            source, data = self._detect_source_ip_port(socket_addr, data, is_socks=is_socks)
         except Exception as err:
             log.exception("Error detecting PROXY protocol %r: %r", socket_addr, err)
             return