mirror of
https://github.com/sshuttle/sshuttle.git
synced 2025-07-08 02:27:27 +02:00
a604d107ef
This fixes #909 and is an alternative to the #922 pull request. When sudo's use_pty is used with sshuttle, it causes issues with the terminal. Pull request #712 contains some fixes for this problem. However, when sshuttle is run with the --daemon option, it left the user's terminal in a non-sane state. The problem appears to be related to a socketpair that the firewall uses for communication. By setting it up slightly differently (see changes to client.py and firewall.py), the terminal state is no longer disrupted. This commit also changes line endings of the printed messages from \r\n to \n. This undoes a change introduced by pull request #712 and is no longer needed.
50 lines
1.7 KiB
Python
50 lines
1.7 KiB
Python
import sys
|
|
import zlib
|
|
import types
|
|
import platform
|
|
|
|
verbosity = verbosity # noqa: F821 must be a previously defined global
|
|
if verbosity > 0:
|
|
sys.stderr.write(' s: Running server on remote host with %s (version %s)\n'
|
|
% (sys.executable, platform.python_version()))
|
|
z = zlib.decompressobj()
|
|
while 1:
|
|
name = sys.stdin.readline().strip()
|
|
if name:
|
|
# python2 compat: in python2 sys.stdin.readline().strip() -> str
|
|
# in python3 sys.stdin.readline().strip() -> bytes
|
|
# (see #481)
|
|
if sys.version_info >= (3, 0):
|
|
name = name.decode("ASCII")
|
|
nbytes = int(sys.stdin.readline())
|
|
if verbosity >= 2:
|
|
sys.stderr.write(' s: assembling %r (%d bytes)\n'
|
|
% (name, nbytes))
|
|
content = z.decompress(sys.stdin.read(nbytes))
|
|
|
|
module = types.ModuleType(name)
|
|
parents = name.rsplit(".", 1)
|
|
if len(parents) == 2:
|
|
parent, parent_name = parents
|
|
setattr(sys.modules[parent], parent_name, module)
|
|
|
|
code = compile(content, name, "exec")
|
|
exec(code, module.__dict__) # nosec
|
|
sys.modules[name] = module
|
|
else:
|
|
break
|
|
|
|
sys.stderr.flush()
|
|
sys.stdout.flush()
|
|
|
|
# import can only happen once the code has been transferred to
|
|
# the server. 'noqa: E402' excludes these lines from QA checks.
|
|
import sshuttle.helpers # noqa: E402
|
|
sshuttle.helpers.verbose = verbosity
|
|
|
|
import sshuttle.cmdline_options as options # noqa: E402
|
|
from sshuttle.server import main # noqa: E402
|
|
main(options.latency_control, options.latency_buffer_size,
|
|
options.auto_hosts, options.to_nameserver,
|
|
options.auto_nets)
|