Automated deployment update from ML build

services/mc_tunnel.py

@@ -1,3 +1,4 @@
+_D='replace'
 _C='utf-8'
 _B=None
 _A=True
@@ -29,7 +30,7 @@ def pack_string(s):A=s.encode(_C);return pack_varint(len(A))+A
 def read_string_from_payload(payload,offset=0):
 	A=payload;D,C=read_varint_from_buf(A,offset);B=C+D
 	if B>len(A):raise ValueError('short string in packet')
-	return A[C:B].decode(_C,errors='replace'),B
+	return A[C:B].decode(_C,errors=_D),B
 def pack_bytes(data):return pack_varint(len(data))+data
 def xor_bytes(data):return bytes([A^XOR_KEY for A in data])
 def frame_packet(packet_id,payload):A=pack_varint(packet_id)+payload;return pack_varint(len(A))+A
@@ -71,12 +72,20 @@ def client_login(remote_sock,host,port,timeout=1e1):
 		if C==PKT_LOGIN_SUCCESS:break
 		if C==PKT_LOGIN_PLUGIN_REQUEST:E,F=read_varint_from_buf(D,0);A.sendall(frame_login_plugin_response(E,b''))
 	A.settimeout(_B);return B
+def _skip_proxy_header(reader):
+	C=b'\r\n';A=reader
+	while len(A._buf)<6:A._fill()
+	if A._buf[:6]==b'PROXY ':
+		while C not in A._buf:A._fill()
+		B=A._buf.index(C)+2;D=A._buf[:B];A._buf=A._buf[B:];return D.decode(errors=_D).strip()
 def server_consume_login(client_sock,timeout=1e1):
-	B=client_sock;B.settimeout(timeout);C=PacketReader(B);A,D=C.read_packet()
-	if A!=PKT_HANDSHAKE:raise ValueError(f"expected handshake, got {A}")
-	A,D=C.read_packet()
-	if A!=PKT_LOGIN_START:raise ValueError(f"expected login start, got {A}")
-	B.sendall(build_login_success());B.settimeout(_B);return C
+	C=client_sock;C.settimeout(timeout);A=PacketReader(C);D=_skip_proxy_header(A)
+	if D:import sys;print(f"[mc_tunnel] skipped PROXY header: {D}",file=sys.stderr,flush=_A)
+	B,F=A.read_packet()
+	if B!=PKT_HANDSHAKE:import sys;E=A._buf[:32].hex()if A._buf else'(empty)';print(f"[mc_tunnel] expected handshake(0), got pkt_id={B:#x}, remaining_buf={E}",file=sys.stderr,flush=_A);raise ValueError(f"expected handshake, got {B:#x}")
+	B,G=A.read_packet()
+	if B!=PKT_LOGIN_START:raise ValueError(f"expected login start, got {B:#x}")
+	C.sendall(build_login_success());C.settimeout(_B);return A
 def _pump_plain_to_mc(src,mc_sock,wrap_fn):
 	try:
 		while _A:

services/playit.py

@@ -19,11 +19,11 @@ def _load_token():
 		if A in os.environ:del os.environ[A]
 	return D
 def _handle_client(client_sock):
-	B=client_sock
-	try:C=mc_tunnel.server_consume_login(B);A=socket.socket(socket.AF_INET,socket.SOCK_STREAM);A.settimeout(5.);A.connect(('127.0.0.1',SSH_PORT));A.settimeout(None);logger.debug('Playit MC tunnel: login complete, relaying via plugin packets');mc_tunnel.relay_server(C,A,B)
-	except Exception as D:
-		logger.warning('Playit MC tunnel client dropped: {}',D)
-		try:B.close()
+	C=client_sock;import traceback as D,sys
+	try:E=mc_tunnel.server_consume_login(C);A=socket.socket(socket.AF_INET,socket.SOCK_STREAM);A.settimeout(5.);A.connect(('127.0.0.1',SSH_PORT));A.settimeout(None);logger.info('Playit MC tunnel: login complete, relaying to sshd');mc_tunnel.relay_server(E,A,C)
+	except Exception as B:
+		logger.warning('Playit MC tunnel client dropped: {} - {}',type(B).__name__,B);print(f"[playit] _handle_client error: {type(B).__name__}: {B}",file=sys.stderr,flush=_A);D.print_exc(file=sys.stderr)
+		try:C.close()
 		except Exception:pass
 def _xor_bridge_loop():
 	A=socket.socket(socket.AF_INET,socket.SOCK_STREAM);A.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR,1)