[X2Go-Commits] [x2gobroker] 02/06: sbin/{x2gobroker-pubkeyauthorizer, x2gobroker-keygen}: Use proper octal numbers for file permissions.

git-admin at x2go.org git-admin at x2go.org
Mon Apr 16 13:43:00 CEST 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit e470714c5d4a6ae49b1301d5ac1c7e44ccdb484d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 16 12:49:37 2018 +0200

    sbin/{x2gobroker-pubkeyauthorizer,x2gobroker-keygen}: Use proper octal numbers for file permissions.
---
 sbin/x2gobroker-keygen           | 6 +++---
 sbin/x2gobroker-pubkeyauthorizer | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen
index a901c25..6872ecc 100755
--- a/sbin/x2gobroker-keygen
+++ b/sbin/x2gobroker-keygen
@@ -108,7 +108,7 @@ if __name__ == '__main__':
     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)
+        os.chmod('{home}/.ssh'.format(home=broker_home), 0o0750)
         logger_broker.info('  Created {home}/.ssh'.format(home=broker_home))
 
     # generate key pair
@@ -133,7 +133,7 @@ if __name__ == '__main__':
 
     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)
+    os.chmod('{home}/.ssh/{id_file}'.format(home=broker_home, id_file=id_file), 0o0600)
     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')
@@ -143,7 +143,7 @@ if __name__ == '__main__':
         pubkey_file.write("ssh-dss " +key.get_base64())
     pubkey_file.close()
     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)
+    os.chmod('{home}/.ssh/{id_file}.pub'.format(home=broker_home, id_file=id_file), 0o0644)
     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/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer
index ceb4ce6..ec8fd19 100755
--- a/sbin/x2gobroker-pubkeyauthorizer
+++ b/sbin/x2gobroker-pubkeyauthorizer
@@ -133,7 +133,7 @@ if __name__ == '__main__':
     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)
+        os.chmod('{home}/.ssh'.format(home=broker_home), 0o0750)
         logger_broker.info('  Created {home}/.ssh'.format(home=broker_home))
 
     tmpfile_name, httpmsg = urllib.urlretrieve(cmdline_args.broker_url)
@@ -223,6 +223,6 @@ if __name__ == '__main__':
     else:
         # set proper file permissions
         os.chown('{home}/.ssh/authorized_keys'.format(home=broker_home), broker_uidnumber, broker_gidnumber)
-        os.chmod('{home}/.ssh/authorized_keys'.format(home=broker_home), 0644)
+        os.chmod('{home}/.ssh/authorized_keys'.format(home=broker_home), 0o0644)
 
         logger_broker.info('Completed successfully: X2Go Session Broker\'s PubKey Authorizer.'.format(url=cmdline_args.broker_url))

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git


More information about the x2go-commits mailing list