Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-02 06:26:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into 1470_tempfiles

Browse source
This commit is contained in:
Micah Lee 2021-12-01 20:37:45 -08:00
commit 5322d4f037
127 changed files with 4456 additions and 1626 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cli/onionshare_cli/web/web.py
View file

@ -199,15 +199,20 @@ class Web:
"""
for header, value in self.security_headers:
r.headers.set(header, value)
# Set a CSP header unless in website mode and the user has disabled it
if (
default_csp = "default-src 'self'; frame-ancestors 'none'; form-action 'self'; base-uri 'self'; img-src 'self' data:;"
if self.mode != "website" or (
not self.settings.get("website", "disable_csp")
or self.mode != "website"
and not self.settings.get("website", "custom_csp")
):
r.headers.set(
"Content-Security-Policy",
"default-src 'self'; frame-ancestors 'none'; form-action 'self'; base-uri 'self'; img-src 'self' data:;",
)
r.headers.set("Content-Security-Policy", default_csp)
else:
if self.settings.get("website", "custom_csp"):
r.headers.set(
"Content-Security-Policy",
self.settings.get("website", "custom_csp"),
)
return r
@self.app.errorhandler(404)