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

Send noscript header to error messages and OPTIONS request

Browse source
This commit is contained in:
shortcutme 2019-04-11 01:29:32 +02:00
parent f94ecb3ec5
commit 1ce4f99b80
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Ui/UiRequest.py
View file

@ -104,7 +104,7 @@ class UiRequest(object):
extra_headers = {"Access-Control-Allow-Origin": "null"} extra_headers = {"Access-Control-Allow-Origin": "null"}
self.sendHeader(content_type=content_type, extra_headers=extra_headers) self.sendHeader(content_type=content_type, extra_headers=extra_headers, noscript=True)
return "" return ""
if path == "/": if path == "/":
@ -785,23 +785,23 @@ class UiRequest(object):
# Send bad request error # Send bad request error
def error400(self, message=""): def error400(self, message=""):
self.sendHeader(400) self.sendHeader(400, noscript=True)
return self.formatError("Bad Request", message) return self.formatError("Bad Request", message)
# You are not allowed to access this # You are not allowed to access this
def error403(self, message="", details=True): def error403(self, message="", details=True):
self.sendHeader(403) self.sendHeader(403, noscript=True)
self.log.error("Error 403: %s" % message) self.log.error("Error 403: %s" % message)
return self.formatError("Forbidden", message, details=details) return self.formatError("Forbidden", message, details=details)
# Send file not found error # Send file not found error
def error404(self, path=""): def error404(self, path=""):
self.sendHeader(404) self.sendHeader(404, noscript=True)
return self.formatError("Not Found", path, details=False) return self.formatError("Not Found", path, details=False)
# Internal server error # Internal server error
def error500(self, message=":("): def error500(self, message=":("):
self.sendHeader(500) self.sendHeader(500, noscript=True)
return self.formatError("Server error", message) return self.formatError("Server error", message)
@helper.encodeResponse @helper.encodeResponse
@ -824,7 +824,7 @@ class UiRequest(object):
</style> </style>
<h1>%s</h1> <h1>%s</h1>
<h2>%s</h3> <h2>%s</h3>
<h3>Please <a href="https://github.com/HelloZeroNet/ZeroNet/issues" target="_blank">report it</a> if you think this an error.</h3> <h3>Please <a href="https://github.com/HelloZeroNet/ZeroNet/issues" target="_top">report it</a> if you think this an error.</h3>
<h4>Details:</h4> <h4>Details:</h4>
<pre>%s</pre> <pre>%s</pre>
""" % (title, html.escape(message), html.escape(json.dumps(details, indent=4, sort_keys=True))) """ % (title, html.escape(message), html.escape(json.dumps(details, indent=4, sort_keys=True)))