X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=server;h=68a3ebd0c26a0189de9b67fe056c16a26db92746;hp=46ce5ed9cc4558966dd1b97f0a79701c59590d5e;hb=d579a04817c1a141e715481a18fe7d71568c451d;hpb=c4b6d9904e814113a10b7f343a3bbfe8c68043d3 diff --git a/server b/server index 46ce5ed..68a3ebd 100755 --- a/server +++ b/server @@ -1,124 +1,210 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 -from twisted.web.server import Site -from twisted.web.resource import Resource +from hippotat import * + +import os + +import twisted.internet from twisted.web.server import NOT_DONE_YET -from twisted.internet import reactor -import ConfigParser -import ipaddress +#import twisted.web.server import Site +#from twisted.web.resource import Resource import syslog clients = { } -def ipaddress(input): - try: - r = ipaddress.IPv4Address(input) - except AddressValueError: - r = ipaddress.IPv6Address(input) - return r +#---------- "router" ---------- -def ipnetwork(input): - try: - r = ipaddress.IPv4Network(input) - except NetworkValueError: - r = ipaddress.IPv6Network(input) - return r - -defcfg = u''' -[default] -max_batch_down: 65536 -max_queue_time: 10 -max_request_time: 54 - -[global] -max_batch_down: 262144 -max_queue_time: 121 -max_request_time: 121 -''' - -def route(packet. daddr): - try: client = clients[daddr] +def route(packet, saddr, daddr): + def lt(dest): + log_data(DBG.ROUTE, packet, 'route: %s -> %s: %s' % (saddr,daddr,dest)) + try: dclient = clients[daddr] except KeyError: dclient = None if dclient is not None: - dclient.queue_outbound_data(packet) - else if daddr = server or daddr not in network: - queue_inbound_data(packet) + lt('client') + dclient.queue_outbound(packet) + elif daddr == c.server or daddr not in c.network: + lt('inbound') + queue_inbound(packet) + elif daddr == relay: + lt('discard relay') + log_discard(packet, saddr, daddr, 'relay') else: - syslog.syslog(syslog.LOG_DEBUG, 'no client for %s' % daddr) + lt('discard no-client') + log_discard(packet, saddr, daddr, 'no-client') + +#---------- client ---------- class Client(): - def __init__(self, ip, cs): + def __init__(self, ip, cs, pw): # instance data members self._ip = ip self._cs = cs - self.pw = cfg.get(cs, 'password') + self.pw = pw + self._rq = collections.deque() # requests + # self._pq = PacketQueue(...) # plus from config: # .max_batch_down # .max_queue_time # .max_request_time - for k in ('max_batch_down','max_queue_time','max_request_time'): + # .target_requests_outstanding + + if ip not in c.network: + raise ValueError('client %s not in network' % ip) + + for k in ('max_batch_down','max_queue_time','max_request_time', + 'target_requests_outstanding'): req = cfg.getint(cs, k) - limit = cfg.getint('global',k) + limit = cfg.getint('limits',k) self.__dict__[k] = min(req, limit) - def process_arriving_data(self, d): - for packet in slip_decode(d): - (saddr, daddr) = ip_64_addrs(packet) - if saddr != self._ip: - raise ValueError('wrong source address %s' % saddr) - route(packet, daddr) + self._pq = PacketQueue(self.max_queue_time) + + if ip in clients: + raise ValueError('multiple client cfg sections for %s' % ip) + clients[ip] = self + + log_debug('DBG.INIT', 'new client %s' % self) + + def process_arriving_data(self, d): + log_data(DBG.FLOW, d, 'client req data: %s' % saddr=self._ip) + for packet in slip.decode(d): + (saddr, daddr) = packet_addrs(packet) + if saddr != self._ip: + raise ValueError('wrong source address %s' % saddr) + route(packet, saddr, daddr) + + def _req_cancel(self, request): + log_httpreq(DBG.HTTPCTRL, request, 'cancel') + request.finish() + + def _req_error(self, err, request): + log_httpreq(DBG.HTTPCTRL, request, 'error %s' % err) + self._req_cancel(request) + + def queue_outbound(self, packet): + self._pq.append(packet) + self._check_outbound() + + def new_request(self, request): + request.setHeader('Content-Type','application/octet-stream') + reactor.callLater(self.max_request_time, self._req_cancel, request) + request.notifyFinish().addErrback(self._req_error, request) + self._rq.append(request) + self._check_outbound() + + def _check_outbound(self): + log_httpreq(DBG.HTTPCTRL, None, 'CHKO') + while True: + try: request = self._rq[0] + except IndexError: request = None + if request and request.finished: + log_httpreq(DBG.HTTP_CTRL, request, 'CHKO request finished, discard') + self._rq.popleft() + continue + + if not self._pq.nonempty(): + # no packets, oh well + log_httpreq(DBG.HTTP_CTRL, request, 'CHKO no packets, OUT-DONE') + break + + if request is None: + # no request + log_httpreq(DBG.HTTP_CTRL, request, 'CHKO no request, OUT-DONE') + break + + log_httpreq(DBG.HTTP_CTRL, request, 'CHKO processing') + # request, and also some non-expired packets + self._pq.process((lambda: request.sentLength), + request.write, + self.max_batch_down) + + assert(request.sentLength) + self._rq.popleft() + request.finish() + log_httpreq(DBG.HTTP, request, 'complete') + # round again, looking for more to do - def _req_cancel(self, request): + while len(self._rq) > self.target_requests_outstanding: + request = self._rq.popleft() + log_httpreq(DBG.HTTP, request, 'CHKO above target, returning empty') request.finish() - def _req_error(self, err, request): - self._req_cancel(request) +def process_request(request, desca): + # find client, update config, etc. + metadata = request.args['m'] + metadata = metadata.split(b'\n') + (ci_s, pw, tro) = metadata.split(b'\n')[0:3] + desca['m'] = [ci_s, tro] + ci = ipaddr(ci_s) + desca['ci'] = ci + cl = clients[ci] + if pw != cl.pw: raise ValueError('bad password') + desca['pwok'=True] + + if tro != cl.target_requests_outstanding: + raise ValueError('tro must be %d' % cl.target_requests_outstanding) + + try: + d = request.args['d'] + desca['d'] = d + except KeyError: d = '' - def http_request(self, request): - request.setHeader('Content-Type','application/octet-stream') - reactor.callLater(self.max_request_time, self._req_cancel, request) - request.notifyFinish().addErrback(self._req_error, request) + cl.process_arriving_data(d) + cl.new_request(request) +class IphttpResource(twisted.web.resource.Resource): + isLeaf = True + def render_POST(self, request): + desca = {'d': None} + try: process_request(request, desca) + except Exception as e: + emsg = str(e).encode('utf-8') + log_http(desca, 'EXCEPTION ' + emsg) + request.setHeader('Content-Type','text/plain; charset="utf-8"') + request.setResponseCode(400) + return emsg + log_http(desca, '... [%s]' % id(request)) + return NOT_DONE_YET + + def render_GET(self, request): + log_debug(DBG.HTTP, 'GET request') + return b'hippotat' + +def start_http(): + resource = IphttpResource() + site = twisted.web.server.Site(resource) + for sa in c.saddrs: + ep = sa.make_endpoint() + crash_on_defer(ep.listen(site)) + log_debug(DBG.INIT, 'listening on %s' % sa) + +#---------- config and setup ---------- + def process_cfg(): - global network - global ourself + process_cfg_common_always() + process_cfg_server() + process_cfg_network() - network = ipnetwork(cfg.get('virtual','network')) try: - ourself = cfg.get('virtual','server') - except ConfigParser.NoOptionError: - ourself = network.hosts().next() - - for cs in cfg.sections(): - if not (':' in cs or '.' in cs): continue - ci = ipaddress(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) - -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) + c.relay = cfg.get('virtual','relay') + except NoOptionError: + for search in c.network.hosts(): + if search == c.server: continue + c.relay = search + break + + process_cfg_saddrs() + process_cfg_clients(Client) + + process_cfg_ipif('server', + (('local','server'), + ('peer', 'relay'), + ('rnets','network'))) + +common_startup() +process_cfg() +start_ipif(c.ipif_command, route) +start_http() +common_run()