Changeset 1671:b32466ed1d77

Timestamp:

06/25/08 14:42:29 (2 months ago)

Author:

klai@…

Branch:

default

Message:

Clean up reading of ssh keys

Files:

• src/Tycoon/AuctioneerClient.py (modified) (2 diffs)

src/Tycoon/AuctioneerClient.py

@@ -56 +56 @@
     This class encapsulates an auctioneer client.
     """
+    def __read_ssh_keys(self, file_name):
+        """
+        """
+        rfn = os.path.expanduser(file_name)
+        if not os.path.exists(rfn):
+            return
+        f = file(rfn, "r")
+        keys = "".join(f.readlines())
+        if not DSA.is_key_ssh(keys):
+            return
+        key_string = self.__ssh_public_key_string
+        if (key_string != "" and key_string[-1] != "\n"):
+            key_string += "\n"
+        key_string += keys
+        self.__ssh_public_key_string = key_string
+
     def __init__(
         self, options, reactor, bank, host_name, bank_account_key=None,
@@ -69 +85 @@
         self.__remote_host_addr = host_name
         
+        # Read in user ssh key information
         self.__ssh_public_key_string = ssh_public_key_string
-        # Check if the bank account key is also an ssh key
-        if not bank_account_key:
-            k = DSA()
-            if k.is_key_ssh(self.__options.PublicKeyFileName):
-                if (self.__ssh_public_key_string != "" and
-                    self.__ssh_public_key_string[-1] != "\n"):
-                    self.__ssh_public_key_string += "\n"
-                f = file(os.path.expanduser(self.__options.PublicKeyFileName),
-                         "r")
-                self.__ssh_public_key_string += f.readline()
-                
-        # Read in user ssh key information
-        ssh_fns = self.__options.SSHPublicKeyFileNames
-        for fn in ssh_fns:
-            rfn = os.path.expanduser(fn)
-            if not os.path.exists(rfn):
-                continue
-            f = file(rfn, "r")
-            keys = "".join(f.readlines())
-            if (self.__ssh_public_key_string != "" and
-                self.__ssh_public_key_string[-1] != "\n"):
-                self.__ssh_public_key_string += "\n"
-            self.__ssh_public_key_string += keys
-            f.close()
+        ssh_fns = tuple(self.__options.SSHPublicKeyFileNames)
+        for fn in ssh_fns + (self.__options.PublicKeyFileName,):
+            self.__read_ssh_keys(fn)
         if self.__ssh_public_key_string == "":
-            raise Exception("SSH public key was not specified and could not be found: %s" % (ssh_fns,))
+            raise Exception(
+                "SSH public key was not specified "
+                "and could not be found: %s" % (ssh_fns,))
         
         # Read in user key information