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

add SSL context to watchtower server

Browse source
This commit is contained in:
ThomasV 2019-09-13 12:26:27 +02:00
parent 26efef9e06
commit 1ecbafb920
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
electrum/daemon.py
View file

@ -34,7 +34,6 @@ import aiohttp
from aiohttp import web from aiohttp import web
from base64 import b64decode from base64 import b64decode
from collections import defaultdict from collections import defaultdict
import ssl
import jsonrpcclient import jsonrpcclient
import jsonrpcserver import jsonrpcserver
@ -163,7 +162,7 @@ class WatchTowerServer(Logger):
port = self.config.get('watchtower_port', 12345) port = self.config.get('watchtower_port', 12345)
self.runner = web.AppRunner(self.app) self.runner = web.AppRunner(self.app)
await self.runner.setup() await self.runner.setup()
site = web.TCPSite(self.runner, host, port) site = web.TCPSite(self.runner, host, port, ssl_context=self.config.get_ssl_context())
await site.start() await site.start()
async def get_ctn(self, *args): async def get_ctn(self, *args):
@ -172,7 +171,8 @@ class WatchTowerServer(Logger):
async def add_sweep_tx(self, *args): async def add_sweep_tx(self, *args):
return await self.lnwatcher.sweepstore.add_sweep_tx(*args) return await self.lnwatcher.sweepstore.add_sweep_tx(*args)
class HttpServer(Logger):
class PayServer(Logger):
def __init__(self, daemon: 'Daemon'): def __init__(self, daemon: 'Daemon'):
Logger.__init__(self) Logger.__init__(self)
@ -191,13 +191,6 @@ class HttpServer(Logger):
host = self.config.get('payserver_host', 'localhost') host = self.config.get('payserver_host', 'localhost')
port = self.config.get('payserver_port') port = self.config.get('payserver_port')
root = self.config.get('payserver_root', '/r') root = self.config.get('payserver_root', '/r')
ssl_keyfile = self.config.get('ssl_keyfile')
ssl_certfile = self.config.get('ssl_certfile')
if ssl_keyfile and ssl_certfile:
ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
ssl_context.load_cert_chain(ssl_certfile, ssl_keyfile)
else:
ssl_context = None
app = web.Application() app = web.Application()
app.add_routes([web.post('/api/create_invoice', self.create_request)]) app.add_routes([web.post('/api/create_invoice', self.create_request)])
app.add_routes([web.get('/api/get_invoice', self.get_request)]) app.add_routes([web.get('/api/get_invoice', self.get_request)])
@ -206,7 +199,7 @@ class HttpServer(Logger):
app.add_routes([web.static(root, 'electrum/www')]) app.add_routes([web.static(root, 'electrum/www')])
runner = web.AppRunner(app) runner = web.AppRunner(app)
await runner.setup() await runner.setup()
site = web.TCPSite(runner, port=port, host=host, ssl_context=ssl_context) site = web.TCPSite(runner, port=port, host=host, ssl_context=self.config.get_ssl_context())
await site.start() await site.start()
async def create_request(self, request): async def create_request(self, request):
@ -294,8 +287,8 @@ class Daemon(Logger):
jobs.append(self.start_jsonrpc(config, fd)) jobs.append(self.start_jsonrpc(config, fd))
# request server # request server
if self.config.get('payserver_port'): if self.config.get('payserver_port'):
self.http_server = HttpServer(self) self.pay_server = PayServer(self)
jobs.append(self.http_server.run()) jobs.append(self.pay_server.run())
# server-side watchtower # server-side watchtower
self.watchtower = WatchTowerServer(self.network) if self.config.get('watchtower_host') else None self.watchtower = WatchTowerServer(self.network) if self.config.get('watchtower_host') else None
if self.watchtower: if self.watchtower:

9
electrum/simple_config.py
View file

@ -3,6 +3,7 @@ import threading
import time import time
import os import os
import stat import stat
import ssl
from decimal import Decimal from decimal import Decimal
from typing import Union, Optional from typing import Union, Optional
from numbers import Real from numbers import Real
@ -584,6 +585,14 @@ class SimpleConfig(Logger):
device = '' device = ''
return device return device
def get_ssl_context(self):
ssl_keyfile = self.get('ssl_keyfile')
ssl_certfile = self.get('ssl_certfile')
if ssl_keyfile and ssl_certfile:
ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
ssl_context.load_cert_chain(ssl_certfile, ssl_keyfile)
return ssl_context
def read_user_config(path): def read_user_config(path):
"""Parse and store the user config settings in electrum.conf into user_config[].""" """Parse and store the user config settings in electrum.conf into user_config[]."""