ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-25 14:20:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Close all open filehandle (#50544)

Browse source 
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2019-01-11 20:44:08 +05:30 • committed by Brian Coca
commit db8702cdb8
21 changed files with 81 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/crypto/openssl_pkcs12.py
View file

@ -255,8 +255,9 @@ class Pkcs(crypto_utils.OpenSSLObject):
try:
self.remove()
p12 = crypto.load_pkcs12(open(self.src, 'rb').read(),
with open(self.src, 'rb') as pkcs12_fh:
pkcs12_content = pkcs12_fh.read()
p12 = crypto.load_pkcs12(pkcs12_content,
self.passphrase)
pkey = crypto.dump_privatekey(crypto.FILETYPE_PEM,
p12.get_privatekey())

6
lib/ansible/modules/crypto/openssl_publickey.py
View file

@ -170,7 +170,8 @@ class PublicKey(crypto_utils.OpenSSLObject):
if not self.check(module, perms_required=False) or self.force:
try:
if self.format == 'OpenSSH':
privatekey_content = open(self.privatekey_path, 'rb').read()
with open(self.privatekey_path, 'rb') as private_key_fh:
privatekey_content = private_key_fh.read()
key = crypto_serialization.load_pem_private_key(privatekey_content,
password=self.privatekey_passphrase,
backend=default_backend())
@ -212,7 +213,8 @@ class PublicKey(crypto_utils.OpenSSLObject):
return False
try:
publickey_content = open(self.path, 'rb').read()
with open(self.path, 'rb') as public_key_fh:
publickey_content = public_key_fh.read()
if self.format == 'OpenSSH':
current_publickey = crypto_serialization.load_ssh_public_key(publickey_content, backend=default_backend())
publickey_content = current_publickey.public_bytes(crypto_serialization.Encoding.PEM,