wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure ec2_win_password doesn't leak file handle

Browse source 
Currently the module doesn't explicitly close the file handle. This
wraps the reading of the private key in a try/finally block to ensure
the file is properly closed.
This commit is contained in:
Joel Thompson 2015-12-27 16:35:33 -05:00 committed by Matt Clay
parent b92b30e3b3
commit 61672e5c61
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/extras/cloud/amazon/ec2_win_password.py
View file

@ -144,8 +144,11 @@ def main():
if wait and datetime.datetime.now() >= end: if wait and datetime.datetime.now() >= end:
module.fail_json(msg = "wait for password timeout after %d seconds" % wait_timeout) module.fail_json(msg = "wait for password timeout after %d seconds" % wait_timeout)
f = open(key_file, 'r') try:
key = RSA.importKey(f.read(), key_passphrase) f = open(key_file, 'r')
key = RSA.importKey(f.read(), key_passphrase)
finally:
f.close()
cipher = PKCS1_v1_5.new(key) cipher = PKCS1_v1_5.new(key)
sentinel = 'password decryption failed!!!' sentinel = 'password decryption failed!!!'