From 3dd4b3c8a38794f13a31d396135c04fc555728ae Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Wed, 5 Feb 2020 14:20:39 +0100 Subject: [PATCH] Replaces a open/close to validate access with os.access in azure storageblob. (#65608) --- changelogs/fragments/65608.yml | 2 ++ .../modules/cloud/azure/azure_rm_storageblob.py | 11 ++++------- 2 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 changelogs/fragments/65608.yml diff --git a/changelogs/fragments/65608.yml b/changelogs/fragments/65608.yml new file mode 100644 index 00000000000..198c5ee3c20 --- /dev/null +++ b/changelogs/fragments/65608.yml @@ -0,0 +1,2 @@ +bugfixes: + - azure_storageblob - use os.access to check for read rights. diff --git a/lib/ansible/modules/cloud/azure/azure_rm_storageblob.py b/lib/ansible/modules/cloud/azure/azure_rm_storageblob.py index 0833640cf6a..d77255d9cba 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_storageblob.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_storageblob.py @@ -412,13 +412,10 @@ class AzureRMStorageBlob(AzureRMModuleBase): def src_is_valid(self): if not os.path.isfile(self.src): self.fail("The source path must be a file.") - try: - fp = open(self.src, 'r') - fp.close() - except IOError: - self.fail("Failed to access {0}. Make sure the file exists and that you have " - "read access.".format(self.src)) - return True + if os.access(self.src, os.R_OK): + return True + self.fail("Failed to access {0}. Make sure the file exists and that you have " + "read access.".format(self.src)) def dest_is_valid(self): if not self.check_mode: