mirror of
https://github.com/sshuttle/sshuttle.git
synced 2025-07-09 02:58:41 +02:00
6e15e69029
When passing multiple subnet files, e.g., by using -s/--subnets multiple times or by using it together with subnets passed as positional arguments append the content from all sources instead of only using the subnets from the last source. This makes the behaviour of -s/--subnets consistent with -x/--exclude.
89 lines
3.2 KiB
Python
89 lines
3.2 KiB
Python
import re
|
|
import sshuttle.helpers as helpers
|
|
import sshuttle.client as client
|
|
import sshuttle.firewall as firewall
|
|
import sshuttle.hostwatch as hostwatch
|
|
import sshuttle.ssyslog as ssyslog
|
|
from sshuttle.options import parser, parse_ipport6, parse_ipport4
|
|
from sshuttle.helpers import family_ip_tuple, log, Fatal
|
|
|
|
|
|
def main():
|
|
opt = parser.parse_args()
|
|
|
|
if opt.daemon:
|
|
opt.syslog = 1
|
|
if opt.wrap:
|
|
import sshuttle.ssnet as ssnet
|
|
ssnet.MAX_CHANNEL = opt.wrap
|
|
helpers.verbose = opt.verbose
|
|
|
|
try:
|
|
if opt.firewall:
|
|
if opt.subnets:
|
|
parser.error('exactly zero arguments expected')
|
|
return firewall.main(opt.method, opt.syslog)
|
|
elif opt.hostwatch:
|
|
return hostwatch.hw_main(opt.subnets)
|
|
else:
|
|
includes = opt.subnets
|
|
excludes = opt.exclude
|
|
if not includes and not opt.auto_nets:
|
|
parser.error('at least one subnet, subnet file, or -N expected')
|
|
remotename = opt.remote
|
|
if remotename == '' or remotename == '-':
|
|
remotename = None
|
|
nslist = [family_ip_tuple(ns) for ns in opt.ns_hosts]
|
|
if opt.seed_hosts and not opt.auto_hosts:
|
|
parser.error('--seed-hosts only works if you also use -H')
|
|
if opt.seed_hosts:
|
|
sh = re.split(r'[\s,]+', (opt.seed_hosts or "").strip())
|
|
elif opt.auto_hosts:
|
|
sh = []
|
|
else:
|
|
sh = None
|
|
if opt.listen:
|
|
ipport_v6 = None
|
|
ipport_v4 = None
|
|
list = opt.listen.split(",")
|
|
for ip in list:
|
|
if '[' in ip and ']' in ip:
|
|
ipport_v6 = parse_ipport6(ip)
|
|
else:
|
|
ipport_v4 = parse_ipport4(ip)
|
|
else:
|
|
# parse_ipport4('127.0.0.1:0')
|
|
ipport_v4 = "auto"
|
|
# parse_ipport6('[::1]:0')
|
|
ipport_v6 = "auto" if not opt.disable_ipv6 else None
|
|
if opt.syslog:
|
|
ssyslog.start_syslog()
|
|
ssyslog.stderr_to_syslog()
|
|
return_code = client.main(ipport_v6, ipport_v4,
|
|
opt.ssh_cmd,
|
|
remotename,
|
|
opt.python,
|
|
opt.latency_control,
|
|
opt.dns,
|
|
nslist,
|
|
opt.method,
|
|
sh,
|
|
opt.auto_nets,
|
|
includes,
|
|
excludes,
|
|
opt.daemon, opt.pidfile)
|
|
|
|
if return_code == 0:
|
|
log('Normal exit code, exiting...')
|
|
else:
|
|
log('Abnormal exit code detected, failing...' % return_code)
|
|
return return_code
|
|
|
|
except Fatal as e:
|
|
log('fatal: %s\n' % e)
|
|
return 99
|
|
except KeyboardInterrupt:
|
|
log('\n')
|
|
log('Keyboard interrupt: exiting.\n')
|
|
return 1
|