HelloZeroNet/ZeroNet
1
0
Fork 0
mirror of https://github.com/HelloZeroNet/ZeroNet.git synced 2023-12-14 04:33:03 +01:00
Code Issues Projects Releases Wiki Activity

Support ipv6 in findHashIds request

Browse source
This commit is contained in:
shortcutme 2019-01-20 16:23:37 +01:00
parent 42495a9914
commit 18b9df62e4
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/File/FileRequest.py
View file

@ -350,22 +350,15 @@ class FileRequest(object):
self.response({"hashfield_raw": site.content_manager.hashfield.tostring()}) self.response({"hashfield_raw": site.content_manager.hashfield.tostring()})
def findHashIds(self, site, hash_ids, limit=100): def findHashIds(self, site, hash_ids, limit=100):
back_ip4 = {} back = collections.defaultdict(lambda: collections.defaultdict(list))
back_onion = {}
found = site.worker_manager.findOptionalHashIds(hash_ids, limit=limit) found = site.worker_manager.findOptionalHashIds(hash_ids, limit=limit)
for hash_id, peers in found.iteritems(): for hash_id, peers in found.iteritems():
back_onion[hash_id] = list(itertools.islice(( for peer in peers:
helper.packOnionAddress(peer.ip, peer.port) ip_type = helper.getIpType(peer.ip)
for peer in peers if len(back[ip_type][hash_id]) < 20:
if peer.ip.endswith("onion") back[ip_type][hash_id].append(peer.packMyAddress())
), 50)) return back
back_ip4[hash_id] = list(itertools.islice((
helper.packAddress(peer.ip, peer.port)
for peer in peers
if not peer.ip.endswith("onion")
), 50))
return back_ip4, back_onion
def actionFindHashIds(self, params): def actionFindHashIds(self, params):
site = self.sites.get(params["site"]) site = self.sites.get(params["site"])
@ -378,39 +371,39 @@ class FileRequest(object):
event_key = "%s_findHashIds_%s_%s" % (self.connection.ip, params["site"], len(params["hash_ids"])) event_key = "%s_findHashIds_%s_%s" % (self.connection.ip, params["site"], len(params["hash_ids"]))
if self.connection.cpu_time > 0.5 or not RateLimit.isAllowed(event_key, 60 * 5): if self.connection.cpu_time > 0.5 or not RateLimit.isAllowed(event_key, 60 * 5):
time.sleep(0.1) time.sleep(0.1)
back_ip4, back_onion = self.findHashIds(site, params["hash_ids"], limit=10) back = self.findHashIds(site, params["hash_ids"], limit=10)
else: else:
back_ip4, back_onion = self.findHashIds(site, params["hash_ids"]) back = self.findHashIds(site, params["hash_ids"])
RateLimit.called(event_key) RateLimit.called(event_key)
# Check my hashfield # Check my hashfield
if self.server.tor_manager and self.server.tor_manager.site_onions.get(site.address): # Running onion if self.server.tor_manager and self.server.tor_manager.getOnion(site.address): # Running onion
my_ip = helper.packOnionAddress(self.server.tor_manager.site_onions[site.address], self.server.port) my_ip = helper.packOnionAddress(self.server.tor_manager.getOnion(site.address), self.server.port)
my_back = back_onion my_ip_type = "onion"
elif config.ip_external: # External ip defined elif config.ip_external: # External ip defined
my_ip = helper.packAddress(config.ip_external, self.server.port) my_ip = helper.packAddress(config.ip_external, self.server.port)
my_back = back_ip4 my_ip_type = helper.getIpType(config.ip_external)
elif self.server.ip and self.server.ip != "*": # No external ip defined elif self.server.ip and self.server.ip != "*": # No external ip defined
my_ip = helper.packAddress(self.server.ip, self.server.port) my_ip = helper.packAddress(self.server.ip, self.server.port)
my_back = back_ip4 my_ip_type = helper.getIpType(self.server.ip)
else: else:
my_ip = None my_ip = None
my_back = back_ip4 my_ip_type = "ipv4"
my_hashfield_set = set(site.content_manager.hashfield) my_hashfield_set = set(site.content_manager.hashfield)
for hash_id in params["hash_ids"]: for hash_id in params["hash_ids"]:
if hash_id in my_hashfield_set: if hash_id in my_hashfield_set:
if hash_id not in my_back: if hash_id not in back[my_ip_type]:
my_back[hash_id] = [] back[my_ip_type][hash_id] = []
if my_ip: if my_ip:
my_back[hash_id].append(my_ip) # Add myself back[my_ip_type][hash_id].append(my_ip) # Add myself
if config.verbose: if config.verbose:
self.log.debug( self.log.debug(
"Found: IP4: %s, Onion: %s for %s hashids in %.3fs" % "Found: %s for %s hashids in %.3fs" %
(len(back_ip4), len(back_onion), len(params["hash_ids"]), time.time() - s) ({key: len(val) for key, val in back.iteritems()}, len(params["hash_ids"]), time.time() - s)
) )
self.response({"peers": back_ip4, "peers_onion": back_onion}) self.response({"peers": back["ipv4"], "peers_onion": back["onion"], "peers_ipv6": back["ipv6"]})
def actionSetHashfield(self, params): def actionSetHashfield(self, params):
site = self.sites.get(params["site"]) site = self.sites.get(params["site"])