X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=server;h=977267940ad772c1572af63cc2421bf7753aa2b9;hb=74934d63b06bf4fc045ac9aabac381cedfe9f10f;hp=68a3ebd0c26a0189de9b67fe056c16a26db92746;hpb=d579a04817c1a141e715481a18fe7d71568c451d;p=hippotat.git diff --git a/server b/server index 68a3ebd..9772679 100755 --- a/server +++ b/server @@ -16,156 +16,181 @@ clients = { } #---------- "router" ---------- -def route(packet, saddr, daddr): +def route(packet, iface, saddr, daddr): def lt(dest): - log_data(DBG.ROUTE, packet, 'route: %s -> %s: %s' % (saddr,daddr,dest)) + log_debug(DBG.ROUTE, 'route: %s -> %s: %s' % (saddr,daddr,dest), d=packet) try: dclient = clients[daddr] except KeyError: dclient = None if dclient is not None: lt('client') dclient.queue_outbound(packet) - elif daddr == c.server or daddr not in c.network: + elif daddr == c.vaddr or daddr not in c.vnetwork: lt('inbound') queue_inbound(packet) - elif daddr == relay: + elif daddr == c.relay: lt('discard relay') - log_discard(packet, saddr, daddr, 'relay') + log_discard(packet, iface, saddr, daddr, 'relay') else: lt('discard no-client') - log_discard(packet, saddr, daddr, 'no-client') + log_discard(packet, iface, saddr, daddr, 'no-client') #---------- client ---------- class Client(): - def __init__(self, ip, cs, pw): + def __init__(self, ip, cc): # instance data members self._ip = ip - self._cs = cs - self.pw = pw + self.cc = cc self._rq = collections.deque() # requests - # self._pq = PacketQueue(...) - # plus from config: - # .max_batch_down - # .max_queue_time - # .max_request_time - # .target_requests_outstanding + self._pq = PacketQueue(str(ip), self.cc.max_queue_time) - 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('limits',k) - self.__dict__[k] = min(req, limit) - - self._pq = PacketQueue(self.max_queue_time) + if ip not in c.vnetwork: + raise ValueError('client %s not in vnetwork' % ip) if ip in clients: raise ValueError('multiple client cfg sections for %s' % ip) clients[ip] = self - log_debug('DBG.INIT', 'new client %s' % self) + self._log(DBG.INIT, 'new') + + def _log(self, dflag, msg, **kwargs): + log_debug(dflag, ('client %s: ' % self._ip)+msg, **kwargs) def process_arriving_data(self, d): - log_data(DBG.FLOW, d, 'client req data: %s' % saddr=self._ip) + self._log(DBG.FLOW, "req data (enc'd)", d=d) + if not len(d): return 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) + route(packet, self._ip, saddr, daddr) def _req_cancel(self, request): - log_httpreq(DBG.HTTPCTRL, request, 'cancel') + self._log(DBG.HTTP_CTRL, 'cancel', idof=request) request.finish() def _req_error(self, err, request): - log_httpreq(DBG.HTTPCTRL, request, 'error %s' % err) + self._log(DBG.HTTP_CTRL, 'error %s' % err, idof=request) self._req_cancel(request) def queue_outbound(self, packet): self._pq.append(packet) self._check_outbound() + def _req_fin(self, dummy, request, cl): + self._log(DBG.HTTP_CTRL, '_req_fin ' + repr(dummy), idof=request) + try: cl.cancel() + except twisted.internet.error.AlreadyCalled: pass + 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) + cl = reactor.callLater(self.cc.http_timeout, self._req_cancel, request) + nf = request.notifyFinish() + nf.addErrback(self._req_error, request) + nf.addCallback(self._req_fin, request, cl) self._rq.append(request) self._check_outbound() + def _req_write(self, req, d): + self._log(DBG.HTTP, 'req_write ', idof=req, d=d) + req.write(d) + def _check_outbound(self): - log_httpreq(DBG.HTTPCTRL, None, 'CHKO') + log_debug(DBG.HTTP_CTRL, '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._log(DBG.HTTP_CTRL, 'CHKO req finished, discard', idof=request) self._rq.popleft() continue if not self._pq.nonempty(): # no packets, oh well - log_httpreq(DBG.HTTP_CTRL, request, 'CHKO no packets, OUT-DONE') + self._log(DBG.HTTP_CTRL, 'CHKO no packets, OUT-DONE', idof=request) break if request is None: # no request - log_httpreq(DBG.HTTP_CTRL, request, 'CHKO no request, OUT-DONE') + self._log(DBG.HTTP_CTRL, 'CHKO no request, OUT-DONE', idof=request) break - log_httpreq(DBG.HTTP_CTRL, request, 'CHKO processing') + self._log(DBG.HTTP_CTRL, 'CHKO processing', idof=request) # request, and also some non-expired packets self._pq.process((lambda: request.sentLength), - request.write, - self.max_batch_down) + (lambda d: self._req_write(request, d)), + self.cc.max_batch_down) assert(request.sentLength) self._rq.popleft() request.finish() - log_httpreq(DBG.HTTP, request, 'complete') + self._log(DBG.HTTP, 'complete', idof=request) # round again, looking for more to do - while len(self._rq) > self.target_requests_outstanding: + while len(self._rq) > self.cc.target_requests_outstanding: request = self._rq.popleft() - log_httpreq(DBG.HTTP, request, 'CHKO above target, returning empty') + self._log(DBG.HTTP, 'CHKO above target, returning empty', idof=request) request.finish() 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] + metadata = request.args[b'm'][0] + metadata = metadata.split(b'\r\n') + (ci_s, pw, tro, cto) = metadata[0:4] + desca['m[0,2:3]'] = [ci_s, tro, cto] + ci_s = ci_s.decode('utf-8') + tro = int(tro); desca['tro']= tro + cto = int(cto); desca['cto']= cto ci = ipaddr(ci_s) desca['ci'] = ci cl = clients[ci] - if pw != cl.pw: raise ValueError('bad password') - desca['pwok'=True] + if pw != cl.cc.password: raise ValueError('bad password') + desca['pwok']=True + + if tro != cl.cc.target_requests_outstanding: + raise ValueError('tro must be %d' % cl.cc.target_requests_outstanding) - if tro != cl.target_requests_outstanding: - raise ValueError('tro must be %d' % cl.target_requests_outstanding) + if cto < cl.cc.http_timeout: + raise ValueError('cto must be >= %d' % cl.cc.http_timeout) try: - d = request.args['d'] + d = request.args[b'd'][0] desca['d'] = d - except KeyError: d = '' + desca['dlen'] = len(d) + except KeyError: + d = b'' + desca['dlen'] = None + + log_http(desca, 'processing', idof=id(request), d=d) + + d = mime_translate(d) cl.process_arriving_data(d) cl.new_request(request) +def log_http(desca, msg, **kwargs): + try: + kwargs['d'] = desca['d'] + del desca['d'] + except KeyError: + pass + log_debug(DBG.HTTP, msg + repr(desca), **kwargs) + class IphttpResource(twisted.web.resource.Resource): isLeaf = True def render_POST(self, request): + log_debug(DBG.HTTP_FULL, + 'req recv: ' + repr(request) + ' ' + repr(request.args), + idof=id(request)) desca = {'d': None} try: process_request(request, desca) except Exception as e: - emsg = str(e).encode('utf-8') - log_http(desca, 'EXCEPTION ' + emsg) + emsg = traceback.format_exc() + log_http(desca, 'RETURNING EXCEPTION ' + emsg) request.setHeader('Content-Type','text/plain; charset="utf-8"') request.setResponseCode(400) - return emsg - log_http(desca, '... [%s]' % id(request)) + return (emsg + ' # ' + repr(desca) + '\r\n').encode('utf-8') + log_debug(DBG.HTTP_CTRL, '...', idof=id(request)) return NOT_DONE_YET def render_GET(self, request): @@ -182,29 +207,39 @@ def start_http(): #---------- config and setup ---------- -def process_cfg(): - process_cfg_common_always() - process_cfg_server() - process_cfg_network() +def process_cfg(putative_servers, putative_clients): + global c + c = ConfigResults() + c.server = cfg.get('SERVER','server') + + cfg_process_common(c, c.server) + cfg_process_saddrs(c, c.server) + cfg_process_vnetwork(c, c.server) + cfg_process_vaddr(c, c.server) + + for (ci,cs) in putative_clients.items(): + cc = ConfigResults() + sections = cfg_process_client_common(cc,c.server,cs,ci) + if not sections: continue + cfg_process_client_limited(cc,c.server,sections, 'max_batch_down') + cfg_process_client_limited(cc,c.server,sections, 'max_queue_time') + Client(ci, cc) try: - c.relay = cfg.get('virtual','relay') + c.vrelay = cfg.get(c.server, 'vrelay') except NoOptionError: - for search in c.network.hosts(): - if search == c.server: continue - c.relay = search + for search in c.vnetwork.hosts(): + if search == c.vaddr: continue + c.vrelay = search break - process_cfg_saddrs() - process_cfg_clients(Client) - - process_cfg_ipif('server', - (('local','server'), - ('peer', 'relay'), - ('rnets','network'))) + cfg_process_ipif(c, + [c.server, 'DEFAULT'], + (('local','vaddr'), + ('peer', 'vrelay'), + ('rnets','vnetwork'))) -common_startup() -process_cfg() -start_ipif(c.ipif_command, route) +common_startup(process_cfg) +start_ipif(c.ipif_command, (lambda p,s,d: route(p,"[ipif]",s,d))) start_http() common_run()