Commit ca41861e authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch '26019-restriction-on-evidence' into 'master'

Evidence - Added restriction for guest on Release page

Closes #26019

See merge request gitlab-org/gitlab!21102
parents 6e191adb 72d0a0ad
...@@ -10,6 +10,7 @@ class Projects::ReleasesController < Projects::ApplicationController ...@@ -10,6 +10,7 @@ class Projects::ReleasesController < Projects::ApplicationController
push_frontend_feature_flag(:release_evidence_collection, project) push_frontend_feature_flag(:release_evidence_collection, project)
end end
before_action :authorize_update_release!, only: %i[edit update] before_action :authorize_update_release!, only: %i[edit update]
before_action :authorize_download_code!, only: [:evidence]
def index def index
respond_to do |format| respond_to do |format|
......
---
title: Evidence - Added restriction for guest on Release page
merge_request: 21102
author:
type: changed
...@@ -1319,7 +1319,7 @@ module API ...@@ -1319,7 +1319,7 @@ module API
expose :milestones, using: Entities::Milestone, if: -> (release, _) { release.milestones.present? } expose :milestones, using: Entities::Milestone, if: -> (release, _) { release.milestones.present? }
expose :commit_path, expose_nil: false expose :commit_path, expose_nil: false
expose :tag_path, expose_nil: false expose :tag_path, expose_nil: false
expose :evidence_sha, expose_nil: false expose :evidence_sha, expose_nil: false, if: ->(_, _) { can_download_code? }
expose :assets do expose :assets do
expose :assets_count, as: :count do |release, _| expose :assets_count, as: :count do |release, _|
assets_to_exclude = can_download_code? ? [] : [:sources] assets_to_exclude = can_download_code? ? [] : [:sources]
...@@ -1329,7 +1329,7 @@ module API ...@@ -1329,7 +1329,7 @@ module API
expose :links, using: Entities::Releases::Link do |release, options| expose :links, using: Entities::Releases::Link do |release, options|
release.links.sorted release.links.sorted
end end
expose :evidence_file_path, expose_nil: false expose :evidence_file_path, expose_nil: false, if: ->(_, _) { can_download_code? }
end end
expose :_links do expose :_links do
expose :merge_requests_url, expose_nil: false expose :merge_requests_url, expose_nil: false
......
...@@ -184,6 +184,7 @@ describe Projects::ReleasesController do ...@@ -184,6 +184,7 @@ describe Projects::ReleasesController do
sign_in(user) sign_in(user)
end end
context 'when the user is a developer' do
it 'returns the correct evidence summary as a json' do it 'returns the correct evidence summary as a json' do
subject subject
...@@ -191,9 +192,11 @@ describe Projects::ReleasesController do ...@@ -191,9 +192,11 @@ describe Projects::ReleasesController do
end end
context 'when the release was created before evidence existed' do context 'when the release was created before evidence existed' do
it 'returns an empty json' do before do
release.evidence.destroy release.evidence.destroy
end
it 'returns an empty json' do
subject subject
expect(json_response).to eq({}) expect(json_response).to eq({})
...@@ -201,6 +204,23 @@ describe Projects::ReleasesController do ...@@ -201,6 +204,23 @@ describe Projects::ReleasesController do
end end
end end
context 'when the user is a guest for the project' do
before do
project.add_guest(user)
end
context 'when the project is private' do
let(:project) { private_project }
it_behaves_like 'not found'
end
context 'when the project is public' do
it_behaves_like 'successful request'
end
end
end
private private
def get_index def get_index
......
# frozen_string_literal: true
require 'spec_helper'
describe API::Entities::Release do
let_it_be(:project) { create(:project) }
let_it_be(:release) { create(:release, :with_evidence, project: project) }
let(:user) { create(:user) }
let(:entity) { described_class.new(release, current_user: user) }
subject { entity.as_json }
describe 'evidence' do
context 'when the current user can download code' do
it 'exposes the evidence sha and the json path' do
allow(Ability).to receive(:allowed?).and_call_original
allow(Ability).to receive(:allowed?)
.with(user, :download_code, project).and_return(true)
expect(subject[:evidence_sha]).to eq(release.evidence_sha)
expect(subject[:assets][:evidence_file_path]).to eq(
Gitlab::Routing.url_helpers.evidence_project_release_url(project,
release.tag,
format: :json)
)
end
end
context 'when the current user cannot download code' do
it 'does not expose any evidence data' do
allow(Ability).to receive(:allowed?).and_call_original
allow(Ability).to receive(:allowed?)
.with(user, :download_code, project).and_return(false)
expect(subject.keys).not_to include(:evidence_sha)
expect(subject[:assets].keys).not_to include(:evidence_file_path)
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment