extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-04-18 08:18:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #545 from skuhl/avoid-touching-etc-hosts

Browse Source 
Only write /etc/hosts when necessary.
This commit is contained in:
Brian May 2020-10-19 15:53:14 +11:00 committed by GitHub
commit a266e7a8bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sshuttle/firewall.py
View File

@ -47,8 +47,11 @@ def rewrite_etc_hosts(hostmap, port):
os.rename(tmpname, HOSTSFILE) os.rename(tmpname, HOSTSFILE)
def restore_etc_hosts(port): def restore_etc_hosts(hostmap, port):
rewrite_etc_hosts({}, port) # Only restore if we added hosts to /etc/hosts previously.
if len(hostmap) > 0:
debug2('firewall manager: undoing /etc/hosts changes.\n')
rewrite_etc_hosts({}, port)
# Isolate function that needs to be replaced for tests # Isolate function that needs to be replaced for tests
@ -275,8 +278,8 @@ def main(method_name, syslog):
debug2('An error occurred, ignoring it.') debug2('An error occurred, ignoring it.')
try: try:
debug2('firewall manager: undoing /etc/hosts changes.\n') # debug2() message printed in restore_etc_hosts() function.
restore_etc_hosts(port_v6 or port_v4) restore_etc_hosts(hostmap, port_v6 or port_v4)
except BaseException: except BaseException:
try: try:
debug1("firewall manager: " debug1("firewall manager: "

2
tests/client/test_firewall.py
View File

@ -55,7 +55,7 @@ def test_rewrite_etc_hosts(tmpdir):
assert line == "" assert line == ""
with patch('sshuttle.firewall.HOSTSFILE', new=str(new_hosts)): with patch('sshuttle.firewall.HOSTSFILE', new=str(new_hosts)):
sshuttle.firewall.restore_etc_hosts(10) sshuttle.firewall.restore_etc_hosts(hostmap, 10)
assert orig_hosts.computehash() == new_hosts.computehash() assert orig_hosts.computehash() == new_hosts.computehash()