mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Remove validate_certs parameter from fetch_url calls
This commit is contained in:
parent
a9017af2bb
commit
d8a81c488e
6 changed files with 10 additions and 11 deletions
|
@ -115,7 +115,7 @@ def main():
|
|||
|
||||
# Send the data to airbrake
|
||||
data = urllib.urlencode(params)
|
||||
response, info = fetch_url(module, url, data=data, validate_certs=module.params['validate_certs'])
|
||||
response, info = fetch_url(module, url, data=data)
|
||||
if info['status'] == 200:
|
||||
module.exit_json(changed=True)
|
||||
else:
|
||||
|
|
|
@ -122,7 +122,7 @@ class netscaler(object):
|
|||
'Content-Type' : 'application/x-www-form-urlencoded',
|
||||
}
|
||||
|
||||
response, info = fetch_url(self.module, request_url, data=data_json, validate_certs=self.module.params['validate_certs'])
|
||||
response, info = fetch_url(self.module, request_url, data=data_json)
|
||||
|
||||
return json.load(response.read())
|
||||
|
||||
|
|
|
@ -124,14 +124,14 @@ def url_filename(url):
|
|||
return 'index.html'
|
||||
return fn
|
||||
|
||||
def url_get(module, url, dest, use_proxy, last_mod_time, force, validate_certs):
|
||||
def url_get(module, url, dest, use_proxy, last_mod_time, force):
|
||||
"""
|
||||
Download data from the url and store in a temporary file.
|
||||
|
||||
Return (tempfile, info about the request)
|
||||
"""
|
||||
|
||||
rsp, info = fetch_url(module, url, use_proxy=use_proxy, force=force, last_mod_time=last_mod_time, validate_certs=validate_certs)
|
||||
rsp, info = fetch_url(module, url, use_proxy=use_proxy, force=force, last_mod_time=last_mod_time)
|
||||
|
||||
if info['status'] == 304:
|
||||
module.exit_json(url=url, dest=dest, changed=False, msg=info.get('msg', ''))
|
||||
|
@ -192,7 +192,6 @@ def main():
|
|||
force = module.params['force']
|
||||
sha256sum = module.params['sha256sum']
|
||||
use_proxy = module.params['use_proxy']
|
||||
validate_certs = module.params['validate_certs']
|
||||
|
||||
dest_is_dir = os.path.isdir(dest)
|
||||
last_mod_time = None
|
||||
|
@ -207,7 +206,7 @@ def main():
|
|||
last_mod_time = datetime.datetime.utcfromtimestamp(mtime)
|
||||
|
||||
# download to tmpsrc
|
||||
tmpsrc, info = url_get(module, url, dest, use_proxy, last_mod_time, force, validate_certs)
|
||||
tmpsrc, info = url_get(module, url, dest, use_proxy, last_mod_time, force)
|
||||
|
||||
# Now the request has completed, we can finally generate the final
|
||||
# destination file name from the info dict.
|
||||
|
|
|
@ -140,7 +140,7 @@ def download_key(module, url):
|
|||
if url is None:
|
||||
module.fail_json(msg="needed a URL but was not specified")
|
||||
try:
|
||||
rsp, info = fetch_url(module, url, validate_certs=module.params['validate_certs'])
|
||||
rsp, info = fetch_url(module, url)
|
||||
return rsp.read()
|
||||
except Exception:
|
||||
module.fail_json(msg="error getting key id from url", traceback=format_exc())
|
||||
|
|
|
@ -123,7 +123,7 @@ class RpmKey:
|
|||
def fetch_key(self, url, maxbytes=MAXBYTES):
|
||||
"""Downloads a key from url, returns a valid path to a gpg key"""
|
||||
try:
|
||||
rsp, info = fetch_url(self.module, url, validate_certs=self.module.params['validate_certs'])
|
||||
rsp, info = fetch_url(self.module, url)
|
||||
key = rsp.read(maxbytes)
|
||||
if not is_pubkey(key):
|
||||
self.module.fail_json(msg="Not a public key: %s" % url)
|
||||
|
|
|
@ -75,7 +75,7 @@ def list(module, hookurl, oauthkey, repo, user):
|
|||
headers = {
|
||||
'Authorization': 'Basic %s' % auth,
|
||||
}
|
||||
response, info = fetch_url(module, url, headers=headers, validate_certs=module.params['validate_certs'])
|
||||
response, info = fetch_url(module, url, headers=headers)
|
||||
if info['status'] != 200:
|
||||
return False, ''
|
||||
else:
|
||||
|
@ -120,7 +120,7 @@ def create(module, hookurl, oauthkey, repo, user):
|
|||
headers = {
|
||||
'Authorization': 'Basic %s' % auth,
|
||||
}
|
||||
response, info = fetch_url(module, url, data=data, headers=headers, validate_certs=module.params['validate_certs'])
|
||||
response, info = fetch_url(module, url, data=data, headers=headers)
|
||||
if info['status'] != 200:
|
||||
return 0, '[]'
|
||||
else:
|
||||
|
@ -132,7 +132,7 @@ def delete(module, hookurl, oauthkey, repo, user, hookid):
|
|||
headers = {
|
||||
'Authorization': 'Basic %s' % auth,
|
||||
}
|
||||
response, info = fetch_url(module, url, data=data, headers=headers, method='DELETE', validate_certs=module.params['validate_certs'])
|
||||
response, info = fetch_url(module, url, data=data, headers=headers, method='DELETE')
|
||||
return response.read()
|
||||
|
||||
def main():
|
||||
|
|
Loading…
Reference in a new issue