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

Don't fail if can't revert errors

Browse Source 
We will log the errors, however no point in failing; not only can this
hide errors that occured setting up the firewall, but is pointless as we
can't actually handle these errors in a good way anyway.
This commit is contained in:
Brian May 2015-12-05 14:14:01 +11:00
parent 50a6e87237
commit d07a775d50
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sshuttle/firewall.py
View File

@ -5,6 +5,7 @@ import sshuttle.ssyslog as ssyslog
import sys import sys
import os import os
import platform import platform
import traceback
from sshuttle.helpers import debug1, debug2, Fatal from sshuttle.helpers import debug1, debug2, Fatal
from sshuttle.methods import get_auto_method, get_method from sshuttle.methods import get_auto_method, get_method
@ -228,8 +229,37 @@ def main(method_name, syslog):
debug1('firewall manager: undoing changes.\n') debug1('firewall manager: undoing changes.\n')
except: except:
pass pass
if port_v6:
method.setup_firewall(port_v6, 0, [], socket.AF_INET6, [], udp) try:
if port_v4: if port_v6:
method.setup_firewall(port_v4, 0, [], socket.AF_INET, [], udp) debug2('firewall manager: undoing IPv6 changes.\n')
restore_etc_hosts(port_v6 or port_v4) method.setup_firewall(port_v6, 0, [], socket.AF_INET6, [], udp)
except:
try:
debug1("Error trying to undo IPv6 firewall\n")
for line in traceback.format_exc().splitlines():
debug1("---> %s\n" % line)
except:
pass
try:
if port_v4:
debug2('firewall manager: undoing IPv4 changes.\n')
except:
try:
debug1("Error trying to undo IPv4 firewall\n")
for line in traceback.format_exc().splitlines():
debug1("---> %s\n" % line)
except:
pass
try:
debug2('firewall manager: undoing /etc/hosts changes.\n')
restore_etc_hosts(port_v6 or port_v4)
except:
try:
debug1("Error trying to undo IPv4 firewall\n")
for line in traceback.format_exc().splitlines():
debug1("---> %s\n" % line)
except:
pass