Rev912, Keep track site added time, UiRequest xss quickfix, Cleanup peerPing output
This commit is contained in:
parent
9039896247
commit
5b59da2435
4 changed files with 8 additions and 9 deletions
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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=":("):
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue