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

Get new wrapper nonce API command to proper reload iframe content

Browse source
This commit is contained in:
shortcutme 2018-04-28 22:01:12 +02:00
parent 0e84bf95da
commit af4b4ae85c
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Ui/UiWebsocket.py
View file

@ -36,7 +36,7 @@ class UiWebsocket(object):
self.send_queue = [] # Messages to send to client self.send_queue = [] # Messages to send to client
self.admin_commands = ( self.admin_commands = (
"sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit", "sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit",
"channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "serverShowdirectory", "channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "serverShowdirectory", "serverGetWrapperNonce",
"certSet", "configSet", "permissionAdd", "permissionRemove" "certSet", "configSet", "permissionAdd", "permissionRemove"
) )
self.async_commands = ("fileGet", "fileList", "dirList", "fileNeed") self.async_commands = ("fileGet", "fileList", "dirList", "fileNeed")
@ -382,6 +382,10 @@ class UiWebsocket(object):
ret = self.formatServerInfo() ret = self.formatServerInfo()
self.response(to, ret) self.response(to, ret)
# Create a new wrapper nonce that allows to load html file
def actionServerGetWrapperNonce(self, to):
wrapper_nonce = self.request.getWrapperNonce()
self.response(to, wrapper_nonce)
def actionAnnouncerInfo(self, to): def actionAnnouncerInfo(self, to):
ret = self.formatAnnouncerInfo(self.site) ret = self.formatAnnouncerInfo(self.site)

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

@ -545,12 +545,16 @@ class Wrapper
return false return false
@loading.printLine res @loading.printLine res
@inner_loaded = false # Inner frame not loaded, just a 404 page displayed @inner_loaded = false # Inner frame not loaded, just a 404 page displayed
if reload if reload then @reloadIframe()
src = $("iframe").attr("src")
$("iframe").attr "src", ""
$("iframe").attr "src", src
return false return false
reloadIframe: =>
src = $("iframe").attr("src")
@ws.cmd "serverGetWrapperNonce", [], (wrapper_nonce) =>
src = src.replace(/wrapper_nonce=[A-Za-z0-9]+/, "wrapper_nonce=" + wrapper_nonce)
@log "Reloading iframe using url", src
$("iframe").attr "src", src
log: (args...) -> log: (args...) ->
console.log "[Wrapper]", args... console.log "[Wrapper]", args...