Bitmessage/MiNode
3
0
Fork 1
Code Pull Requests 9 Actions Activity

WIP: Add support for tor using PySocks and optionally stem #2

Draft
lee.miller wants to merge 22 commits from lee.miller/MiNode:tor into v0.3
pull from: lee.miller/MiNode:tor
merge into: Bitmessage:v0.3
Conversation 0 Commits 22 Files Changed 16 +12 -9
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8c1454e572 - Show all commits

18
minode/main.py
View File

@ -271,21 +271,21 @@ def main():
'Error while creating data directory in: %s', 'Error while creating data directory in: %s',
shared.data_directory, exc_info=True) shared.data_directory, exc_info=True)
if shared.socks_proxy: if shared.socks_proxy and shared.send_outgoing_connections:
try: try:
socks.PROXY_TYPES[shared.socks_proxy.scheme.upper()] socks.PROXY_TYPES[shared.socks_proxy.scheme.upper()]
except KeyError: except KeyError:
logging.error('Unsupported proxy schema!') logging.error('Unsupported proxy schema!')
return return
if shared.tor: if shared.tor:
try: try:
from . import tor from . import tor
except ImportError: except ImportError:
logging.info('Failed to import tor module.', exc_info=True) logging.info('Failed to import tor module.', exc_info=True)
else: else:
if not tor.start_tor_service(): if not tor.start_tor_service():
logging.warning('Failed to start tor service.') logging.warning('Failed to start tor service.')
if shared.ip_enabled and not shared.trusted_peer and not shared.tor: if shared.ip_enabled and not shared.trusted_peer and not shared.tor:
bootstrap_from_dns() bootstrap_from_dns()

3
minode/tor.py
View File

@ -75,6 +75,9 @@ def start_tor_service():
logging.debug('Failed to start tor.') logging.debug('Failed to start tor.')
return return
if not shared.listen_for_connections:
return True
try: try:
controller = stem.control.Controller.from_socket_file(control_socket) controller = stem.control.Controller.from_socket_file(control_socket)
controller.authenticate() controller.authenticate()