Protect opened files against IO-exceptions

This commit is contained in:
Marcel Krüger 2016-01-29 20:40:28 +01:00
parent 90f9254fc3
commit 5289420692
2 changed files with 4 additions and 4 deletions

View file

@ -313,8 +313,8 @@ class NginxConfigurator(common.Plugin):
cert_pem = OpenSSL.crypto.dump_certificate(
OpenSSL.crypto.FILETYPE_PEM, cert)
cert_file, cert_path = le_util.unique_file(os.path.join(tmp_dir, "cert.pem"))
cert_file.write(cert_pem)
cert_file.close()
with cert_file:
cert_file.write(cert_pem)
return cert_path, le_key.file
def _make_server_ssl(self, vhost):

View file

@ -53,8 +53,8 @@ def init_save_key(key_size, key_dir, keyname="key-letsencrypt.pem"):
config.strict_permissions)
key_f, key_path = le_util.unique_file(
os.path.join(key_dir, keyname), 0o600)
key_f.write(key_pem)
key_f.close()
with key_f:
key_f.write(key_pem)
logger.info("Generating key (%d bits): %s", key_size, key_path)