Changeset 7657:f3dd54249626

Timestamp:

11/11/07 17:00:08 (6 years ago)

Author:

Yi Qiang <yqiang@…>

Branch:

default

Message:

Refactored setup code a little bit. Bail out if ssh-keygen is not installed when trying to generate keys for the user.

File:

• sage/dsage/scripts/dsage_setup.py (modified) (6 diffs)

sage/dsage/scripts/dsage_setup.py

@@ -56 +56 @@
     return config
 
+def add_default_user():
+    """
+    Adds the default user.
+    
+    """
+    
+    from twisted.conch.ssh import keys
+    import base64
+    from getpass import getuser
+    
+    username = getuser()
+    pubkey_file = os.path.join(DSAGE_DIR, 'dsage_key.pub')
+    clientdb = ClientDatabase()
+    pubkey = base64.encodestring(
+                    keys.getPublicKeyString(filename=pubkey_file).strip())
+    if clientdb.get_user(username) is None:
+        clientdb.add_user(username, pubkey)
+        print 'Added user %s.\n' % (username)
+    else:
+        user, key = clientdb.get_user_and_key(username)
+        if key != pubkey:
+            clientdb.del_user(username)
+            clientdb.add_user(username, pubkey)
+            print "User %s's pubkey changed, setting to new one." % (username)
+        else:
+            print 'User %s already exists.' % (username)
+
 def setup_client(testing=False):
     check_dsage_dir()
@@ -62 +89 @@
         cmd = ["ssh-keygen", "-q", "-trsa", "-P ''", "-f%s" % key_file]
         return
-
+    
+    if not cmd_exists('ssh-keygen'):
+        print DELIMITER
+        print "Could NOT find ssh-keygen."
+        print "Aborting."
+        return
+        
     print DELIMITER
     print "Generating public/private key pair for authentication..."
@@ -68 +101 @@
     print "Just hit enter when prompted for a passphrase"
     print DELIMITER
+    
     cmd = ["ssh-keygen", "-q", "-trsa", "-f%s" % key_file]    
     ld = os.environ['LD_LIBRARY_PATH']
@@ -75 +109 @@
     finally:
         os.environ['LD_LIBRARY_PATH'] = ld
+        
     print "\n"
     print "Client configuration finished.\n"
@@ -131 +166 @@
     f.write(s)
     f.close()
+    
     # Disable certificate generation -- not used right now anyways
     privkey_file = os.path.join(DSAGE_DIR, 'cacert.pem')
     pubkey_file = os.path.join(DSAGE_DIR, 'pubcert.pem')
+    
     print DELIMITER
     print "Generating SSL certificate for server..."
+    
     if os.uname()[0] != 'Darwin' and cmd_exists('openssl'):
         # We use openssl by default if it exists, since it is *vastly*
@@ -157 +195 @@
     subprocess.call(cmd, shell=True)
     print DELIMITER
+    
+    # Set read only permissions on cert
     os.chmod(os.path.join(DSAGE_DIR, 'cacert.pem'), 0600)
     
-    # conf_file = os.path.join(DSAGE_DIR, 'server.conf')
-    # config.write(open(conf_file, 'w'))
-            
     # add default user
-    from twisted.conch.ssh import keys
-    import base64
-
-    # c = ConfigParser.ConfigParser()
-    # c.read(os.path.join(DSAGE_DIR, 'client.conf'))
-    from getpass import getuser
-    username = getuser()
-    pubkey_file = os.path.join(DSAGE_DIR, 'dsage_key.pub')
-    clientdb = ClientDatabase()
-    pubkey = base64.encodestring(
-                    keys.getPublicKeyString(filename=pubkey_file).strip())
-    if clientdb.get_user(username) is None:
-        clientdb.add_user(username, pubkey)
-        print 'Added user %s.\n' % (username)
-    else:
-        user, key = clientdb.get_user_and_key(username)
-        if key != pubkey:
-            clientdb.del_user(username)
-            clientdb.add_user(username, pubkey)
-            print "User %s's pubkey changed, setting to new one." % (username)
-        else:
-            print 'User %s already exists.' % (username)
+    add_default_user()
             
     print "Server configuration finished.\n\n"