Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-18 04:04:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict in web.py

Browse Source
This commit is contained in:
whew 2021-05-31 12:04:24 +00:00 committed by GitHub
parent ea72440543
commit b8b7885a52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cli/onionshare_cli/web/web.py
View File

@ -223,7 +223,7 @@ class Web:
return _check_login() return _check_login()
@self.app.after_request @self.app.after_request
def add_security_headers(r): def add_security_headers(self, r):
""" """
Add security headers to a response Add security headers to a response
""" """
@ -244,6 +244,20 @@ class Web:
mode.cur_history_id += 1 mode.cur_history_id += 1
return self.error404(history_id) return self.error404(history_id)
@self.app.errorhandler(405)
def method_not_allowed(e):
mode = self.get_mode()
history_id = mode.cur_history_id
mode.cur_history_id += 1
return self.error405(history_id)
@self.app.errorhandler(500)
def method_not_allowed(e):
mode = self.get_mode()
history_id = mode.cur_history_id
mode.cur_history_id += 1
return self.error500(history_id)
@self.app.route("/<password_candidate>/shutdown") @self.app.route("/<password_candidate>/shutdown")
def shutdown(password_candidate): def shutdown(password_candidate):
""" """
@ -289,6 +303,8 @@ class Web:
return render_template("403.html", static_url_path=self.static_url_path), 403 return render_template("403.html", static_url_path=self.static_url_path), 403
def error404(self, history_id): def error404(self, history_id):
mode = self.get_mode()
if mode.supports_file_requests:
self.add_request( self.add_request(
self.REQUEST_INDIVIDUAL_FILE_STARTED, self.REQUEST_INDIVIDUAL_FILE_STARTED,
request.path, request.path,
@ -299,6 +315,8 @@ class Web:
return render_template("404.html", static_url_path=self.static_url_path), 404 return render_template("404.html", static_url_path=self.static_url_path), 404
def error405(self, history_id): def error405(self, history_id):
mode = self.get_mode()
if mode.supports_file_requests:
self.add_request( self.add_request(
self.REQUEST_INDIVIDUAL_FILE_STARTED, self.REQUEST_INDIVIDUAL_FILE_STARTED,
request.path, request.path,
@ -308,6 +326,18 @@ class Web:
self.add_request(Web.REQUEST_OTHER, request.path) self.add_request(Web.REQUEST_OTHER, request.path)
return render_template("405.html", static_url_path=self.static_url_path), 405 return render_template("405.html", static_url_path=self.static_url_path), 405
def error500(self, history_id):
mode = self.get_mode()
if mode.supports_file_requests:
self.add_request(
self.REQUEST_INDIVIDUAL_FILE_STARTED,
request.path,
{"id": history_id, "status_code": 500},
)
self.add_request(Web.REQUEST_OTHER, request.path)
return render_template("500.html", static_url_path=self.static_url_path), 500
def _safe_select_jinja_autoescape(self, filename): def _safe_select_jinja_autoescape(self, filename):
if filename is None: if filename is None:
return True return True