ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-21 02:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a TorProvider to get a Tor handler

Browse Source
This commit is contained in:
David Stainton 2016-09-19 12:01:14 +00:00 committed by Brian Warner
parent 993d91ec0d
commit b3b80d376b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/allmydata/node.py
View File

@ -13,7 +13,7 @@ from allmydata.util.assertutil import _assert
from allmydata.util.fileutil import abspath_expanduser_unicode
from allmydata.util.encodingutil import get_filesystem_encoding, quote_output
from allmydata.util import configutil
from allmydata.torutil import TorProvider
def _import_tor():
# this exists to be overridden by unit tests
try:
@ -241,18 +241,22 @@ class Node(service.MultiService):
if self.get_config("tor", "launch", False, boolean=True):
executable = self.get_config("tor", "tor.executable", None)
datadir = os.path.join(self.basedir, "private", "tor-statedir")
return tor.launch(data_directory=datadir, tor_binary=executable)
self.tor_provider = TorProvider(tor_binary=executable, data_directory=datadir)
return tor.handler_from_tor_provider(self.tor_provider)
socks_endpoint_desc = self.get_config("tor", "socks.port", None)
if socks_endpoint_desc:
socks_ep = endpoints.clientFromString(reactor, socks_endpoint_desc)
self.tor_provider = None
return tor.socks_endpoint(socks_ep)
controlport = self.get_config("tor", "control.port", None)
if controlport:
ep = endpoints.clientFromString(reactor, controlport)
return tor.control_endpoint(ep)
self.tor_provider = TorProvider(control_endpoint=ep)
return tor.handler_from_tor_provider(self.tor_provider)
self.tor_provider = None
return tor.default_socks()
def _make_i2p_handler(self):

6
src/allmydata/tor.py → src/allmydata/torutil.py
View File

@ -12,9 +12,9 @@ from txtorcon import torcontrolprotocol
class TorProvider:
def __init__(self, tor_binary=None, control_endpoint=None):
def __init__(self, tor_binary=None, data_directory=None, control_endpoint=None):
assert tor_binary is not None or control_endpoint is not None
self.data_directory = data_directory
self.tor_binary = tor_binary
self.control_endpoint = control_endpoint
self.tor_control_protocol = None
@ -28,6 +28,8 @@ class TorProvider:
else:
if self.control_endpoint is None:
config = torconfig.TorConfig()
if self.data_directory is not None:
config['DataDirectory'] = self.data_directory
d = torconfig.launch_tor(config, reactor, tor_binary=self.tor_binary)
def remember_tor_protocol(result):
self.tor_control_protocol = result.tor_protocol