LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-28 07:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

interface: (trivial) make some methods private

Browse source
This commit is contained in:
SomberNight 2020-04-24 17:18:05 +02:00
parent 69de3b94db
commit 38980a4f5c
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
electrum/interface.py
View file

@ -353,13 +353,13 @@ class Interface(Logger):
async def _try_saving_ssl_cert_for_first_time(self, ca_ssl_context): async def _try_saving_ssl_cert_for_first_time(self, ca_ssl_context):
ca_signed = await self.is_server_ca_signed(ca_ssl_context) ca_signed = await self.is_server_ca_signed(ca_ssl_context)
if ca_signed: if ca_signed:
if self.get_expected_fingerprint(): if self._get_expected_fingerprint():
raise InvalidOptionCombination("cannot use --serverfingerprint with CA signed servers") raise InvalidOptionCombination("cannot use --serverfingerprint with CA signed servers")
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()
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):
@ -367,7 +367,7 @@ class Interface(Logger):
with open(self.cert_path, 'r') as f: with open(self.cert_path, 'r') as f:
contents = f.read() contents = f.read()
if contents == '': # CA signed if contents == '': # CA signed
if self.get_expected_fingerprint(): if self._get_expected_fingerprint():
raise InvalidOptionCombination("cannot use --serverfingerprint with CA signed servers") raise InvalidOptionCombination("cannot use --serverfingerprint with CA signed servers")
return True return True
# pinned self-signed cert # pinned self-signed cert
@ -387,7 +387,7 @@ class Interface(Logger):
self.logger.info(f"certificate has expired: {e}") self.logger.info(f"certificate has expired: {e}")
os.unlink(self.cert_path) # delete pinned cert only in this case os.unlink(self.cert_path) # delete pinned cert only in this case
return False return False
self.verify_certificate_fingerprint(bytearray(b)) self._verify_certificate_fingerprint(bytearray(b))
return True return True
async def _get_ssl_context(self): async def _get_ssl_context(self):
@ -469,14 +469,14 @@ class Interface(Logger):
self.ready.set_result(1) self.ready.set_result(1)
async def save_certificate(self): async def _save_certificate(self) -> None:
if not os.path.exists(self.cert_path): if not os.path.exists(self.cert_path):
# we may need to retry this a few times, in case the handshake hasn't completed # we may need to retry this a few times, in case the handshake hasn't completed
for _ in range(10): for _ in range(10):
dercert = await self.get_certificate() dercert = await self._fetch_certificate()
if dercert: if dercert:
self.logger.info("succeeded in getting cert") self.logger.info("succeeded in getting cert")
self.verify_certificate_fingerprint(dercert) self._verify_certificate_fingerprint(dercert)
with open(self.cert_path, 'w') as f: with open(self.cert_path, 'w') as f:
cert = ssl.DER_cert_to_PEM_cert(dercert) cert = ssl.DER_cert_to_PEM_cert(dercert)
# workaround android bug # workaround android bug
@ -492,7 +492,7 @@ class Interface(Logger):
else: else:
raise GracefulDisconnect("could not get certificate after 10 tries") raise GracefulDisconnect("could not get certificate after 10 tries")
async def get_certificate(self): async def _fetch_certificate(self) -> bytes:
sslc = ssl.SSLContext() sslc = ssl.SSLContext()
async with _RSClient(session_factory=RPCSession, async with _RSClient(session_factory=RPCSession,
host=self.host, port=self.port, host=self.host, port=self.port,
@ -501,12 +501,12 @@ class Interface(Logger):
ssl_object = asyncio_transport.get_extra_info("ssl_object") # type: ssl.SSLObject ssl_object = asyncio_transport.get_extra_info("ssl_object") # type: ssl.SSLObject
return ssl_object.getpeercert(binary_form=True) return ssl_object.getpeercert(binary_form=True)
def get_expected_fingerprint(self): def _get_expected_fingerprint(self) -> Optional[str]:
if self.is_main_server(): if self.is_main_server():
return self.network.config.get("serverfingerprint") return self.network.config.get("serverfingerprint")
def verify_certificate_fingerprint(self, certificate): def _verify_certificate_fingerprint(self, certificate):
expected_fingerprint = self.get_expected_fingerprint() expected_fingerprint = self._get_expected_fingerprint()
if not expected_fingerprint: if not expected_fingerprint:
return return
fingerprint = hashlib.sha256(certificate).hexdigest() fingerprint = hashlib.sha256(certificate).hexdigest()