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

[aws] ec2_metadata_facts URL encode the metadata URL to avoid errors (#43394)

Browse source 
- If a field in the URL has a space it would result in a 400 without making it URL safe
- Fixes #42371 and #43378
This commit is contained in:
Vinay Dandekar 2018-09-06 15:24:26 -04:00 • committed by Ryan Brown
commit 4ce09ea62d
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/cloud/amazon/ec2_metadata_facts.py
View file

@ -423,7 +423,7 @@ import time
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_text from ansible.module_utils._text import to_text
from ansible.module_utils.urls import fetch_url from ansible.module_utils.urls import fetch_url
from ansible.module_utils.six.moves.urllib.parse import quote
socket.setdefaulttimeout(5) socket.setdefaulttimeout(5)
@ -444,13 +444,14 @@ class Ec2Metadata(object):
self._prefix = 'ansible_ec2_%s' self._prefix = 'ansible_ec2_%s'
def _fetch(self, url): def _fetch(self, url):
response, info = fetch_url(self.module, url, force=True) encoded_url = quote(url, safe='%/:=&?~#+!$,;\'@()*[]')
response, info = fetch_url(self.module, encoded_url, force=True)
if info.get('status') not in (200, 404): if info.get('status') not in (200, 404):
time.sleep(3) time.sleep(3)
# request went bad, retry once then raise # request went bad, retry once then raise
self.module.warn('Retrying query to metadata service. First attempt failed: {0}'.format(info['msg'])) self.module.warn('Retrying query to metadata service. First attempt failed: {0}'.format(info['msg']))
response, info = fetch_url(self.module, url, force=True) response, info = fetch_url(self.module, encoded_url, force=True)
if info.get('status') not in (200, 404): if info.get('status') not in (200, 404):
# fail out now # fail out now
self.module.fail_json(msg='Failed to retrieve metadata from AWS: {0}'.format(info['msg']), response=info) self.module.fail_json(msg='Failed to retrieve metadata from AWS: {0}'.format(info['msg']), response=info)