summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelogs/unreleased/dz-api-x-frame.yml4
-rw-r--r--lib/api/api.rb1
2 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/dz-api-x-frame.yml b/changelogs/unreleased/dz-api-x-frame.yml
new file mode 100644
index 00000000000..0483a9e076a
--- /dev/null
+++ b/changelogs/unreleased/dz-api-x-frame.yml
@@ -0,0 +1,4 @@
+---
+title: Restrict API X-Frame-Options to same origin
+merge_request:
+author:
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 1bf20f76ad6..6b78443cbcb 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -44,6 +44,7 @@ module API
end
before { allow_access_with_scope :api }
+ before { header['X-Frame-Options'] = 'SAMEORIGIN' }
rescue_from Gitlab::Access::AccessDeniedError do
rack_response({ 'message' => '403 Forbidden' }.to_json, 403)