document that nonce-based authentication is for the future

[hippotat.git] / hippotatd

diff --git a/hippotatd b/hippotatd
index bc556507a63ceccb7da2c09fd74374381bac100c..8fb0e0c7333163366050e2633ecff42e36be06ee 100755 (executable)
--- a/hippotatd
+++ b/hippotatd
@@ -64,7 +64,7 @@ def route(packet, iface, saddr, daddr):
   elif daddr == c.vaddr or daddr not in c.vnetwork:
     lt('inbound')
     queue_inbound(ipif, packet)
-  elif daddr == c.relay:
+  elif daddr == c.vrelay:
     lt('discard relay')
     log_discard(packet, iface, saddr, daddr, 'relay')
   else:
@@ -104,7 +104,8 @@ class Client():
 
   def _req_cancel(self, request):
     self._log(DBG.HTTP_CTRL, 'cancel', idof=request)
-    request.finish()
+    try: request.finish()
+    except Exception: pass
 
   def _req_error(self, err, request):
     self._log(DBG.HTTP_CTRL, 'error %s' % err, idof=request)
@@ -125,7 +126,7 @@ class Client():
     nf = request.notifyFinish()
     nf.addErrback(self._req_error, request)
     nf.addCallback(self._req_fin, request, cl)
-    self._rq.append(request)
+    self._rq.append((request,nf))
     self._check_outbound()
 
   def _req_write(self, req, d):
@@ -135,9 +136,9 @@ class Client():
   def _check_outbound(self):
     log_debug(DBG.HTTP_CTRL, 'CHKO')
     while True:
-      try: request = self._rq[0]
+      try: (request,nf) = self._rq[0]
       except IndexError: request = None
-      if request and request.finished:
+      if request and nf.called:
         self._log(DBG.HTTP_CTRL, 'CHKO req finished, discard', idof=request)
         self._rq.popleft()
         continue
@@ -165,7 +166,7 @@ class Client():
       # round again, looking for more to do
 
     while len(self._rq) > self.cc.target_requests_outstanding:
-      request = self._rq.popleft()
+      (request, nf) = self._rq.popleft()
       self._log(DBG.HTTP, 'CHKO above target, returning empty', idof=request)
       request.finish()
 
@@ -217,7 +218,7 @@ class NotStupidResource(twisted.web.resource.Resource):
   # why this is not the default is a mystery!
   def getChild(self, name, request):
     if name == b'': return self
-    else: return twisted.web.resource.Resource.getChild(name, request)
+    else: return twisted.web.resource.Resource.getChild(self, name, request)
 
 class IphttpResource(NotStupidResource):
   def render_POST(self, request):
@@ -296,9 +297,10 @@ def process_cfg(_opts, putative_servers, putative_clients):
 
   global c
   c = ConfigResults()
-  c.server = cfg.get('SERVER','server')
+  try: c.server = cfg1get('SERVER','server')
+  except NoOptionError: c.server = 'SERVER'
 
-  cfg_process_common(c, c.server)
+  cfg_process_general(c, c.server)
   cfg_process_saddrs(c, c.server)
   cfg_process_vnetwork(c, c.server)
   cfg_process_vaddr(c, c.server)
@@ -312,21 +314,24 @@ def process_cfg(_opts, putative_servers, putative_clients):
     Client(ci, cc)
 
   try:
-    c.vrelay = cfg.get(c.server, 'vrelay')
+    c.vrelay = cfg1get(c.server, 'vrelay')
   except NoOptionError:
     for search in c.vnetwork.hosts():
       if search == c.vaddr: continue
       c.vrelay = search
       break
 
+  try: c.ifname = cfg1get(c.server, 'ifname_server', raw=True)
+  except NoOptionError: pass
+
   cfg_process_ipif(c,
-                   [c.server, 'DEFAULT'],
+                   [c.server, 'COMMON'],
                    (('local','vaddr'),
                     ('peer', 'vrelay'),
                     ('rnets','vnetwork')))
 
   if opts.printconfig is not None:
-    try: val = cfg.get(c.server, opts.printconfig)
+    try: val = cfg1get(c.server, opts.printconfig)
     except NoOptionError: pass
     else: print(val)
     sys.exit(0)
@@ -346,7 +351,9 @@ def catch_termination():
     raise RuntimeError('did not die due to signal %s !' % name)
 
   for sig in (signal.SIGINT, signal.SIGTERM):
-    signal.signal(sig, partial(signal_handler, sig.name))
+    try: signame = sig.name
+    except AttributeError: signame = "signal %d" % sig
+    signal.signal(sig, partial(signal_handler, signame))
 
 def daemonise():
   global syslogfacility
@@ -359,6 +366,7 @@ def daemonise():
                    facility=facilnum,
                    logoption=syslog.LOG_PID)
     def emit(event):
+      if logevent_is_boringtwisted(event): return
       m = twisted.logger.formatEvent(event)
       #print(repr(event), m, file=org_stderr)
       level = event.get('log_level')
@@ -368,6 +376,10 @@ def daemonise():
       elif level == LogLevel.warn             : sl = syslog.LOG_WARNING
       else                                    : sl = syslog.LOG_INFO
       syslog.syslog(sl,m)
+      failure = event.get('log_failure')
+      if failure is not None:
+        for l in failure.getTraceback().split('\n'):
+          syslog.syslog(sl,l)
     glp = twisted.logger.globalLogPublisher
     glp.addObserver(emit)
     log_debug(DBG.INIT, 'starting to log to syslog')
@@ -397,16 +409,15 @@ def daemonise():
     if grandchildpid:
       # we are the intermediate child
       if opts.pidfile is not None:
-        print(grandchildpid, file=pfh)
-        pfh.close()
+        print(grandchildpid, file=pidfile_h)
+        pidfile_h.close()
       os._exit(0)
 
-    mypid = os.getpid()
-    pfh.close()
+    if opts.pidfile is not None:
+      pidfile_h.close()
                                                                         
     logger = subprocess.Popen(['logger','-d',
-                               '-t','hippotat(stderr)',
-                               '--id=%d' % mypid,
+                               '-t','hippotat[%d](stderr)' % os.getpid(),
                                '-p',opts.syslogfacility + '.err'],
                               stdin=subprocess.PIPE,
                               stdout=subprocess.DEVNULL,