AaronFiore/electrum
1
0
Fork 0
Code Activity

interface: fix connecting to new servers using self-signed certs

Browse Source 
got broken in 6ec1578a90
This commit is contained in:
SomberNight
2019-05-27 19:09:54 +02:00
parent 37da192bf5
commit eaf203dbb5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/interface.py
View File

@@ -177,7 +177,8 @@ class _Connector(aiorpcx.Connector):
try: try:
return await super().create_connection() return await super().create_connection()
except OSError as e: except OSError as e:
raise ConnectError(e) # note: using "from e" here will set __cause__ of ConnectError
raise ConnectError(e) from e
def deserialize_server(server_str: str) -> Tuple[str, str, str]: def deserialize_server(server_str: str) -> Tuple[str, str, str]:
@@ -254,11 +255,11 @@ class Interface(Logger):
""" """
try: try:
await self.open_session(ca_ssl_context, exit_early=True) await self.open_session(ca_ssl_context, exit_early=True)
except ssl.SSLError as e: except ConnectError as e:
if e.reason == 'CERTIFICATE_VERIFY_FAILED': cause = e.__cause__
if isinstance(cause, ssl.SSLError) and cause.reason == 'CERTIFICATE_VERIFY_FAILED':
# failures due to self-signed certs are normal # failures due to self-signed certs are normal
return False return False
# e.g. too weak crypto
raise raise
return True return True