12db4cc0e7
Fix missing Note access checks in by moving Note#search to updated NoteFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 ## Which fixes are in this MR? ⚠️ - Potentially untested 💣 - No test coverage 🚥 - Test coverage of some sort exists (a test failed when error raised) 🚦 - Test coverage of return value (a test failed when nil used) ✅ - Permissions check tested ### Note lookup without access check - [x] ✅ app/finders/notes_finder.rb:13 :download_code check - [x] ✅ app/finders/notes_finder.rb:19 `SnippetsFinder` - [x] ✅ app/models/note.rb:121 [`Issue#visible_to_user`] - [x] ✅ lib/gitlab/project_search_results.rb:113 - This is the only use of `app/models/note.rb:121` above, but importantly has no access checks at all. This means it leaks MR comments and snippets when those features are `team-only` in addition to the issue comments which would be fixed by `app/models/note.rb:121`. - It is only called from SearchController where `can?(current_user, :download_code, @project)` is checked, so commit comments are not leaked. ### Previous discussions - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_13_13 `: download_code` check on commit - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_19_19 `SnippetsFinder` should be used - `SnippetsFinder` should check if the snippets feature is enabled -> https://gitlab.com/gitlab-org/gitlab-ce/issues/25223 ### Acceptance criteria met? - [x] Tests added for new code - [x] TODO comments removed - [x] Squashed and removed skipped tests - [x] Changelog entry - [ ] State Gitlab versions affected and issue severity in description - [ ] Create technical debt issue for NotesFinder. - Either split into `NotesFinder::ForTarget` and `NotesFinder::Search` or consider object per notable type such as `NotesFinder::OnIssue`. For the first option could create `NotesFinder::Base` which is either inherited from or which can be included in the other two. - Avoid case statement anti-pattern in this finder with use of `NotesFinder::OnCommit` etc. Consider something on the finder for this? `Model.finder(user, project)` - Move `inc_author` to the controller, and implement `related_notes` to replace `non_diff_notes`/`mr_and_commit_notes` See merge request !2035
205 lines
7.1 KiB
Ruby
205 lines
7.1 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe NotesFinder do
|
|
let(:user) { create :user }
|
|
let(:project) { create(:empty_project) }
|
|
|
|
before do
|
|
project.team << [user, :master]
|
|
end
|
|
|
|
describe '#execute' do
|
|
it 'finds notes on snippets when project is public and user isnt a member'
|
|
|
|
it 'finds notes on merge requests' do
|
|
create(:note_on_merge_request, project: project)
|
|
|
|
notes = described_class.new(project, user).execute
|
|
|
|
expect(notes.count).to eq(1)
|
|
end
|
|
|
|
it 'finds notes on snippets' do
|
|
create(:note_on_project_snippet, project: project)
|
|
|
|
notes = described_class.new(project, user).execute
|
|
|
|
expect(notes.count).to eq(1)
|
|
end
|
|
|
|
it "excludes notes on commits the author can't download" do
|
|
project = create(:project, :private)
|
|
note = create(:note_on_commit, project: project)
|
|
params = { target_type: 'commit', target_id: note.noteable.id }
|
|
|
|
notes = described_class.new(project, create(:user), params).execute
|
|
|
|
expect(notes.count).to eq(0)
|
|
end
|
|
|
|
it 'succeeds when no notes found' do
|
|
notes = described_class.new(project, create(:user)).execute
|
|
|
|
expect(notes.count).to eq(0)
|
|
end
|
|
|
|
context 'on restricted projects' do
|
|
let(:project) do
|
|
create(:empty_project, :public, issues_access_level: ProjectFeature::PRIVATE,
|
|
snippets_access_level: ProjectFeature::PRIVATE,
|
|
merge_requests_access_level: ProjectFeature::PRIVATE)
|
|
end
|
|
|
|
it 'publicly excludes notes on merge requests' do
|
|
create(:note_on_merge_request, project: project)
|
|
|
|
notes = described_class.new(project, create(:user)).execute
|
|
|
|
expect(notes.count).to eq(0)
|
|
end
|
|
|
|
it 'publicly excludes notes on issues' do
|
|
create(:note_on_issue, project: project)
|
|
|
|
notes = described_class.new(project, create(:user)).execute
|
|
|
|
expect(notes.count).to eq(0)
|
|
end
|
|
|
|
it 'publicly excludes notes on snippets' do
|
|
create(:note_on_project_snippet, project: project)
|
|
|
|
notes = described_class.new(project, create(:user)).execute
|
|
|
|
expect(notes.count).to eq(0)
|
|
end
|
|
end
|
|
|
|
context 'for target' do
|
|
let(:project) { create(:project) }
|
|
let(:note1) { create :note_on_commit, project: project }
|
|
let(:note2) { create :note_on_commit, project: project }
|
|
let(:commit) { note1.noteable }
|
|
let(:params) { { target_id: commit.id, target_type: 'commit', last_fetched_at: 1.hour.ago.to_i } }
|
|
|
|
before do
|
|
note1
|
|
note2
|
|
end
|
|
|
|
it 'finds all notes' do
|
|
notes = described_class.new(project, user, params).execute
|
|
expect(notes.size).to eq(2)
|
|
end
|
|
|
|
it 'finds notes on merge requests' do
|
|
note = create(:note_on_merge_request, project: project)
|
|
params = { target_type: 'merge_request', target_id: note.noteable.id }
|
|
|
|
notes = described_class.new(project, user, params).execute
|
|
|
|
expect(notes).to include(note)
|
|
end
|
|
|
|
it 'finds notes on snippets' do
|
|
note = create(:note_on_project_snippet, project: project)
|
|
params = { target_type: 'snippet', target_id: note.noteable.id }
|
|
|
|
notes = described_class.new(project, user, params).execute
|
|
|
|
expect(notes.count).to eq(1)
|
|
end
|
|
|
|
it 'raises an exception for an invalid target_type' do
|
|
params.merge!(target_type: 'invalid')
|
|
expect { described_class.new(project, user, params).execute }.to raise_error('invalid target_type')
|
|
end
|
|
|
|
it 'filters out old notes' do
|
|
note2.update_attribute(:updated_at, 2.hours.ago)
|
|
notes = described_class.new(project, user, params).execute
|
|
expect(notes).to eq([note1])
|
|
end
|
|
|
|
context 'confidential issue notes' do
|
|
let(:confidential_issue) { create(:issue, :confidential, project: project, author: user) }
|
|
let!(:confidential_note) { create(:note, noteable: confidential_issue, project: confidential_issue.project) }
|
|
|
|
let(:params) { { target_id: confidential_issue.id, target_type: 'issue', last_fetched_at: 1.hour.ago.to_i } }
|
|
|
|
it 'returns notes if user can see the issue' do
|
|
expect(described_class.new(project, user, params).execute).to eq([confidential_note])
|
|
end
|
|
|
|
it 'raises an error if user can not see the issue' do
|
|
user = create(:user)
|
|
expect { described_class.new(project, user, params).execute }.to raise_error(ActiveRecord::RecordNotFound)
|
|
end
|
|
|
|
it 'raises an error for project members with guest role' do
|
|
user = create(:user)
|
|
project.team << [user, :guest]
|
|
|
|
expect { described_class.new(project, user, params).execute }.to raise_error(ActiveRecord::RecordNotFound)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '.search' do
|
|
let(:project) { create(:empty_project, :public) }
|
|
let(:note) { create(:note_on_issue, note: 'WoW', project: project) }
|
|
|
|
it 'returns notes with matching content' do
|
|
expect(described_class.new(note.project, nil, search: note.note).execute).to eq([note])
|
|
end
|
|
|
|
it 'returns notes with matching content regardless of the casing' do
|
|
expect(described_class.new(note.project, nil, search: 'WOW').execute).to eq([note])
|
|
end
|
|
|
|
it 'returns commit notes user can access' do
|
|
note = create(:note_on_commit, project: project)
|
|
|
|
expect(described_class.new(note.project, create(:user), search: note.note).execute).to eq([note])
|
|
end
|
|
|
|
context "confidential issues" do
|
|
let(:user) { create(:user) }
|
|
let(:confidential_issue) { create(:issue, :confidential, project: project, author: user) }
|
|
let(:confidential_note) { create(:note, note: "Random", noteable: confidential_issue, project: confidential_issue.project) }
|
|
|
|
it "returns notes with matching content if user can see the issue" do
|
|
expect(described_class.new(confidential_note.project, user, search: confidential_note.note).execute).to eq([confidential_note])
|
|
end
|
|
|
|
it "does not return notes with matching content if user can not see the issue" do
|
|
user = create(:user)
|
|
expect(described_class.new(confidential_note.project, user, search: confidential_note.note).execute).to be_empty
|
|
end
|
|
|
|
it "does not return notes with matching content for project members with guest role" do
|
|
user = create(:user)
|
|
project.team << [user, :guest]
|
|
expect(described_class.new(confidential_note.project, user, search: confidential_note.note).execute).to be_empty
|
|
end
|
|
|
|
it "does not return notes with matching content for unauthenticated users" do
|
|
expect(described_class.new(confidential_note.project, nil, search: confidential_note.note).execute).to be_empty
|
|
end
|
|
end
|
|
|
|
context 'inlines SQL filters on subqueries for performance' do
|
|
let(:sql) { described_class.new(note.project, nil, search: note.note).execute.to_sql }
|
|
let(:number_of_noteable_types) { 4 }
|
|
|
|
specify 'project_id check' do
|
|
expect(sql.scan(/project_id/).count).to be >= (number_of_noteable_types + 2)
|
|
end
|
|
|
|
specify 'search filter' do
|
|
expect(sql.scan(/LIKE/).count).to be >= number_of_noteable_types
|
|
end
|
|
end
|
|
end
|
|
end
|