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 0000000000000000000000000000000000000000..fe8c4dfb3c81889ceb26e096074d8d562f46f2b7 --- /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 44996b0c737543e84747930f7ffde7c4910646be..b6884f79de061babbcbe95bd7a894cde905f13a7 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 e148f6033a33cb03132b42e413338f052d8f7f8e..7c3b223fbb98860f0c4bc5dc23d3fa7645d63989 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)