diff options
author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-26 21:40:17 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-26 21:40:17 +0000 |
commit | 1fe34ee740a0988233e9befb2b6dc85b88615927 (patch) | |
tree | d7a286b260b408eb3097a755b74969593fc13a84 | |
parent | 455b50be36a5f840dc613f28f490ecb95305759c (diff) | |
parent | bbff111fe0fccb1ec35e5b7d0fe232518dd3fe2b (diff) | |
download | gitlab-ce-1fe34ee740a0988233e9befb2b6dc85b88615927.tar.gz |
Merge branch 'security-11-10-mr-head-pipeline-leak' into '11-10-stable'
Fix MR head pipeline leak
See merge request gitlab/gitlabhq!3156
-rw-r--r-- | changelogs/unreleased/security-11-10-mr-head-pipeline-leak.yml | 5 | ||||
-rw-r--r-- | lib/api/entities.rb | 4 | ||||
-rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 25 |
3 files changed, 33 insertions, 1 deletions
diff --git a/changelogs/unreleased/security-11-10-mr-head-pipeline-leak.yml b/changelogs/unreleased/security-11-10-mr-head-pipeline-leak.yml new file mode 100644 index 00000000000..fe8c4dfb3c8 --- /dev/null +++ b/changelogs/unreleased/security-11-10-mr-head-pipeline-leak.yml @@ -0,0 +1,5 @@ +--- +title: Gate MR head_pipeline behind read_pipeline ability. +merge_request: +author: +type: security diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 44996b0c737..b6884f79de0 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -731,7 +731,9 @@ module API merge_request.metrics&.pipeline end - expose :head_pipeline, using: 'API::Entities::Pipeline' + expose :head_pipeline, using: 'API::Entities::Pipeline', if: -> (_, options) do + Ability.allowed?(options[:current_user], :read_pipeline, options[:project]) + end expose :diff_refs, using: Entities::DiffRefs diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index e148f6033a3..7c3b223fbb9 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -830,6 +830,31 @@ describe API::MergeRequests do end end + context 'head_pipeline' do + before do + merge_request.update(head_pipeline: create(:ci_pipeline)) + merge_request.project.project_feature.update(builds_access_level: 10) + end + + context 'when user can read the pipeline' do + it 'exposes pipeline information' do + get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user) + + expect(json_response).to include('head_pipeline') + end + end + + context 'when user can not read the pipeline' do + let(:guest) { create(:user) } + + it 'does not expose pipeline information' do + get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", guest) + + expect(json_response).not_to include('head_pipeline') + end + end + end + it 'returns the commits behind the target branch when include_diverged_commits_count is present' do allow_any_instance_of(merge_request.class).to receive(:diverged_commits_count).and_return(1) |