diff options
author | Robert Speicher <robert@gitlab.com> | 2016-06-14 14:53:01 +0000 |
---|---|---|
committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2016-06-14 19:30:27 +0200 |
commit | 934d12102fba9fce7440019668c545518c5af796 (patch) | |
tree | 00723ca66feb342db18f81de01a4f4a3957b800e | |
parent | 176e7516e0babd5ecd18d89aef400b9e77018e92 (diff) | |
download | gitlab-ce-934d12102fba9fce7440019668c545518c5af796.tar.gz |
Merge branch '17298-wiki-xss' into 'master'
Forbid scripting for wiki files
Wiki files (not pages - files in the repo) are just sent to the browser
with whatever content-type the mime_types gem assigns to them based on
their extension. As this is from the same domain as the GitLab
application, this is an XSS vulnerability.
Set a CSP forbidding all sources for scripting, CSS, XHR, etc. on these
files.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17298.
See merge request !1969
-rw-r--r-- | app/controllers/projects/wikis_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index 88fccfed509..712e73bb96c 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -16,6 +16,9 @@ class Projects::WikisController < Projects::ApplicationController if @page render 'show' elsif file = @project_wiki.find_file(params[:id], params[:version_id]) + response.headers['Content-Security-Policy'] = "default-src 'none'" + response.headers['X-Content-Security-Policy'] = "default-src 'none'" + if file.on_disk? send_file file.on_disk_path, disposition: 'inline' else |