LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 09:45:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

follow-up prev

Browse source
This commit is contained in:
SomberNight 2018-09-09 22:01:55 +02:00
parent 48a5b8527a
commit b381a7fdbf
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
electrum/interface.py
View file

@ -69,6 +69,12 @@ class NotificationSession(ClientSession):
class GracefulDisconnect(AIOSafeSilentException): pass class GracefulDisconnect(AIOSafeSilentException): pass
class ErrorParsingSSLCert(Exception): pass
class ErrorGettingSSLCertFromServer(Exception): pass
class CustomTaskGroup(TaskGroup): class CustomTaskGroup(TaskGroup):
def spawn(self, *args, **kwargs): def spawn(self, *args, **kwargs):
@ -126,16 +132,13 @@ class Interface(PrintError):
try: try:
ca_signed = await self.is_server_ca_signed(ca_ssl_context) ca_signed = await self.is_server_ca_signed(ca_ssl_context)
except (ConnectionRefusedError, socket.gaierror, aiorpcx.socks.SOCKSFailure) as e: except (ConnectionRefusedError, socket.gaierror, aiorpcx.socks.SOCKSFailure) as e:
self.print_error('disconnecting due to: {}'.format(e)) raise ErrorGettingSSLCertFromServer(e) from e
self.exception = e
return False
if ca_signed: if ca_signed:
with open(self.cert_path, 'w') as f: with open(self.cert_path, 'w') as f:
# empty file means this is CA signed, not self-signed # empty file means this is CA signed, not self-signed
f.write('') f.write('')
else: else:
await self.save_certificate() await self.save_certificate()
return True
def _is_saved_ssl_cert_available(self): def _is_saved_ssl_cert_available(self):
if not os.path.exists(self.cert_path): if not os.path.exists(self.cert_path):
@ -147,33 +150,32 @@ class Interface(PrintError):
# pinned self-signed cert # pinned self-signed cert
try: try:
b = pem.dePem(contents, 'CERTIFICATE') b = pem.dePem(contents, 'CERTIFICATE')
except SyntaxError: except SyntaxError as e:
self.print_error("error parsing already saved cert:", e) self.print_error("error parsing already saved cert:", e)
return False raise ErrorParsingSSLCert(e) from e
try: try:
x = x509.X509(b) x = x509.X509(b)
except Exception as e: except Exception as e:
self.print_error("error parsing already saved cert:", e) self.print_error("error parsing already saved cert:", e)
return False raise ErrorParsingSSLCert(e) from e
try: try:
x.check_date() x.check_date()
return True return True
except x509.CertificateError as e: except x509.CertificateError as e:
self.print_error("certificate has expired:", e) self.print_error("certificate has expired:", e)
os.unlink(self.cert_path) os.unlink(self.cert_path) # delete pinned cert only in this case
return False return False
@aiosafe async def _get_ssl_context(self):
async def run(self):
if self.protocol != 's': if self.protocol != 's':
await self.open_session(None, exit_early=False) # using plaintext TCP
assert False return None
# see if we already have cert for this server; or get it for the first time
ca_sslc = ssl.create_default_context(ssl.Purpose.SERVER_AUTH) ca_sslc = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
if not self._is_saved_ssl_cert_available(): if not self._is_saved_ssl_cert_available():
done_saving_cert = await self._try_saving_ssl_cert_for_first_time(ca_sslc) await self._try_saving_ssl_cert_for_first_time(ca_sslc)
if not done_saving_cert: # now we have a file saved in our certificate store
return
siz = os.stat(self.cert_path).st_size siz = os.stat(self.cert_path).st_size
if siz == 0: if siz == 0:
# CA signed cert # CA signed cert
@ -182,9 +184,17 @@ class Interface(PrintError):
# pinned self-signed cert # pinned self-signed cert
sslc = ssl.create_default_context(ssl.Purpose.SERVER_AUTH, cafile=self.cert_path) sslc = ssl.create_default_context(ssl.Purpose.SERVER_AUTH, cafile=self.cert_path)
sslc.check_hostname = 0 sslc.check_hostname = 0
# start main connection return sslc
@aiosafe
async def run(self):
try: try:
await self.open_session(sslc, exit_early=False) ssl_context = await self._get_ssl_context()
except (ErrorParsingSSLCert, ErrorGettingSSLCertFromServer) as e:
self.exception = e
return
try:
await self.open_session(ssl_context, exit_early=False)
except (asyncio.CancelledError, ConnectionRefusedError, socket.gaierror, except (asyncio.CancelledError, ConnectionRefusedError, socket.gaierror,
ssl.SSLError, TimeoutError, aiorpcx.socks.SOCKSFailure) as e: ssl.SSLError, TimeoutError, aiorpcx.socks.SOCKSFailure) as e:
self.print_error('disconnecting due to: {}'.format(e)) self.print_error('disconnecting due to: {}'.format(e))