From 5b59da2435691f6859e8942e3365ce402893dc0f Mon Sep 17 00:00:00 2001 From: HelloZeroNet Date: Tue, 1 Mar 2016 23:16:31 +0100 Subject: [PATCH] Rev912, Keep track site added time, UiRequest xss quickfix, Cleanup peerPing output --- src/Config.py | 2 +- src/Site/Site.py | 5 ++++- src/Ui/UiRequest.py | 2 +- src/main.py | 8 ++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Config.py b/src/Config.py index e372a4a2..7fedb290 100644 --- a/src/Config.py +++ b/src/Config.py @@ -8,7 +8,7 @@ class Config(object): def __init__(self, argv): self.version = "0.3.6" - self.rev = 909 + self.rev = 912 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/Site/Site.py b/src/Site/Site.py index 9cf35622..90f14442 100644 --- a/src/Site/Site.py +++ b/src/Site/Site.py @@ -80,7 +80,7 @@ class Site(object): if self.address in sites_settings: self.settings = sites_settings[self.address] else: - self.settings = {"own": False, "serving": True, "permissions": []} # Default + self.settings = {"own": False, "serving": True, "permissions": [], "added": int(time.time())} # Default # Add admin permissions to homepage if self.address == config.homepage and "ADMIN" not in self.settings["permissions"]: @@ -162,6 +162,9 @@ class Site(object): gevent.joinall(file_threads) self.log.debug("%s: DownloadContent ended in %.2fs" % (inner_path, time.time() - s)) + if not self.worker_manager.tasks: + self.onComplete() # No more task trigger site complete + return True # Return bad files with less than 3 retry diff --git a/src/Ui/UiRequest.py b/src/Ui/UiRequest.py index e70b3b6c..9581a1f6 100644 --- a/src/Ui/UiRequest.py +++ b/src/Ui/UiRequest.py @@ -495,7 +495,7 @@ class UiRequest(object): # Send file not found error def error404(self, path=""): self.sendHeader(404) - return self.formatError("Not Found", path.encode("utf8"), details=False) + return self.formatError("Not Found", cgi.escape(path.encode("utf8")), details=False) # Internal server error def error500(self, message=":("): diff --git a/src/main.py b/src/main.py index 87e089f8..fdfbe3b3 100644 --- a/src/main.py +++ b/src/main.py @@ -322,17 +322,13 @@ class Actions(object): logging.info("Pinging 5 times peer: %s:%s..." % (peer_ip, int(peer_port))) peer = Peer(peer_ip, peer_port) for i in range(5): - s = time.time() - print peer.ping(), - print "Response time: %.3fs (crypt: %s)" % (time.time() - s, peer.connection.crypt) + print "Response time: %.3fs (crypt: %s)" % (peer.ping(), peer.connection.crypt) time.sleep(1) peer.remove() print "Reconnect test..." peer = Peer(peer_ip, peer_port) for i in range(5): - s = time.time() - print peer.ping(), - print "Response time: %.3fs (crypt: %s)" % (time.time() - s, peer.connection.crypt) + print "Response time: %.3fs (crypt: %s)" % (peer.ping(), peer.connection.crypt) time.sleep(1)