ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix misleading SSL error message

Browse source 
The `except` block with exception matching throught
`if 'connection refused' in str(e).lower():` is funny,
but is not user-friendly.

Probably related issues:

- #15679
- #12161
- #9966
- #8221
- #7218

... and more
This commit is contained in:
Andrew Grigorev 2016-09-19 19:32:51 +03:00 committed by Toshio Kuratomi
parent 0ee9972903
commit 3fe8f70b08
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/module_utils/urls.py
View file

@ -721,15 +721,11 @@ class SSLValidationHandler(urllib_request.BaseHandler):
# close the ssl connection # close the ssl connection
#ssl_s.unwrap() #ssl_s.unwrap()
s.close() s.close()
except (ssl.SSLError, socket.error): except (ssl.SSLError, CertificateError):
build_ssl_validation_error(self.hostname, self.port, paths_checked)
except socket.error:
e = get_exception() e = get_exception()
# fail if we tried all of the certs but none worked raise ConnectionError('Failed to connect to %s at port %s: %s' % (self.hostname, self.port, str(e)))
if 'connection refused' in str(e).lower():
raise ConnectionError('Failed to connect to %s:%s.' % (self.hostname, self.port))
else:
build_ssl_validation_error(self.hostname, self.port, paths_checked)
except CertificateError:
build_ssl_validation_error(self.hostname, self.port, paths_checked)
try: try:
# cleanup the temp file created, don't worry # cleanup the temp file created, don't worry