Fix some format and other varargs errors.

[tripe] / keys / tripe-keys.in

diff --git a/keys/tripe-keys.in b/keys/tripe-keys.in
index 6e947e52c2a68fc2e803f2874f28c34ddf5c3148..ad8671e1407ad1e6fa586b511e9b09ebc458c3ae 100644 (file)
--- a/keys/tripe-keys.in
+++ b/keys/tripe-keys.in
@@ -33,6 +33,7 @@ import sys as SYS
 import re as RX
 import getopt as O
 import shutil as SH
+import time as T
 import filecmp as FC
 from cStringIO import StringIO
 from errno import *
@@ -59,6 +60,12 @@ rx_nonalpha = RX.compile(r'\W')
 ## Match the literal string "<SEQ>".
 rx_seq = RX.compile(r'\<SEQ\>')
 
+## Match a shell metacharacter.
+rx_shmeta = RX.compile('[\\s`!"#$&*()\\[\\];\'|<>?\\\\]')
+
+## Match a character which needs escaping in a shell double-quoted string.
+rx_shquote = RX.compile(r'["`$\\]')
+
 ###--------------------------------------------------------------------------
 ### Utility functions.
 
@@ -97,6 +104,20 @@ def subst(s, rx, map):
   out.write(s[i:])
   return out.getvalue()
 
+def shell_quotify(arg):
+  """
+  Quotify ARG to keep the shell happy.
+
+  This isn't actually used for invoking commands, just for presentation
+  purposes; but correctness is still nice.
+  """
+  if not rx_shmeta.search(arg):
+    return arg
+  elif arg.find("'") == -1:
+    return "'%s'" % arg
+  else:
+    return '"%s"' % rx_shquote.sub(lambda m: '\\' + m.group(0), arg)
+
 def rmtree(path):
   """Delete the directory tree given by PATH."""
   try:
@@ -142,7 +163,7 @@ def run(args):
     else:
       nargs += a[1:].split()
   args = nargs
-  print '+ %s' % ' '.join(args)
+  print '+ %s' % ' '.join([shell_quotify(arg) for arg in args])
   SYS.stdout.flush()
   rc = OS.spawnvp(OS.P_WAIT, args[0], args)
   if rc != 0:
@@ -220,6 +241,7 @@ def conf_defaults():
                ('kx-param', lambda: {'dh': '-LS -b3072 -B256',
                                      'ec': '-Cnist-p256'}[conf['kx']]),
                ('kx-expire', 'now + 1 year'),
+               ('kx-warn-days', '28'),
                ('cipher', 'rijndael-cbc'),
                ('hash', 'sha256'),
                ('master-keygen-flags', '-l'),
@@ -343,8 +365,8 @@ def cmd_setup(args):
   OS.mkdir('repos')
   run('''key -krepos/param add
     -a${kx}-param !${kx-param}
-    -eforever -tparam tripe-${kx}-param
-    cipher=${cipher} hash=${hash} mac=${mac} mgf=${mgf}''')
+    -eforever -tparam tripe-param
+    kx-group=${kx} cipher=${cipher} hash=${hash} mac=${mac} mgf=${mgf}''')
   cmd_newmaster(args)
 
 ###--------------------------------------------------------------------------
@@ -456,7 +478,7 @@ def cmd_generate(args):
   keyring_pub = 'peer-%s.pub' % tag
   zap('keyring'); zap(keyring_pub)
   run('key -kkeyring merge repos/param')
-  run('key -kkeyring add -a${kx} -pparam -e${kx-expire} -t%s tripe-${kx}' %
+  run('key -kkeyring add -a${kx} -pparam -e${kx-expire} -t%s tripe' %
       tag)
   run('key -kkeyring extract -f-secret %s %s' % (keyring_pub, tag))
 
@@ -473,6 +495,26 @@ def cmd_clean(args):
         r == 'keyring' or r == 'keyring.pub' or r.startswith('peer-')):
       zap(i)
 
+###--------------------------------------------------------------------------
+### Commands: check
+
+def cmd_check(args):
+  now = T.time()
+  thresh = int(conf['kx-warn-days']) * 86400
+  for krf in ['master', 'keyring.pub']:
+    if not OS.path.exists(krf): continue
+    kr = C.KeyFile(krf)
+    for k in kr.itervalues():
+      if k.exptime == C.KEXP_FOREVER: continue
+      elif k.exptime == C.KEXP_EXPIRE: left = -1
+      else: left = k.exptime - now
+      if left < 0:
+        print "key `%s' HAS EXPIRED" % k.tag
+      elif left < thresh:
+        if left >= 86400: n, u, uu = left // 86400, 'day', 'days'
+        else: n, u, uu = left // 3600, 'hour', 'hours'
+        print "key `%s' EXPIRES in %d %s" % (k.tag, n, n == 1 and u or uu)
+
 ###--------------------------------------------------------------------------
 ### Commands: mtu
 
@@ -510,6 +552,7 @@ commands = {'help': (cmd_help, 0, 1, ''),
             'update': (cmd_update, 0, 0, ''),
             'clean': (cmd_clean, 0, 0, ''),
             'mtu': (cmd_mtu, 0, 1, '[PATH-MTU]'),
+            'check': (cmd_check, 0, 0, ''),
             'generate': (cmd_generate, 1, 1, 'TAG'),
             'rebuild': (cmd_rebuild, 0, 0, '')}