Skip to content

Remove securesystemslib.util.TempFile #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 19, 2019
Merged

Remove securesystemslib.util.TempFile #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4dcbcd
Add helper to perist a temporary file
joshuagl Sep 13, 2019
2cfbba2
Remove use of securesystemslib.util.TempFile
joshuagl Sep 13, 2019
41681fc
Remove securesystemslib.util.TempFile
joshuagl Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions securesystemslib/interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,17 +219,17 @@ def generate_and_write_rsa_keypair(filepath=None, bits=DEFAULT_RSA_KEY_BITS,
# Write the public key (i.e., 'public', which is in PEM format) to
# '<filepath>.pub'. (1) Create a temporary file, (2) write the contents of
# the public key, and (3) move to final destination.
file_object = securesystemslib.util.TempFile()
file_object = tempfile.TemporaryFile()
file_object.write(public.encode('utf-8'))
# The temporary file is closed after the final move.
file_object.move(filepath + '.pub')
securesystemslib.util.persist_temp_file(file_object, filepath + '.pub')

# Write the private key in encrypted PEM format to '<filepath>'.
# Unlike the public key file, the private key does not have a file
# extension.
file_object = securesystemslib.util.TempFile()
file_object = tempfile.TemporaryFile()
file_object.write(private.encode('utf-8'))
file_object.move(filepath)
securesystemslib.util.persist_temp_file(file_object, filepath)

return filepath

Expand Down Expand Up @@ -490,7 +490,7 @@ def generate_and_write_ed25519_keypair(filepath=None, password=None):

# Create a temporary file, write the contents of the public key, and move
# to final destination.
file_object = securesystemslib.util.TempFile()
file_object = tempfile.TemporaryFile()

# Generate the ed25519 public key file contents in metadata format (i.e.,
# does not include the keyid portion).
Expand All @@ -506,11 +506,11 @@ def generate_and_write_ed25519_keypair(filepath=None, password=None):
# '<filepath>.pub'. (1) Create a temporary file, (2) write the contents of
# the public key, and (3) move to final destination.
# The temporary file is closed after the final move.
file_object.move(filepath + '.pub')
securesystemslib.util.persist_temp_file(file_object, filepath + '.pub')

# Write the encrypted key string, conformant to
# 'securesystemslib.formats.ENCRYPTEDKEY_SCHEMA', to '<filepath>'.
file_object = securesystemslib.util.TempFile()
file_object = tempfile.TemporaryFile()

# Encrypt the private key if 'password' is set.
if len(password):
Expand All @@ -524,7 +524,7 @@ def generate_and_write_ed25519_keypair(filepath=None, password=None):
# Raise 'securesystemslib.exceptions.CryptoError' if 'ed25519_key' cannot be
# encrypted.
file_object.write(ed25519_key.encode('utf-8'))
file_object.move(filepath)
securesystemslib.util.persist_temp_file(file_object, filepath)

return filepath

Expand Down Expand Up @@ -745,7 +745,7 @@ def generate_and_write_ecdsa_keypair(filepath=None, password=None):

# Create a temporary file, write the contents of the public key, and move
# to final destination.
file_object = securesystemslib.util.TempFile()
file_object = tempfile.TemporaryFile()

# Generate the ECDSA public key file contents in metadata format (i.e., does
# not include the keyid portion).
Expand All @@ -760,16 +760,16 @@ def generate_and_write_ecdsa_keypair(filepath=None, password=None):
# Write the public key (i.e., 'public', which is in PEM format) to
# '<filepath>.pub'. (1) Create a temporary file, (2) write the contents of
# the public key, and (3) move to final destination.
file_object.move(filepath + '.pub')
securesystemslib.util.persist_temp_file(file_object, filepath + '.pub')

# Write the encrypted key string, conformant to
# 'securesystemslib.formats.ENCRYPTEDKEY_SCHEMA', to '<filepath>'.
file_object = securesystemslib.util.TempFile()
file_object = tempfile.TemporaryFile()
# Raise 'securesystemslib.exceptions.CryptoError' if 'ecdsa_key' cannot be
# encrypted.
encrypted_key = securesystemslib.keys.encrypt_key(ecdsa_key, password)
file_object.write(encrypted_key.encode('utf-8'))
file_object.move(filepath)
securesystemslib.util.persist_temp_file(file_object, filepath)

return filepath

Expand Down
Loading