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

Rev3354, Fix ajax loading files from archives

Browse source
This commit is contained in:
shortcutme 2018-03-09 15:01:45 +01:00
parent 645249afa9
commit 738fd1a09b
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/FilePack/FilePackPlugin.py
View file

@ -58,10 +58,18 @@ class UiRequestPlugin(object):
site.updateWebsocket(file_done=site.storage.getInnerPath(file_path)) site.updateWebsocket(file_done=site.storage.getInnerPath(file_path))
if not result: if not result:
return self.error404(path) return self.error404(path)
if self.get.get("ajax_key"):
requester_site = self.server.site_manager.get(path_parts["request_address"])
if self.get["ajax_key"] == requester_site.settings["ajax_key"]:
header_allow_ajax = True
else:
return self.error403("Invalid ajax_key")
try: try:
file = openArchiveFile(archive_path, path_within) file = openArchiveFile(archive_path, path_within)
content_type = self.getContentType(file_path) content_type = self.getContentType(file_path)
self.sendHeader(200, content_type=content_type, noscript=kwargs.get("header_noscript", False)) self.sendHeader(200, content_type=content_type, noscript=kwargs.get("header_noscript", False), allow_ajax=header_allow_ajax)
return self.streamFile(file) return self.streamFile(file)
except Exception as err: except Exception as err:
self.log.debug("Error opening archive file: %s" % err) self.log.debug("Error opening archive file: %s" % err)

2
src/Config.py
View file

@ -10,7 +10,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.6.2" self.version = "0.6.2"
self.rev = 3353 self.rev = 3354
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"

9
src/Ui/UiRequest.py
View file

@ -204,7 +204,7 @@ class UiRequest(object):
return referer return referer
# Send response headers # Send response headers
def sendHeader(self, status=200, content_type="text/html", noscript=False, extra_headers=[]): def sendHeader(self, status=200, content_type="text/html", noscript=False, allow_ajax=False, extra_headers=[]):
headers = {} headers = {}
headers["Version"] = "HTTP/1.1" headers["Version"] = "HTTP/1.1"
headers["Connection"] = "Keep-Alive" headers["Connection"] = "Keep-Alive"
@ -216,6 +216,9 @@ class UiRequest(object):
if noscript: if noscript:
headers["Content-Security-Policy"] = "default-src 'none'; sandbox allow-top-navigation allow-forms; img-src 'self'; font-src 'self'; media-src 'self'; style-src 'self' 'unsafe-inline';" headers["Content-Security-Policy"] = "default-src 'none'; sandbox allow-top-navigation allow-forms; img-src 'self'; font-src 'self'; media-src 'self'; style-src 'self' 'unsafe-inline';"
if allow_ajax:
headers["Access-Control-Allow-Origin"] = "null"
if self.env["REQUEST_METHOD"] == "OPTIONS": if self.env["REQUEST_METHOD"] == "OPTIONS":
# Allow json access # Allow json access
headers["Access-Control-Allow-Headers"] = "Origin, X-Requested-With, Content-Type, Accept, Cookie, Range" headers["Access-Control-Allow-Headers"] = "Origin, X-Requested-With, Content-Type, Accept, Cookie, Range"
@ -569,9 +572,7 @@ class UiRequest(object):
status = 206 status = 206
else: else:
status = 200 status = 200
if header_allow_ajax: self.sendHeader(status, content_type=content_type, noscript=header_noscript, allow_ajax=header_allow_ajax, extra_headers=extra_headers)
extra_headers["Access-Control-Allow-Origin"] = "null"
self.sendHeader(status, content_type=content_type, noscript=header_noscript, extra_headers=extra_headers)
if self.env["REQUEST_METHOD"] != "OPTIONS": if self.env["REQUEST_METHOD"] != "OPTIONS":
if not file_obj: if not file_obj:
file_obj = open(file_path, "rb") file_obj = open(file_path, "rb")