lauri/certidude
1
0
Fork 0
mirror of https://github.com/laurivosandi/certidude synced 2024-12-23 08:35:19 +00:00
Code Issues Activity

py3k: Use proper octal constants for file permission

Browse Source
This commit is contained in:
Priit Laes 2017-10-01 00:25:32 +03:00
parent d32ec224d7
commit ad78ebc335
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
certidude/cli.py
View File

@ -1278,7 +1278,7 @@ def certidude_serve(port, listen, fork):
if not os.path.exists(const.RUN_DIR): if not os.path.exists(const.RUN_DIR):
click.echo("Creating: %s" % const.RUN_DIR) click.echo("Creating: %s" % const.RUN_DIR)
os.makedirs(const.RUN_DIR) os.makedirs(const.RUN_DIR)
os.chmod(const.RUN_DIR, 0755) os.chmod(const.RUN_DIR, 0o755)
# TODO: umask! # TODO: umask!

10
tests/test_cli.py
View File

@ -152,7 +152,7 @@ def test_cli_setup_authority():
with open(util, "w") as fh: with open(util, "w") as fh:
fh.write("#!/bin/bash\n") fh.write("#!/bin/bash\n")
fh.write("exit 0\n") fh.write("exit 0\n")
os.chmod(util, 0755) os.chmod(util, 0o755)
if not os.path.exists("/etc/pki/ca-trust/source/anchors/"): if not os.path.exists("/etc/pki/ca-trust/source/anchors/"):
os.makedirs("/etc/pki/ca-trust/source/anchors/") os.makedirs("/etc/pki/ca-trust/source/anchors/")
@ -198,7 +198,7 @@ def test_cli_setup_authority():
if os.path.exists("/etc/krb5.keytab"): if os.path.exists("/etc/krb5.keytab"):
os.unlink("/etc/krb5.keytab") os.unlink("/etc/krb5.keytab")
os.symlink("/var/lib/samba/private/secrets.keytab", "/etc/krb5.keytab") os.symlink("/var/lib/samba/private/secrets.keytab", "/etc/krb5.keytab")
os.chmod("/var/lib/samba/private/secrets.keytab", 0644) # To allow access to certidude server os.chmod("/var/lib/samba/private/secrets.keytab", 0o644) # To allow access to certidude server
if os.path.exists("/etc/krb5.conf"): # Remove the one from krb5-user package if os.path.exists("/etc/krb5.conf"): # Remove the one from krb5-user package
os.unlink("/etc/krb5.conf") os.unlink("/etc/krb5.conf")
os.symlink("/var/lib/samba/private/krb5.conf", "/etc/krb5.conf") os.symlink("/var/lib/samba/private/krb5.conf", "/etc/krb5.conf")
@ -227,11 +227,11 @@ def test_cli_setup_authority():
result = runner.invoke(cli, ['setup', 'authority', '-s']) result = runner.invoke(cli, ['setup', 'authority', '-s'])
os.setgid(0) # Restore GID os.setgid(0) # Restore GID
os.umask(0022) os.umask(0o022)
result = runner.invoke(cli, ['setup', 'authority']) # For if-else branches result = runner.invoke(cli, ['setup', 'authority']) # For if-else branches
os.setgid(0) # Restore GID os.setgid(0) # Restore GID
os.umask(0022) os.umask(0o022)
# Make sure nginx is running # Make sure nginx is running
assert not result.exception, result.output assert not result.exception, result.output
@ -1280,7 +1280,7 @@ def test_cli_setup_authority():
### SCEP tests ### ### SCEP tests ###
################## ##################
os.umask(0022) os.umask(0o022)
if not os.path.exists("/tmp/sscep"): if not os.path.exists("/tmp/sscep"):
assert not os.system("git clone https://github.com/certnanny/sscep /tmp/sscep") assert not os.system("git clone https://github.com/certnanny/sscep /tmp/sscep")
if not os.path.exists("/tmp/sscep/sscep_dyn"): if not os.path.exists("/tmp/sscep/sscep_dyn"):