X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/5bae5ba3df0f2d33782972d94bb850bd8e22d68b..755028a03a7a61175e4c8c3f416aaa79e3f909bd:/server diff --git a/server b/server index a139e6e..9987a1d 100755 --- a/server +++ b/server @@ -1,16 +1,24 @@ #!/usr/bin/python3 -import twisted +import sys +import os -import twisted.web.server import Site -from twisted.web.resource import Resource -from twisted.web.server import NOT_DONE_YET +import twisted +import twisted.internet +import twisted.internet.endpoints from twisted.internet import reactor +from twisted.web.server import NOT_DONE_YET +from twisted.logger import LogLevel + +import ipaddress +from ipaddress import AddressValueError + +#import twisted.web.server import Site +#from twisted.web.resource import Resource from optparse import OptionParser from configparser import ConfigParser from configparser import NoOptionError -import ipaddress import collections @@ -18,7 +26,7 @@ import syslog clients = { } -def ipaddress(input): +def ipaddr(input): try: r = ipaddress.IPv4Address(input) except AddressValueError: @@ -45,7 +53,9 @@ mtu = 1500 # [relay] [server] -ipif = userv root ipif %(host),%(relay),%(mtu),slip %(network) +ipif = userv root ipif %(host)s,%(relay)s,%(mtu)s,slip %(network)s +addrs = 127.0.0.1 ::1 +port = 80 [limits] max_batch_down = 262144 @@ -53,6 +63,26 @@ max_queue_time = 121 max_request_time = 121 ''' +#---------- "router" ---------- + +def route(packet, daddr): + try: client = clients[daddr] + except KeyError: dclient = None + if dclient is not None: + dclient.queue_outbound(packet) + elif daddr == host or daddr not in network: + queue_inbound(packet) + elif daddr == relay: + log_discard(packet, saddr, daddr, 'relay') + else: + log_discard(packet, saddr, daddr, 'no client') + +def log_discard(packet, saddr, daddr, why): + syslog.syslog(syslog.LOG_DEBUG, + 'discarded packet %s -> %s (%s)' % (saddr, daddr, why)) + +#---------- ipif (slip subprocess) ---------- + class IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol): def __init__(self): self._buffer = b'' @@ -64,27 +94,22 @@ class IpifProcessProtocol(twisted.internet.protocol.ProcessProtocol): for packet in packets: (saddr, daddr) = packet_addrs(packet) route(packet, daddr) + def processEnded(self, status): + status.raiseException() def start_ipif(): - reactor.spawnProcess(IpifProcessProtocol(), - '/bin/sh',['-c', ipif_command], + global ipif + ipif = IpifProcessProtocol() + reactor.spawnProcess(ipif, + '/bin/sh',['sh','-c', ipif_command], childFDs={0:'w', 1:'r', 2:2}) -def log_discard(packet, saddr, daddr, why): - syslog.syslog(syslog.LOG_DEBUG, - 'discarded packet %s -> %s (%s)' % (saddr, daddr, why)) +def queue_inbound(packet): + ipif.transport.write(slip_delimiter) + ipif.transport.write(slip_encode(packet)) + ipif.transport.write(slip_delimiter) -def route(packet. daddr): - try: client = clients[daddr] - except KeyError: dclient = None - if dclient is not None: - dclient.queue_outbound(packet) - else if daddr = host or daddr not in network: - queue_inbound(packet) - else if daddr = relay: - log_discard(packet, saddr, daddr, 'relay') - else: - log_discard(packet, saddr, daddr, 'no client') +#---------- client ---------- class Client(): def __init__(self, ip, cs): @@ -136,7 +161,7 @@ class Client(): # now request is an unfinished request, or None try: (queuetime, packet) = self._pq[0] - except: IndexError: + except IndexError: # no packets, oh well break @@ -170,6 +195,44 @@ class Client(): request.finish() # round again, looking for more to do +class IphttpResource(twisted.web.resource.Resource): + def render_POST(self, request): + # find client, update config, etc. + ci = ipaddr(request.args['i']) + c = clients[ci] + pw = request.args['pw'] + if pw != c.pw: raise ValueError('bad password') + + # update config + for r, w in (('mbd', 'max_batch_down'), + ('mqt', 'max_queue_time'), + ('mrt', 'max_request_time')): + try: v = request.args[r] + except KeyError: continue + v = int(v) + c.__dict__[w] = v + + try: d = request.args['d'] + except KeyError: d = '' + + c.process_arriving_data(d) + c.new_request(request) + +def start_http(): + resource = IphttpResource() + sitefactory = twisted.web.server.Site(resource) + for addrspec in cfg.get('server','addrs').split(): + try: + addr = ipaddress.IPv4Address(addrspec) + endpointfactory = twisted.internet.endpoints.TCP4ServerEndpoint + except AddressValueError: + addr = ipaddress.IPv6Address(addrspec) + endpointfactory = twisted.internet.endpoints.TCP6ServerEndpoint + ep = endpointfactory(reactor, cfg.getint('server','port'), addr) + ep.listen(sitefactory) + +#---------- config and setup ---------- + def process_cfg(): global network global host @@ -183,55 +246,45 @@ def process_cfg(): try: host = cfg.get('virtual','host') except NoOptionError: - host = network.hosts().next() + host = next(network.hosts()) try: relay = cfg.get('virtual','relay') - except OptionError: + except NoOptionError: for search in network.hosts(): - if search = host: continue + if search == host: continue relay = search break for cs in cfg.sections(): if not (':' in cs or '.' in cs): continue - ci = ipaddress(cs) + ci = ipaddr(cs) if ci not in network: raise ValueError('client %s not in network' % ci) if ci in clients: raise ValueError('multiple client cfg sections for %s' % ci) clients[ci] = Client(ci, cs) + global mtu + mtu = cfg.get('virtual','mtu') + iic_vars = { } for k in ('host','relay','mtu','network'): iic_vars[k] = globals()[k] ipif_command = cfg.get('server','ipif', vars=iic_vars) -class FormPage(Resource): - def render_POST(self, request): - # find client, update config, etc. - ci = ipaddress(request.args['i']) - c = clients[ci] - pw = request.args['pw'] - if pw != c.pw: raise ValueError('bad password') - - # update config - for r, w in (('mbd', 'max_batch_down'), - ('mqt', 'max_queue_time'), - ('mrt', 'max_request_time')): - try: v = request.args[r] - except KeyError: continue - v = int(v) - c.__dict__[w] = v - - try: d = request.args['d'] - except KeyError: d = '' - - c.process_arriving_data(d) - c.new_request(request) +def crash_on_critical(event): + if event.get('log_level') >= LogLevel.critical: + print('crashing: ', twisted.logger.formatEvent(event), file=sys.stderr) + #print('crashing!', file=sys.stderr) + #os._exit(1) + try: reactor.stop() + except twisted.internet.error.ReactorNotRunning: pass def startup(): + global cfg + op = OptionParser() op.add_option('-c', '--config', dest='configfile', default='/etc/hippottd/server.conf') @@ -239,10 +292,15 @@ def startup(): (opts, args) = op.parse_args() if len(args): op.error('no non-option arguments please') + twisted.logger.globalLogPublisher.addObserver(crash_on_critical) + cfg = ConfigParser() cfg.read_string(defcfg) - cfg.read_file(opts['configfile']) + cfg.read(opts.configfile) process_cfg() start_ipif() start_http() + +startup() +reactor.run()