Add recording of installations.

The tool shouldn't be released with this code unaltered, because a cracker
with access to this file would immediately learn of other machines that
the victim has access to and get to them.

diff --git a/ssh-installkeys b/ssh-installkeys
index 3fd3e0eed5fc4994d21eb02aba363b99a39eee86..ee89a4aa7e7916d007aab12fa62ce354d0c3f05a 100755 (executable)
--- a/ssh-installkeys
+++ b/ssh-installkeys
@@ -15,7 +15,7 @@ Options:
 
 Author: Eric S. Raymond <esr@thyrsus.com>"""
 
-import os, sys, getopt, getpass, tempfile
+import os, sys, getopt, getpass, tempfile, ConfigParser
 
 ###############################################################################
 #
@@ -612,7 +612,7 @@ class ssh_session:
  
         return child.before
     def ssh(self, command):
-        "Execute a command on the remote host."
+        "Execute a command on the remote host, returning its output."
         return self.__exec("ssh -p %s -l %s %s \"%s\"" % (session.port,
                                                           self.user,
                                                           self.host,
@@ -630,6 +630,27 @@ class ssh_session:
         else:
             return seen.split()[0]     # Return permission field of listing.
 
+class KeyConfig(ConfigParser.RawConfigParser):
+    "Store our state about remote keys."
+    def __init__(self):
+        ConfigParser.RawConfigParser.__init__(self)
+        self.read(os.path.expanduser('~/.ssh-installkeys'))
+    def save(self):
+        self.write(open(os.path.expanduser('~/.ssh-installkeys'), "w"))
+    def readremote(self, session):
+        authorized = session.ssh("cat ~/.ssh/authorized_keys")
+        keydict = {}
+        for line in authorized.split("\n"):
+            if line:
+                (keytype, content, keyid) = line.strip().split()
+                if keyid not in keydict:
+                    keydict[keyid] = []
+                keydict[keyid].append(keytype)
+        self.remove_section(session.host)
+        self.add_section(session.host)
+        for (keyid, types) in keydict.items():
+            self.set(session.host, keyid, ",".join(types))
+
 def die(msg):
     "Die quietly."
     print msg
@@ -685,6 +706,8 @@ if __name__ == '__main__':
         elif (switch == '-v'):
             verbose = 1
 
+    config = KeyConfig()
+
     if not arguments:
         print "No remote host specified."
         print __doc__
@@ -745,6 +768,7 @@ if __name__ == '__main__':
 
     if delete:
         os.system('ssh -l %s %s "rm -fr .ssh"' % (login, host))
+        config.remove_section(host)
         print "Keys for %s on %s have been deleted." % (login, host)
         raise SystemExit, 0
 
@@ -767,9 +791,11 @@ if __name__ == '__main__':
         # OK, install keys remotely if they don't exist
         if session.exists("~/.ssh/authorized_keys"):
             print "authorized_keys already exists on", host
+            config.readremote(session)
         elif not check:
             print "Copying your public keys to", host
             session.scp(keyfile, "~/.ssh/authorized_keys")
+            config.readremote(session)
     except SystemExit:
         pass
     except RuntimeError:
@@ -780,5 +806,6 @@ if __name__ == '__main__':
         print "Check is complete."
     else:
         print "Keys for %s on %s have been installed." % (login, host)
+    config.save()
 
 # End

diff --git a/ssh-installkeys.xml b/ssh-installkeys.xml
index d05312783ab9bfcc1780c944779b2ce5ff5fb2b0..a952027e7d7242d30a902fd2e50530332eef0093 100644 (file)
--- a/ssh-installkeys.xml
+++ b/ssh-installkeys.xml
@@ -42,6 +42,12 @@ public keys should be installed.  If it contains a @, the part before
 the @ will be clipped off and used as the login name. Otherwise your
 local login name will be used.</para>
 
+<para>Places where you install keys will be recorded in
+<filename>~/.ssh/installkeys</filename>. This configuration file will 
+also be updated when you use the check option, so you can use
+that option to check sites where you may have previously installed
+keys and add them to the list.</para>
+
 <para>Note: this script does not parse your ssh configuration &mdash;
 therefore, if you have specified a different remote user in your
 configuration, this script will not know that.  You can use the