The branch, master has been updated via b5b429ae7e66d9194f189495f7a90d92d72ba20d (commit) from 858156403553f936da5eb1765a855c12991e8329 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b5b429ae7e66d9194f189495f7a90d92d72ba20d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 21 11:47:54 2013 +0100 more fixes around x2gobroker-keygen ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-keygen | 43 ++++++++++++++++++++++++++++--------------- x2gobroker/loggers.py | 2 +- 2 files changed, 29 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen index 2307dd6..fe9fee6 100755 --- a/sbin/x2gobroker-keygen +++ b/sbin/x2gobroker-keygen @@ -111,20 +111,33 @@ if __name__ == '__main__': # generate key pair if cmdline_args.key_type.upper() == 'RSA': key = paramiko.RSAKey.generate(2048) - elif cmdine_args.key_type.upper() == 'DSA': - key = paramiko.DSAKey.generate(2048) - - logger_broker.info(' {key_type} key has been generated, fingerprint is {fingerprint}'.format(key_type=cmdline_args.key_type.upper(), fingerprint=binascii.hexlify(key.get_fingerprint()))) - - key.write_private_key_file('{home}/.ssh/id_rsa'.format(home=broker_home)) - os.chown('{home}/.ssh/id_rsa'.format(home=broker_home), broker_uidnumber, broker_gidnumber) - os.chmod('{home}/.ssh/id_rsa'.format(home=broker_home), 0600) - logger_broker.info(' Private key written to file {key_file}'.format(key_file='{home}/.ssh/id_rsa'.format(home=broker_home))) - - pubkey_file = open('{home}/.ssh/id_rsa.pub'.format(home=broker_home),'w') - pubkey_file.write("ssh-rsa " +key.get_base64()) + id_file = 'id_rsa' + elif cmdline_args.key_type.upper() == 'DSA': + key = paramiko.DSSKey.generate(1024) + id_file = 'id_dsa' + + logger_broker.info(' The {key_type} key has been generated, fingerprint is {fingerprint}'.format(key_type=cmdline_args.key_type.upper(), fingerprint=binascii.hexlify(key.get_fingerprint()))) + + if os.path.exists('{home}/.ssh/{id_file}'.format(home=broker_home, id_file=id_file)) and not cmdline_args.force: + logger_broker.error(' Private key {home}/.ssh/{id_file} exists. Use --force to overwrite the file and regenerate a new key pair. Exiting...'.format(home=broker_home, id_file=id_file)) + sys.exit(-3) + elif os.path.exists('{home}/.ssh/{id_file}'.format(home=broker_home, id_file=id_file)): + logger_broker.warn('WARNING: you requested to overwrite existing key files!!!') + + key.write_private_key_file('{home}/.ssh/{id_file}'.format(home=broker_home, id_file=id_file)) + os.chown('{home}/.ssh/{id_file}'.format(home=broker_home, id_file=id_file), broker_uidnumber, broker_gidnumber) + os.chmod('{home}/.ssh/{id_file}'.format(home=broker_home, id_file=id_file), 0600) + logger_broker.info(' Private key written to file {key_file}'.format(key_file='{home}/.ssh/{id_file}'.format(home=broker_home, id_file=id_file))) + + pubkey_file = open('{home}/.ssh/{id_file}.pub'.format(home=broker_home, id_file=id_file),'w') + if id_file == 'id_rsa': + pubkey_file.write("ssh-rsa " +key.get_base64()) + elif id_file == 'id_dsa': + pubkey_file.write("ssh-dsa " +key.get_base64()) pubkey_file.close() - os.chown('{home}/.ssh/id_rsa,pub'.format(home=broker_home), broker_uidnumber, broker_gidnumber) - os.chmod('{home}/.ssh/id_rsa.pub'.format(home=broker_home), 0600) - logger_broker.info(' Public key written to file {key_file}'.format(key_file='{home}/.ssh/id_rsa.pub'.format(home=broker_home))) + os.chown('{home}/.ssh/{id_file}.pub'.format(home=broker_home, id_file=id_file), broker_uidnumber, broker_gidnumber) + os.chmod('{home}/.ssh/{id_file}.pub'.format(home=broker_home, id_file=id_file), 0644) + logger_broker.info(' Public key written to file {key_file}'.format(key_file='{home}/.ssh/{id_file}.pub'.format(home=broker_home, id_file=id_file))) + + logger_broker.info('Key file generation has been successful!') diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 303e2b9..5be50f3 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -36,7 +36,7 @@ else: X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" # standalone daemon mode (x2gobroker-daemon) or interactive mode (called from the cmdline)? -if getpass.getuser() == X2GOBROKER_DAEMON_USER: +if getpass.getuser() in (X2GOBROKER_DAEMON_USER, 'root'): # we run in standalone daemon mode, so let's use the system configuration for logging logging.config.fileConfig(X2GOBROKER_LOGCONFIG) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).