starred/certbot-certbot-1
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 12:02:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Made chmod transactional with creation of files/folders

Browse Source
This commit is contained in:
James Kasten
2012-08-15 19:38:36 -04:00
parent 7548e7e363
commit d581138b57
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trustify/client/client.py
+7 -8
View File
@@ -195,17 +195,16 @@ def save_key_csr(key, csr):
directory.
"""
# Create directories if they do not exist
# TODO: Lookup what permissions cert files/directory should have...
if not os.path.isdir(SERVER_ROOT + "certs"):
os.makedirs(SERVER_ROOT + "certs")
if not os.path.isdir(SERVER_ROOT + "ssl"):
os.makedirs(SERVER_ROOT + "ssl")
# Need leading 0 for octal integer
os.chmod(SERVER_ROOT + "ssl", 0700)
os.makedirs(SERVER_ROOT + "ssl", 0700)
# Write key to new file and change permissions
key_f, key_fn = unique_file(SERVER_ROOT+"ssl/key-trustify.pem", 0600)
key_f.write(key)
key_f.close()
os.chmod(key_fn, 0600)
# Write CSR to new file
csr_f, csr_fn = unique_file(SERVER_ROOT + "certs/csr-trustify.pem")
csr_f.write(csr)
@@ -221,11 +220,11 @@ def unique_file(default_name, mode = 0777):
f_parsed = os.path.splitext(default_name)
while 1:
try:
fd = os.open(default_name, os.O_CREAT|os.O_EXCL|os.O_WRONLY, mode)
return os.fdopen(fd), default_name
fd = os.open(default_name, os.O_CREAT|os.O_EXCL|os.O_RDWR, mode)
return os.fdopen(fd, 'w'), default_name
except OSError:
pass
file_name = f_parsed[0] + '_' + str(count) + f_parsed[1]
default_name = f_parsed[0] + '_' + str(count) + f_parsed[1]
count += 1
def gen_https_names(domains):
@@ -330,7 +329,7 @@ def authenticate():
if not curses: print chall
if chall.type == r.DomainValidateSNI:
if curses:
shower.add("\tDomainValidateSNI challenge for name %s." % chall.name)
shower.add("\tDomainValidateSNI challenge for name %s.\n" % chall.name)
dvsni_nonce, dvsni_y, dvsni_ext = chall.data
sni_todo.append( (chall.name, dvsni_y, dvsni_nonce, dvsni_ext) )
dn.append(chall.name)