cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix problem writing binary content to a temporary file in the uri module.

Browse source 
Fixes https://github.com/ansible/ansible/issues/10938
Fixes https://github.com/ansible/ansible/issues/7606
This commit is contained in:
Toshio Kuratomi 2015-05-14 14:19:15 -07:00 committed by Matt Clay
parent eeacb7486d
commit 9eac68b417
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/ansible/modules/network/basics/uri.py
View file

@ -20,6 +20,7 @@
# #
# see examples/playbooks/uri.yml # see examples/playbooks/uri.yml
import cgi
import shutil import shutil
import tempfile import tempfile
import base64 import base64
@ -187,7 +188,6 @@ try:
except ImportError: except ImportError:
HAS_URLPARSE = False HAS_URLPARSE = False
def write_file(module, url, dest, content): def write_file(module, url, dest, content):
# create a tempfile with some test content # create a tempfile with some test content
fd, tmpsrc = tempfile.mkstemp() fd, tmpsrc = tempfile.mkstemp()
@ -308,10 +308,7 @@ def uri(module, url, dest, user, password, body, body_format, method, headers, r
r['redirected'] = redirected r['redirected'] = redirected
r.update(resp_redir) r.update(resp_redir)
r.update(resp) r.update(resp)
try: return r, content, dest
return r, unicode(content.decode('raw_unicode_escape')), dest
except:
return r, content, dest
except httplib2.RedirectMissingLocation: except httplib2.RedirectMissingLocation:
module.fail_json(msg="A 3xx redirect response code was provided but no Location: header was provided to point to the new location.") module.fail_json(msg="A 3xx redirect response code was provided but no Location: header was provided to point to the new location.")
except httplib2.RedirectLimit: except httplib2.RedirectLimit:
@ -439,22 +436,32 @@ def main():
ukey = key.replace("-", "_") ukey = key.replace("-", "_")
uresp[ukey] = value uresp[ukey] = value
# Default content_encoding to try
content_encoding = 'utf-8'
if 'content_type' in uresp: if 'content_type' in uresp:
if uresp['content_type'].startswith('application/json') or \ content_type, params = cgi.parse_header(uresp['content_type'])
uresp['content_type'].startswith('text/json'): if 'charset' in params:
content_encoding = params['charset']
u_content = unicode(content, content_encoding, errors='xmlcharrefreplace')
if content_type.startswith('application/json') or \
content_type.startswith('text/json'):
try: try:
js = json.loads(content) js = json.loads(u_content)
uresp['json'] = js uresp['json'] = js
except: except:
pass pass
else:
u_content = unicode(content, content_encoding, errors='xmlcharrefreplace')
if resp['status'] not in status_code: if resp['status'] not in status_code:
module.fail_json(msg="Status code was not " + str(status_code), content=content, **uresp) module.fail_json(msg="Status code was not " + str(status_code), content=u_content, **uresp)
elif return_content: elif return_content:
module.exit_json(changed=changed, content=content, **uresp) module.exit_json(changed=changed, content=u_content, **uresp)
else: else:
module.exit_json(changed=changed, **uresp) module.exit_json(changed=changed, **uresp)
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
main() if __name__ == '__main__':
main()