Bitmessage/PyBitmessage-2024-12-03
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Support proxyconfig_stem on Windows

Browse Source
This commit is contained in:
Dmitri Bogomolov 2021-06-12 01:00:26 +03:00
parent 2ace579107
commit 5b4574e9c6
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/proxyconfig_stem.py
View File

@ -14,6 +14,7 @@ Configure tor proxy and hidden service with
import logging import logging
import os import os
import random # noseq import random # noseq
import sys
import tempfile import tempfile
import stem import stem
@ -34,15 +35,18 @@ class DebugLogger(object): # pylint: disable=too-few-public-methods
def __call__(self, line): def __call__(self, line):
try: try:
level, line = line.split('[', 1)[1].split(']') level, line = line.split('[', 1)[1].split(']', 1)
except IndexError: except IndexError:
# Plugin's debug or unexpected log line from tor # Plugin's debug or unexpected log line from tor
self._logger.debug(line) self._logger.debug(line)
except ValueError: # some error while splitting
self._logger.warning(line)
else: else:
self._logger.log(self._levels.get(level, 10), '(tor) %s', line) self._logger.log(self._levels.get(level, 10), '(tor) %s', line)
def connect_plugin(config): # pylint: disable=too-many-branches # pylint: disable=too-many-branches,too-many-statements
def connect_plugin(config):
""" """
Run stem proxy configurator Run stem proxy configurator
@ -62,23 +66,30 @@ def connect_plugin(config): # pylint: disable=too-many-branches
' aborting stem proxy configuration') ' aborting stem proxy configuration')
return return
tor_config = {'SocksPort': '9050'}
datadir = tempfile.mkdtemp() datadir = tempfile.mkdtemp()
if sys.platform.startswith('win'):
# no ControlSocket on windows because there is no Unix sockets
tor_config['DataDirectory'] = datadir
else:
control_socket = os.path.join(datadir, 'control') control_socket = os.path.join(datadir, 'control')
tor_config = { tor_config['ControlSocket'] = control_socket
'SocksPort': '9050',
# 'DataDirectory': datadir, # had an exception with control socket port = config.safeGetInt('bitmessagesettings', 'socksport', 9050)
'ControlSocket': control_socket
}
port = config.safeGet('bitmessagesettings', 'socksport', '9050')
for attempt in range(50): for attempt in range(50):
if attempt > 0: if attempt > 0:
port = random.randint(32767, 65535) port = random.randint(32767, 65535)
tor_config['SocksPort'] = str(port) tor_config['SocksPort'] = str(port)
if tor_config.get('DataDirectory'):
control_port = port + 1
tor_config['ControlPort'] = str(control_port)
# It's recommended to use separate tor instance for hidden services. # It's recommended to use separate tor instance for hidden services.
# So if there is a system wide tor, use it for outbound connections. # So if there is a system wide tor, use it for outbound connections.
try: try:
stem.process.launch_tor_with_config( stem.process.launch_tor_with_config(
tor_config, take_ownership=True, timeout=20, tor_config, take_ownership=True,
timeout=(None if sys.platform.startswith('win') else 20),
init_msg_handler=logwrite) init_msg_handler=logwrite)
except OSError: except OSError:
if not attempt: if not attempt:
@ -90,14 +101,20 @@ def connect_plugin(config): # pylint: disable=too-many-branches
else: else:
logwrite('Started tor on port %s' % port) logwrite('Started tor on port %s' % port)
break break
else:
logwrite('Failed to start tor')
return
config.setTemp('bitmessagesettings', 'socksproxytype', 'SOCKS5') config.setTemp('bitmessagesettings', 'socksproxytype', 'SOCKS5')
if config.safeGetBoolean('bitmessagesettings', 'sockslisten'): if config.safeGetBoolean('bitmessagesettings', 'sockslisten'):
# need a hidden service for inbound connections # need a hidden service for inbound connections
try: try:
controller = stem.control.Controller.from_socket_file( controller = (
control_socket) stem.control.Controller.from_port(port=control_port)
if sys.platform.startswith('win') else
stem.control.Controller.from_socket_file(control_socket)
)
controller.authenticate() controller.authenticate()
except stem.SocketError: except stem.SocketError:
# something goes wrong way # something goes wrong way