X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/b7e1e18b57c30555f65a2548e0f1f186200c0ea8..14b77b60fdb2b36409a403bf8753d877f33e32b9:/keys/tripe-keys.in diff --git a/keys/tripe-keys.in b/keys/tripe-keys.in index b0dbf945..901e09b9 100644 --- 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 "". rx_seq = RX.compile(r'\') +## 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: @@ -217,10 +238,11 @@ def conf_defaults(): ('conf-file', '${base-dir}tripe-keys.conf'), ('upload-hook', ': run upload hook'), ('kx', 'dh'), - ('kx-param', lambda: {'dh': '-LS -b2048 -B256', + ('kx-param', lambda: {'dh': '-LS -b3072 -B256', 'ec': '-Cnist-p256'}[conf['kx']]), ('kx-expire', 'now + 1 year'), - ('cipher', 'blowfish-cbc'), + ('kx-warn-days', '28'), + ('cipher', 'rijndael-cbc'), ('hash', 'sha256'), ('master-keygen-flags', '-l'), ('mgf', '${hash}-mgf'), @@ -235,10 +257,10 @@ def conf_defaults(): 'rsapss': 'rsa', 'ecdsa': 'ec', 'eckcdsa': 'ec'}[conf['sig']]), - ('sig-param', lambda: {'dh': '-LS -b2048 -B256', - 'dsa': '-b2048 -B256', + ('sig-param', lambda: {'dh': '-LS -b3072 -B256', + 'dsa': '-b3072 -B256', 'ec': '-Cnist-p256', - 'rsa': '-b2048'}[conf['sig-genalg']]), + 'rsa': '-b3072'}[conf['sig-genalg']]), ('sig-hash', '${hash}'), ('sig-expire', 'forever'), ('fingerprint-hash', '${hash}')]: @@ -322,8 +344,9 @@ Subcommands available: args = commands.keys() args.sort() for c in args: - func, min, max, help = commands[c] - print '%s %s' % (c, help) + try: func, min, max, help = commands[c] + except KeyError: die("unknown command `%s'" % c) + print '%s%s%s' % (c, help and ' ', help) ###-------------------------------------------------------------------------- ### Commands: newmaster @@ -343,8 +366,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 +479,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 +496,38 @@ def cmd_clean(args): r == 'keyring' or r == 'keyring.pub' or r.startswith('peer-')): zap(i) +###-------------------------------------------------------------------------- +### Commands: check + +def check_key(k): + now = T.time() + thresh = int(conf['kx-warn-days']) * 86400 + if k.exptime == C.KEXP_FOREVER: return None + elif k.exptime == C.KEXP_EXPIRE: left = -1 + else: left = k.exptime - now + if left < 0: + return "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' + return "key `%s' EXPIRES in %d %s" % (k.tag, n, n == 1 and u or uu) + else: + return None + +def cmd_check(args): + if OS.path.exists('keyring.pub'): + for k in C.KeyFile('keyring.pub').itervalues(): + whinge = check_key(k) + if whinge is not None: print whinge + if OS.path.exists('master'): + whinges = [] + for k in C.KeyFile('master').itervalues(): + whinge = check_key(k) + if whinge is None: break + whinges.append(whinge) + else: + for whinge in whinges: print whinge + ###-------------------------------------------------------------------------- ### Commands: mtu @@ -500,9 +555,6 @@ def cmd_mtu(args): ###-------------------------------------------------------------------------- ### Main driver. -## Exceptions. -class UsageError (Exception): pass - commands = {'help': (cmd_help, 0, 1, ''), 'newmaster': (cmd_newmaster, 0, 0, ''), 'setup': (cmd_setup, 0, 0, ''), @@ -510,6 +562,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, '')} @@ -549,10 +602,12 @@ def main(argv): cmd_help([]) else: c = argv[1] - func, min, max, help = commands[c] + try: func, min, max, help = commands[c] + except KeyError: die("unknown command `%s'" % c) args = argv[2:] - if len(args) < min or (max > 0 and len(args) > max): - raise UsageError, (c, help) + if len(args) < min or (max is not None and len(args) > max): + SYS.stderr.write('Usage: %s %s%s%s\n' % (quis, c, help and ' ', help)) + SYS.exit(1) func(args) ###----- That's all, folks --------------------------------------------------