New option to list a user's (or all) extant tokens.

diff --git a/.userv/rc b/.userv/rc
index 9549421bcee08172bb8168c28beca6822bf807c2..84843a34dead5b409b68436a92dc172ce2fd33d0 100644 (file)
--- a/.userv/rc
+++ b/.userv/rc
@@ -15,6 +15,11 @@ if glob service revoke
        execute bin/uwrap revoke
 fi
 
+if glob service list
+       no-suppress-args
+       execute bin/uwrap list
+fi
+
 if glob service help
        no-suppress-args
        execute bin/uwrap help

diff --git a/bin/cryptomail b/bin/cryptomail
index 3a24d042cf639c3b1506aecaffb9225d0229fdbc..9559acc49a194e1e96f29415f66fc8b17e465023 100755 (executable)
--- a/bin/cryptomail
+++ b/bin/cryptomail
@@ -392,6 +392,9 @@ def timecmp(x, y):
   else:
     return cmp(x, y)
 
+def token(c, id):
+  return M.base32_encode(c.encrypt(id)).strip('=').lower()
+
 def cmd_generate(argv):
   try:
     opts, argv = getopt(argv, 't:c:f:i:',
@@ -432,10 +435,8 @@ def cmd_generate(argv):
   a['addr'] = [addr]
   if user is not None:
     a['user'] = [user]
-  c = Crypto(k).encrypt(a.id)
   db.setexpire(a.id, expwhen)
-  print format.replace('%', M.base32_encode(Crypto(k).encrypt(a.id)).
-                       strip('=').lower())
+  print format.replace('%', token(Crypto(k), a.id))
   db.commit()
   kr.save()
 commands['generate'] = \
@@ -516,6 +517,21 @@ Check address token LOCAL.  On failure, report reason to stderr and exit
 111.  On success, write forwarding address to stdout and exit 0.  Expects
 the message on standard input, as a seekable file.""")
 
+ignore = {'user': 1, 'addr': 1}
+def show(db, a):
+  keys = a.keys()
+  keys.sort()
+  for k in keys:
+    if k in ignore:
+      continue
+    for v in a[k]:
+      print '\t%s: %s' % (k, v)
+  expwhen = db.expiry(a.id)
+  if expwhen:
+    print '\texpires: %s' % expwhen
+  else:
+    print '\tno-expiry'
+
 def cmd_info(argv):
   try:
     opts, argv = getopt(argv, '', [])
@@ -532,16 +548,8 @@ def cmd_info(argv):
       raise Reject, 'not your token'
     if 'addr' not in a:
       die('unknown token (expired?)')
-    keys = a.keys()
-    keys.sort()
-    for k in keys:
-      for v in a[k]:
-        print '%s: %s' % (k, v)
-    expwhen = db.expiry(id)
-    if expwhen:
-      print 'expires: %s'
-    else:
-      print 'no-expiry'
+    print 'addr: %s' % a['addr'][0]
+    show(db, a)
   except Reject, msg:
     die('invalid token')
 commands['info'] = \
@@ -574,6 +582,33 @@ commands['revoke'] = \
   (cmd_revoke, 'LOCAL', """
 Revoke the token LOCAL.""")
 
+def cmd_list(argv):
+  try:
+    opts, argv = getopt(argv, '', [])
+  except GetoptError:
+    return 1
+  if argv:
+    return 1
+  c = Crypto(C.KeyFile(keyfile, C.KOPEN_READ)[tag])
+  db = CMDB(dbfile)
+  if not user:
+    gen = db.select('SELECT DISTINCT id FROM attrset')
+  else:
+    gen = db.select('''SELECT DISTINCT attrset.id
+                               FROM attrset, attr ON attrset.attr = attr.id
+                               WHERE attr.key = 'user' AND attr.value = ?''',
+                    [user])
+  for id, in gen:
+    a = AttrMultiMap(db, id)    
+    print '%s %s%s' % \
+          (token(c, id),
+           a.get('addr', '<no-address>')[0],
+           (not user and ' [%s]' % a.get('user', ['<no-user>'])[0] or ''))
+    show(db, a)
+commands['list'] = \
+  (cmd_list, '', """
+List the user's tokens and information about them.""")
+
 def cmd_cleanup(argv):
   try:
     opts, argv = getopt(argv, '', [])