[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.1-65-g74acb0d

X2Go dev team git-admin at x2go.org
Thu Feb 21 18:38:32 CET 2013


The branch, master has been updated
       via  74acb0d029a9d94f01251274f939425b0bf9d6b3 (commit)
      from  6d09a1ccc82eab4b46e8133c8d6246f2c4761e69 (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 74acb0d029a9d94f01251274f939425b0bf9d6b3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 21 18:41:35 2013 +0100

    create {broker_home}/.ssh before importing authorized_keys

-----------------------------------------------------------------------

Summary of changes:
 sbin/x2gobroker-pubkeyauthorizer |   10 ++++++++++
 1 file changed, 10 insertions(+)

The diff of changes is:
diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer
index 0365b96..2dc9dd4 100755
--- a/sbin/x2gobroker-pubkeyauthorizer
+++ b/sbin/x2gobroker-pubkeyauthorizer
@@ -90,8 +90,18 @@ if __name__ == '__main__':
         logger_error.error('Cannot proceed without having an URL specified. Use --broker-url as cmdline parameter. Exiting...')
         sys.exit(-2)
 
+    if not os.path.exists(broker_home):
+        logger_error.error('The home directory {home} of user {user} does not exists. Cannot continue. Exiting...'.format(home=broker_home, user=broker_uid))
+        sys.exit(-2)
+
     logger_broker.info('Authorizing access to this X2Go server for X2Go Session Broker at URL {url}'.format(url=cmdline_args.broker_url))
 
+    if not os.path.exists('{home}/.ssh'.format(home=broker_home)):
+        os.mkdir('{home}/.ssh'.format(home=broker_home))
+        os.chown('{home}/.ssh'.format(home=broker_home), broker_uidnumber, broker_gidnumber)
+        os.chmod('{home}/.ssh'.format(home=broker_home), 0750)
+        logger_broker.info('  Created {home}/.ssh'.format(home=broker_home)
+
     # FIXME: this probably needs some sanity checks(?)
     tmpfile_name, httpmsg = urllib.urlretrieve(cmdline_args.broker_url)
 


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).




More information about the x2go-commits mailing list