forked from HelloZeroNet/ZeroNet
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Version 0.3.5, Rev830, Full Tor mode support with hidden services, On…
…ion stats in Sidebar, GeoDB download fix using Tor, Gray out disabled sites in Stats page, Tor hidden service status in stat page, Benchmark sha256, Skyts tracker out expodie in, 2 new tracker using ZeroNet protocol, Keep SSL cert option between restarts, SSL Certificate pinning support for connections, Site lock support for connections, Certificate pinned connections using implicit SSL, Flood protection whitelist support, Foreign keys support for DB layer, Not support for SQL query helper, 0 length file get bugfix, Pex onion address support, Faster port testing, Faster uPnP port opening, Need connections more often on owned sites, Delay ZeroHello startup message if port check or Tor manager not ready yet, Use lockfiles to avoid double start, Save original socket on proxy monkey patching to get ability to connect localhost directly, Handle atomic write errors, Broken gevent https workaround helper, Rsa crypt functions, Plugin to Bootstrap using ZeroNet protocol
- Loading branch information
1 parent
c9578e9
commit e9d2cdf
Showing
99 changed files
with
9,479 additions
and
270 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| import hashlib | ||
| import time | ||
|
|
||
| from Plugin import PluginManager | ||
| from Peer import Peer | ||
| from util import helper | ||
| from Crypt import CryptRsa | ||
|
|
||
| allow_reload = False # No source reload supported in this plugin | ||
| time_full_announced = {} # Tracker address: Last announced all site to tracker | ||
| connection_pool = {} # Tracker address: Peer object | ||
|
|
||
|
|
||
| # Process result got back from tracker | ||
| def processPeerRes(site, peers): | ||
| added = 0 | ||
| # Ip4 | ||
| found_ip4 = 0 | ||
| for packed_address in peers["ip4"]: | ||
| found_ip4 += 1 | ||
| peer_ip, peer_port = helper.unpackAddress(packed_address) | ||
| if site.addPeer(peer_ip, peer_port): | ||
| added += 1 | ||
| # Onion | ||
| found_onion = 0 | ||
| for packed_address in peers["onion"]: | ||
| found_onion += 1 | ||
| peer_onion, peer_port = helper.unpackOnionAddress(packed_address) | ||
| if site.addPeer(peer_onion, peer_port): | ||
| added += 1 | ||
|
|
||
| if added: | ||
| site.worker_manager.onPeers() | ||
| site.updateWebsocket(peers_added=added) | ||
| site.log.debug("Found %s ip4, %s onion peers, new: %s" % (found_ip4, found_onion, added)) | ||
|
|
||
|
|
||
| @PluginManager.registerTo("Site") | ||
| class SitePlugin(object): | ||
| def announceTracker(self, tracker_protocol, tracker_address, fileserver_port=0, add_types=[], my_peer_id="", mode="start"): | ||
| if tracker_protocol != "zero": | ||
| return super(SitePlugin, self).announceTracker( | ||
| tracker_protocol, tracker_address, fileserver_port, add_types, my_peer_id, mode | ||
| ) | ||
|
|
||
| s = time.time() | ||
|
|
||
| need_types = ["ip4"] | ||
| if self.connection_server and self.connection_server.tor_manager.enabled: | ||
| need_types.append("onion") | ||
|
|
||
| if mode == "start" or mode == "more": # Single: Announce only this site | ||
| sites = [self] | ||
| full_announce = False | ||
| else: # Multi: Announce all currently serving site | ||
| full_announce = True | ||
| if time.time() - time_full_announced.get(tracker_address, 0) < 60 * 5: # No reannounce all sites within 5 minute | ||
| return True | ||
| time_full_announced[tracker_address] = time.time() | ||
| from Site import SiteManager | ||
| sites = [site for site in SiteManager.site_manager.sites.values() if site.settings["serving"]] | ||
|
|
||
| # Create request | ||
| request = { | ||
| "hashes": [], "onions": [], "port": fileserver_port, "need_types": need_types, "need_num": 20, "add": add_types | ||
| } | ||
| for site in sites: | ||
| if "onion" in add_types: | ||
| onion = self.connection_server.tor_manager.getOnion(site.address) | ||
| request["onions"].append(onion) | ||
| request["hashes"].append(hashlib.sha256(site.address).digest()) | ||
|
|
||
| # Tracker can remove sites that we don't announce | ||
| if full_announce: | ||
| request["delete"] = True | ||
|
|
||
| # Sent request to tracker | ||
| tracker = connection_pool.get(tracker_address) # Re-use tracker connection if possible | ||
| if not tracker: | ||
| tracker_ip, tracker_port = tracker_address.split(":") | ||
| tracker = Peer(tracker_ip, tracker_port, connection_server=self.connection_server) | ||
| connection_pool[tracker_address] = tracker | ||
| res = tracker.request("announce", request) | ||
|
|
||
| if not res or "peers" not in res: | ||
| self.log.debug("Announce to %s failed: %s" % (tracker_address, res)) | ||
| if full_announce: | ||
| time_full_announced[tracker_address] = 0 | ||
| return False | ||
|
|
||
| # Add peers from response to site | ||
| site_index = 0 | ||
| for site_res in res["peers"]: | ||
| site = sites[site_index] | ||
| processPeerRes(site, site_res) | ||
| site_index += 1 | ||
|
|
||
| # Check if we need to sign prove the onion addresses | ||
| if "onion_sign_this" in res: | ||
| self.log.debug("Signing %s for %s to add %s onions" % (res["onion_sign_this"], tracker_address, len(sites))) | ||
| request["onion_signs"] = {} | ||
| request["onion_sign_this"] = res["onion_sign_this"] | ||
| request["need_num"] = 0 | ||
| for site in sites: | ||
| onion = self.connection_server.tor_manager.getOnion(site.address) | ||
| sign = CryptRsa.sign(res["onion_sign_this"], self.connection_server.tor_manager.getPrivatekey(onion)) | ||
| request["onion_signs"][self.connection_server.tor_manager.getPublickey(onion)] = sign | ||
| res = tracker.request("announce", request) | ||
| if not res or "onion_sign_this" in res: | ||
| self.log.debug("Announce onion address to %s failed: %s" % (tracker_address, res)) | ||
| if full_announce: | ||
| time_full_announced[tracker_address] = 0 | ||
| return False | ||
|
|
||
| if full_announce: | ||
| tracker.remove() # Close connection, we don't need it in next 5 minute | ||
|
|
||
| return time.time() - s |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| import AnnounceZeroPlugin |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.