LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ssl: use certifi explicitly for aiohttp and electrum-server connections

Browse source 
fixes ssl issues on Android
This commit is contained in:
SomberNight 2018-12-13 22:54:53 +01:00
parent 7a4270f5a4
commit c09ac41b27
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
electrum/interface.py
View file

@ -33,6 +33,7 @@ from collections import defaultdict
import aiorpcx import aiorpcx
from aiorpcx import RPCSession, Notification from aiorpcx import RPCSession, Notification
import requests
from .util import PrintError, ignore_exceptions, log_exceptions, bfh, SilentTaskGroup from .util import PrintError, ignore_exceptions, log_exceptions, bfh, SilentTaskGroup
from . import util from . import util
@ -48,6 +49,9 @@ if TYPE_CHECKING:
from .network import Network from .network import Network
ca_path = requests.certs.where()
class NotificationSession(RPCSession): class NotificationSession(RPCSession):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -232,7 +236,7 @@ class Interface(PrintError):
return None return None
# see if we already have cert for this server; or get it for the first time # 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(purpose=ssl.Purpose.SERVER_AUTH, cafile=ca_path)
if not self._is_saved_ssl_cert_available(): if not self._is_saved_ssl_cert_available():
await self._try_saving_ssl_cert_for_first_time(ca_sslc) await self._try_saving_ssl_cert_for_first_time(ca_sslc)
# now we have a file saved in our certificate store # now we have a file saved in our certificate store

15
electrum/util.py
View file

@ -40,10 +40,12 @@ import builtins
import json import json
import time import time
from typing import NamedTuple, Optional from typing import NamedTuple, Optional
import ssl
import aiohttp import aiohttp
from aiohttp_socks import SocksConnector, SocksVer from aiohttp_socks import SocksConnector, SocksVer
from aiorpcx import TaskGroup from aiorpcx import TaskGroup
import requests
from .i18n import _ from .i18n import _
@ -57,6 +59,9 @@ def inv_dict(d):
return {v: k for k, v in d.items()} return {v: k for k, v in d.items()}
ca_path = requests.certs.where()
base_units = {'BTC':8, 'mBTC':5, 'bits':2, 'sat':0} base_units = {'BTC':8, 'mBTC':5, 'bits':2, 'sat':0}
base_units_inverse = inv_dict(base_units) base_units_inverse = inv_dict(base_units)
base_units_list = ['BTC', 'mBTC', 'bits', 'sat'] # list(dict) does not guarantee order base_units_list = ['BTC', 'mBTC', 'bits', 'sat'] # list(dict) does not guarantee order
@ -919,6 +924,8 @@ def make_aiohttp_session(proxy: dict, headers=None, timeout=None):
headers = {'User-Agent': 'Electrum'} headers = {'User-Agent': 'Electrum'}
if timeout is None: if timeout is None:
timeout = aiohttp.ClientTimeout(total=10) timeout = aiohttp.ClientTimeout(total=10)
ssl_context = ssl.create_default_context(purpose=ssl.Purpose.SERVER_AUTH, cafile=ca_path)
if proxy: if proxy:
connector = SocksConnector( connector = SocksConnector(
socks_ver=SocksVer.SOCKS5 if proxy['mode'] == 'socks5' else SocksVer.SOCKS4, socks_ver=SocksVer.SOCKS5 if proxy['mode'] == 'socks5' else SocksVer.SOCKS4,
@ -926,11 +933,13 @@ def make_aiohttp_session(proxy: dict, headers=None, timeout=None):
port=int(proxy['port']), port=int(proxy['port']),
username=proxy.get('user', None), username=proxy.get('user', None),
password=proxy.get('password', None), password=proxy.get('password', None),
rdns=True rdns=True,
ssl_context=ssl_context,
) )
return aiohttp.ClientSession(headers=headers, timeout=timeout, connector=connector)
else: else:
return aiohttp.ClientSession(headers=headers, timeout=timeout) connector = aiohttp.TCPConnector(ssl_context=ssl_context)
return aiohttp.ClientSession(headers=headers, timeout=timeout, connector=connector)
class SilentTaskGroup(TaskGroup): class SilentTaskGroup(TaskGroup):