From 513e44d128265258dd69570cd1d89457b350ac9d Mon Sep 17 00:00:00 2001 From: Morten Minde Neergaard <169057+xim@users.noreply.github.com> Date: Tue, 1 Nov 2022 15:30:30 +0100 Subject: [PATCH 1/2] TCP connections: Only listen to localhost, not all interfaces --- scenes/shell.gd | 2 +- scenes/tcp_server.gd | 2 +- scenes/tcp_server_shell.gd | 2 +- scenes/text_editor.gd | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scenes/shell.gd b/scenes/shell.gd index e406540..8074e6b 100644 --- a/scenes/shell.gd +++ b/scenes/shell.gd @@ -109,7 +109,7 @@ func _shell_binary(): #func run_async_thread(command): # var port = 1000 + (randi() % 1000) # var s = TCP_Server.new() -# s.listen(port) +# s.listen(port, "127.0.0.1") # var _pid = OS.execute("ncat", ["127.0.0.1", str(port), "-c", command], false, [], true) # while not s.is_connection_available(): # pass diff --git a/scenes/tcp_server.gd b/scenes/tcp_server.gd index 3e5c114..ae1a281 100644 --- a/scenes/tcp_server.gd +++ b/scenes/tcp_server.gd @@ -13,7 +13,7 @@ func _ready(): start() func start(): - _s.listen(port) + _s.listen(port, "127.0.0.1") func _process(_delta): if _s.is_connection_available(): diff --git a/scenes/tcp_server_shell.gd b/scenes/tcp_server_shell.gd index 1756170..45223a6 100644 --- a/scenes/tcp_server_shell.gd +++ b/scenes/tcp_server_shell.gd @@ -13,7 +13,7 @@ func _ready(): start() func start(): - _s.listen(port) + _s.listen(port, "127.0.0.1") func _process(_delta): if _s.is_connection_available(): diff --git a/scenes/text_editor.gd b/scenes/text_editor.gd index 2018eec..c6e0abe 100644 --- a/scenes/text_editor.gd +++ b/scenes/text_editor.gd @@ -10,7 +10,7 @@ var _client_connection func _ready(): # Initialize TCP server for fake editor. _server = TCP_Server.new() - _server.listen(1234) + _server.listen(1234, "127.0.0.1") func _process(_delta): if _server.is_connection_available(): From 02f21db6d00431c76b20aa3c0d453a3a9b9430b0 Mon Sep 17 00:00:00 2001 From: Morten Minde Neergaard <169057+xim@users.noreply.github.com> Date: Sun, 13 Nov 2022 14:38:15 +0100 Subject: [PATCH 2/2] TCP port listen: Fix the hint server as well --- scenes/main.gd | 3 ++- scripts/hint | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scenes/main.gd b/scenes/main.gd index 0ad09c2..0e40134 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -20,7 +20,8 @@ var _hint_client_connection func _ready(): _hint_server = TCP_Server.new() - _hint_server.listen(1235) + _hint_server.listen(1235, "127.0.0.1") + OS.set_environment("HINT_TCP_PORT", "1235") var args = helpers.parse_args() diff --git a/scripts/hint b/scripts/hint index 8b24e7a..7ea185d 100755 --- a/scripts/hint +++ b/scripts/hint @@ -3,7 +3,7 @@ use IO::Socket; $socket = IO::Socket::INET->new(PeerAddr => "127.0.0.1", - PeerPort => 1235, + PeerPort => $ENV{HINT_TCP_PORT}, Proto => "tcp", Type => SOCK_STREAM);