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

Rev2144, Fix CSP header in FilePack plugin, Allow media-src and font-src from self source

Browse source
This commit is contained in:
shortcutme 2017-07-11 23:00:33 +02:00
parent c8f37674c6
commit e525ea2431
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/FilePack/FilePackPlugin.py
View file

@ -57,7 +57,7 @@ class UiRequestPlugin(object):
try: try:
file = openArchive(archive_path, path_within) file = openArchive(archive_path, path_within)
content_type = self.getContentType(file_path) content_type = self.getContentType(file_path)
self.sendHeader(200, content_type=content_type) self.sendHeader(200, content_type=content_type, noscript=kwargs.get("header_noscript", False))
return self.streamFile(file) return self.streamFile(file)
except Exception, err: except Exception, 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.5.6" self.version = "0.5.6"
self.rev = 2142 self.rev = 2144
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"

10
src/Ui/UiRequest.py
View file

@ -184,7 +184,7 @@ class UiRequest(object):
return referer return referer
# Send response headers # Send response headers
def sendHeader(self, status=200, content_type="text/html", extra_headers=[]): def sendHeader(self, status=200, content_type="text/html", noscript=False, extra_headers=[]):
headers = [] headers = []
headers.append(("Version", "HTTP/1.1")) headers.append(("Version", "HTTP/1.1"))
headers.append(("Connection", "Keep-Alive")) headers.append(("Connection", "Keep-Alive"))
@ -192,6 +192,10 @@ class UiRequest(object):
headers.append(("X-Frame-Options", "SAMEORIGIN")) headers.append(("X-Frame-Options", "SAMEORIGIN"))
if content_type != "text/html" and self.env.get("HTTP_REFERER") and self.isSameOrigin(self.getReferer(), self.getRequestUrl()): if content_type != "text/html" and self.env.get("HTTP_REFERER") and self.isSameOrigin(self.getReferer(), self.getRequestUrl()):
headers.append(("Access-Control-Allow-Origin", "*")) # Allow load font files from css headers.append(("Access-Control-Allow-Origin", "*")) # Allow load font files from css
if noscript:
headers.append(("Content-Security-Policy", "default-src 'none'; sandbox allow-top-navigation; img-src 'self'; font-src 'self'; media-src 'self'; style-src 'self' 'unsafe-inline';"))
if self.env["REQUEST_METHOD"] == "OPTIONS": if self.env["REQUEST_METHOD"] == "OPTIONS":
# Allow json access # Allow json access
headers.append(("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Cookie")) headers.append(("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Cookie"))
@ -498,8 +502,6 @@ class UiRequest(object):
extra_headers["Accept-Ranges"] = "bytes" extra_headers["Accept-Ranges"] = "bytes"
if header_length: if header_length:
extra_headers["Content-Length"] = str(file_size) extra_headers["Content-Length"] = str(file_size)
if header_noscript:
extra_headers["Content-Security-Policy"] = "default-src 'none'; sandbox allow-top-navigation; img-src 'self'; style-src 'self' 'unsafe-inline';"
if range: if range:
range_start = int(re.match(".*?([0-9]+)", range).group(1)) range_start = int(re.match(".*?([0-9]+)", range).group(1))
if re.match(".*?-([0-9]+)", range): if re.match(".*?-([0-9]+)", range):
@ -512,7 +514,7 @@ class UiRequest(object):
status = 206 status = 206
else: else:
status = 200 status = 200
self.sendHeader(status, content_type=content_type, extra_headers=extra_headers.items()) self.sendHeader(status, content_type=content_type, noscript=header_noscript, extra_headers=extra_headers.items())
if self.env["REQUEST_METHOD"] != "OPTIONS": if self.env["REQUEST_METHOD"] != "OPTIONS":
file = open(file_path, "rb") file = open(file_path, "rb")
if range_start: if range_start: