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

Rev907, Wait 200ms to opener close, Enable wrapper nonce security by default for new sites

Browse source
This commit is contained in:
HelloZeroNet 2016-02-21 11:44:10 +01:00
parent da58f5a89c
commit b2fb1fcd3c
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -8,7 +8,7 @@ class Config(object):
def __init__(self, argv):
self.version = "0.3.6"
self.rev = 906
self.rev = 907
self.argv = argv
self.action = None
self.config_file = "zeronet.conf"

4
src/Ui/media/Wrapper.coffee
View file

@ -388,6 +388,7 @@ if window.opener and window.postmessage_nonce_security == false
# Window opener security problem workaround: Open a new window, close this one
console.log "Opener present:", window.opener
setTimeout ( -> # Wait 200ms to parent tab closing
console.log "Opener still present:", window.opener
if window.opener
# Opener still present, display message
elem = $("<div class='opener-overlay'><div class='dialog'>You have opened this page by clicking on a link. Please, confirm if you want to load this site.<a href='?' target='_blank' class='button'>Open site</a></div></div>")
@ -400,6 +401,7 @@ if window.opener and window.postmessage_nonce_security == false
window.location.reload()
# Opener gone, continue init
# window.wrapper = new Wrapper(ws_url)
), 150
# window.wrapper.reload()
), 200
else
window.wrapper = new Wrapper(ws_url)

3
src/Ui/media/all.js
View file

@ -1270,6 +1270,7 @@ jQuery.extend( jQuery.easing,
console.log("Opener present:", window.opener);
setTimeout((function() {
var elem;
console.log("Opener still present:", window.opener);
if (window.opener) {
elem = $("<div class='opener-overlay'><div class='dialog'>You have opened this page by clicking on a link. Please, confirm if you want to load this site.<a href='?' target='_blank' class='button'>Open site</a></div></div>");
elem.find('a').on("click", function() {
@ -1281,7 +1282,7 @@ jQuery.extend( jQuery.easing,
} else {
return window.location.reload();
}
}), 150);
}), 200);
} else {
window.wrapper = new Wrapper(ws_url);
}

4
src/main.py
View file

@ -155,7 +155,7 @@ class Actions(object):
logging.info("Creating content.json...")
site = Site(address)
site.content_manager.sign(privatekey=privatekey)
site.content_manager.sign(privatekey=privatekey, extend={"postmessage_nonce_security": True})
site.settings["own"] = True
site.saveSettings()
@ -335,6 +335,7 @@ class Actions(object):
print "Response time: %.3fs (crypt: %s)" % (time.time() - s, peer.connection.crypt)
time.sleep(1)
def peerGetFile(self, peer_ip, peer_port, site, filename, benchmark=False):
logging.info("Opening a simple connection server")
global file_server
@ -355,6 +356,7 @@ class Actions(object):
else:
print peer.getFile(site, filename).read()
def peerCmd(self, peer_ip, peer_port, cmd, parameters):
logging.info("Opening a simple connection server")
global file_server