oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TrackerZero: don't register the same onion addresses multiple times

Browse source
This commit is contained in:
Vadim Ushakov 2020-03-09 19:24:57 +07:00
parent 822e53ebb8
commit f9706e3dc4
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
plugins/TrackerZero/TrackerZeroPlugin.py
View file

@ -18,11 +18,30 @@ class TrackerZero(object):
self.log = logging.getLogger("TrackerZero") self.log = logging.getLogger("TrackerZero")
self.log_once = set() self.log_once = set()
self.enabled_addresses = [] self.enabled_addresses = []
self.added_onions = set()
self.config_file_path = "%s/tracker-zero.json" % config.data_dir self.config_file_path = "%s/tracker-zero.json" % config.data_dir
self.config = None self.config = None
self.load() self.load()
atexit.register(self.save) atexit.register(self.save)
def addOnion(self, tor_manager, onion, private_key):
# XXX: TorManager hangs if Tor returns a code different from 250 OK,
# so we keep the list of already added onions to avoid adding them twice.
# TODO: Report to the upstream.
if onion in self.added_onions:
return onion
res = tor_manager.request(
"ADD_ONION RSA1024:%s port=%s" % (private_key, tor_manager.fileserver_port)
)
match = re.search("ServiceID=([A-Za-z0-9]+)", res)
if match:
onion_address = match.groups()[0]
self.added_onions.add(onion_address)
return onion_address
return None
def logOnce(self, message): def logOnce(self, message):
if message in self.log_once: if message in self.log_once:
return return
@ -248,14 +267,9 @@ class TrackerZero(object):
private_key = d.get("private_key") private_key = d.get("private_key")
if not private_key: if not private_key:
continue continue
res = tor_manager.request( onion_address = self.addOnion(tor_manager, address, private_key)
"ADD_ONION RSA1024:%s port=%s" % (private_key, tor_manager.fileserver_port) if onion_address == address:
) self.registerTrackerAddress("persistent onion address", "%s.onion" % onion_address, tor_manager.fileserver_port)
match = re.search("ServiceID=([A-Za-z0-9]+)", res)
if match:
onion_address = match.groups()[0]
if onion_address == address:
self.registerTrackerAddress("persistent onion address", "%s.onion" % onion_address, tor_manager.fileserver_port)
return len(self.enabled_addresses) > 0 return len(self.enabled_addresses) > 0