diff --git a/services/socks5_to_http_proxy.py b/services/socks5_to_http_proxy.py index aaf47ac..5a4b20c 100644 --- a/services/socks5_to_http_proxy.py +++ b/services/socks5_to_http_proxy.py @@ -119,15 +119,16 @@ class Socks5ToHttpProxy: try: # Таймаут на чтение первого запроса request_line = await asyncio.wait_for( - reader.readline(), + reader.readline(), timeout=10 ) - + if not request_line: return - + request_text = request_line.decode('utf-8', errors='ignore').strip() - + logger.info(f"Tunnel request: {request_text[:80]}") + if request_text.upper().startswith('CONNECT'): await self._handle_connect(request_text, reader, writer) else: @@ -184,13 +185,13 @@ class Socks5ToHttpProxy: remote_socket.settimeout(15) if self.username: - logger.debug(f"SOCKS5 connect {host}:{port} via {self.socks5_host} auth=yes user={self.username[:4]}***") + logger.info(f"SOCKS5 connect {host}:{port} via {self.socks5_host}:{self.socks5_port} auth=yes user={self.username[:4]}***") remote_socket.set_proxy( socks.SOCKS5, self.socks5_host, self.socks5_port, username=self.username, password=self.password ) else: - logger.warning(f"SOCKS5 connect {host}:{port} via {self.socks5_host} auth=NO — credentials missing!") + logger.warning(f"SOCKS5 connect {host}:{port} via {self.socks5_host}:{self.socks5_port} auth=NO — credentials missing!") remote_socket.set_proxy( socks.SOCKS5, self.socks5_host, self.socks5_port )