Skip to content

Commit

Permalink
cve-2020-17490 consistancy hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
dwoz committed Aug 19, 2020
1 parent 1bfece9 commit 86e18b9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions salt/modules/tls.py
Original file line number Diff line number Diff line change
Expand Up @@ -829,11 +829,11 @@ def create_ca(
write_key = False
else:
log.info("Saving old CA ssl key in %s", bck)
fp = os.open(bck, os.O_CREAT | os.O_WRONLY, 0o600)
fp = os.open(bck, os.O_CREAT | os.O_RDWR, 0o600)
with salt.utils.files.fopen(fp, "w") as bckf:
bckf.write(old_key)
if write_key:
fp = os.open(ca_keyp, os.O_CREAT | os.O_WRONLY, 0o600)
fp = os.open(ca_keyp, os.O_CREAT | os.O_RDWR, 0o600)
with salt.utils.files.fopen(fp, "wb") as ca_key:
ca_key.write(salt.utils.stringutils.to_bytes(keycontent))

Expand Down Expand Up @@ -1155,7 +1155,7 @@ def create_csr(

# Write private key and request
priv_keyp = "{}/{}.key".format(csr_path, csr_filename)
fp = os.open(priv_keyp, os.O_CREAT | os.O_WRONLY, 0o600)
fp = os.open(priv_keyp, os.O_CREAT | os.O_RDWR, 0o600)
with salt.utils.files.fopen(fp, "wb+") as priv_key:
priv_key.write(
salt.utils.stringutils.to_bytes(
Expand Down Expand Up @@ -1296,7 +1296,7 @@ def create_self_signed_cert(
priv_key_path = "{}/{}/certs/{}.key".format(
cert_base_path(), tls_dir, cert_filename
)
fp = os.open(priv_key_path, os.O_CREAT | os.O_WRONLY, 0o600)
fp = os.open(priv_key_path, os.O_CREAT | os.O_RDWR, 0o600)
with salt.utils.files.fopen(fp, "wb+") as priv_key:
priv_key.write(
salt.utils.stringutils.to_bytes(
Expand Down

0 comments on commit 86e18b9

Please sign in to comment.