diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-19 17:20:25 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-19 17:20:25 +0100 |
| commit | 88acb99747c05f43f4563774f498993b27915493 (patch) | |
| tree | 3184c8b912fdf11d29f7254ab879447f677e353b /synapse/rest/media/v1/download_resource.py | |
| parent | Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-88acb99747c05f43f4563774f498993b27915493.tar.xz | |
Merge branch 'release-v0.18.0' of github.com:matrix-org/synapse v0.18.0
Diffstat (limited to 'synapse/rest/media/v1/download_resource.py')
| -rw-r--r-- | synapse/rest/media/v1/download_resource.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/download_resource.py b/synapse/rest/media/v1/download_resource.py index 9f0625a822..a45ee9483e 100644 --- a/synapse/rest/media/v1/download_resource.py +++ b/synapse/rest/media/v1/download_resource.py @@ -45,7 +45,14 @@ class DownloadResource(Resource): @request_handler() @defer.inlineCallbacks def _async_render_GET(self, request): - request.setHeader("Content-Security-Policy", "sandbox") + request.setHeader( + "Content-Security-Policy", + "default-src 'none';" + " script-src 'none';" + " plugin-types application/pdf;" + " style-src 'unsafe-inline';" + " object-src 'self';" + ) server_name, media_id, name = parse_media_id(request) if server_name == self.server_name: yield self._respond_local_file(request, media_id, name) |