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

Closes #1538. Refactors 'onionservicesonly' to 'onlynet=onion', prevents bootstrapping from non-onion nodes when true, and prevents bootstrapping from any node but the trusted peer (when set) #1694

Open
sgj3 wants to merge 2 commits from sgj3/issue1538 into v0.6
pull from: sgj3/issue1538
merge into: Bitmessage:v0.6
Conversation 1 Commits 2 Files Changed 4 +22 -7
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3b58e1f251 - Show all commits

29
src/network/connectionpool.py
View File

@ -51,6 +51,12 @@ class BMConnectionPool(object):
BMConfigParser().safeGetInt( BMConfigParser().safeGetInt(
"bitmessagesettings", "maxuploadrate") "bitmessagesettings", "maxuploadrate")
) )
onionOnly_deprecated = BMConfigParser().safeGetBoolean(
"bitmessagesettings", "onionservicesonly")
onionOnly = BMConfigParser().safeGet(
"bitmessagesettings", "onlynet") == "onion"
self.onionOnly = onionOnly or onionOnly_deprecated
self.outboundConnections = {} self.outboundConnections = {}
self.inboundConnections = {} self.inboundConnections = {}
self.listeningSockets = {} self.listeningSockets = {}
@ -205,17 +211,17 @@ class BMConnectionPool(object):
def startBootstrappers(self): def startBootstrappers(self):
"""Run the process of resolving bootstrap hostnames""" """Run the process of resolving bootstrap hostnames"""
onion_seed = 'quzwelsuziwqgpt2.onion' # FIXME onion bootstrap server is down
proxy_type = BMConfigParser().safeGet( proxy_type = BMConfigParser().safeGet(
'bitmessagesettings', 'socksproxytype') 'bitmessagesettings', 'socksproxytype')
# A plugins may be added here # A plugins may be added here
hostname = None hostname = None
port = 8444
if not proxy_type or proxy_type == 'none': if not proxy_type or proxy_type == 'none':
connection_base = TCPConnection connection_base = TCPConnection
elif proxy_type == 'SOCKS5': elif proxy_type == 'SOCKS5':
connection_base = Socks5BMConnection connection_base = Socks5BMConnection
hostname = helper_random.randomchoice([
'quzwelsuziwqgpt2.onion', None
])
elif proxy_type == 'SOCKS4a': elif proxy_type == 'SOCKS4a':
connection_base = Socks4aBMConnection # FIXME: I cannot test connection_base = Socks4aBMConnection # FIXME: I cannot test
else: else:
@ -223,12 +229,21 @@ class BMConnectionPool(object):
# is handled in bitmessagemain before starting the connectionpool # is handled in bitmessagemain before starting the connectionpool
return return
bootstrapper = bootstrap(connection_base) if self.trustedPeer is not None:
if not hostname: hostname = self.trustedPeer.host
port = self.trustedPeer.port
elif proxy_type == "SOCKS5" or self.onionOnly:
if self.onionOnly:
hostname = onion_seed
else:
hostname = helper_random.randomchoice([
onion_seed, None])
if hostname is None:
port = helper_random.randomchoice([8080, 8444]) port = helper_random.randomchoice([8080, 8444])
hostname = 'bootstrap%s.bitmessage.org' % port hostname = 'bootstrap%s.bitmessage.org' % port
else:
port = 8444 bootstrapper = bootstrap(connection_base)
self.addConnection(bootstrapper(hostname, port)) self.addConnection(bootstrapper(hostname, port))
def loop(self): # pylint: disable=too-many-branches,too-many-statements def loop(self): # pylint: disable=too-many-branches,too-many-statements