Commit 7e6befc0 authored by charlieablett's avatar charlieablett

Add disallowed fields to AttributeCleaner

parent b8c3e60e
...@@ -24,7 +24,19 @@ module Gitlab ...@@ -24,7 +24,19 @@ module Gitlab
private private
def prohibited_key?(key) def prohibited_key?(key)
key.end_with?('_id') && !ALLOWED_REFERENCES.include?(key) return false if allowed_reference?(key)
return true if 'cached_markdown_version'.equal?(key)
prohibited_suffices = %w(_id _html)
prohibited_suffices.each do |suffix|
return true if key.end_with?(suffix)
end
false
end
def allowed_reference?(key)
ALLOWED_REFERENCES.include?(key)
end end
def excluded_key?(key) def excluded_key?(key)
......
...@@ -141,9 +141,6 @@ excluded_attributes: ...@@ -141,9 +141,6 @@ excluded_attributes:
- :external_diff_size - :external_diff_size
issues: issues:
- :milestone_id - :milestone_id
notes:
- :note_html
- :cached_markdown_version
merge_requests: merge_requests:
- :milestone_id - :milestone_id
- :ref_fetched - :ref_fetched
......
...@@ -18,7 +18,11 @@ describe Gitlab::ImportExport::AttributeCleaner do ...@@ -18,7 +18,11 @@ describe Gitlab::ImportExport::AttributeCleaner do
'notid' => 99, 'notid' => 99,
'import_source' => 'whatever', 'import_source' => 'whatever',
'import_type' => 'whatever', 'import_type' => 'whatever',
'non_existent_attr' => 'whatever' 'non_existent_attr' => 'whatever',
'some_html' => '<p>dodgy html</p>',
'legit_html' => '<p>legit html</p>',
'_html' => '<p>perfectly ordinary html</p>',
'cached_markdown_version' => 12345
} }
end end
......
...@@ -10,6 +10,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do ...@@ -10,6 +10,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
create(:user, username: 'bernard_willms'), create(:user, username: 'bernard_willms'),
create(:user, username: 'saul_will') create(:user, username: 'saul_will')
] ]
@markdown_classes = [AbuseReport, Appearance, ApplicationSetting, BroadcastMessage, Issue, Label, MergeRequest, Milestone, Namespace, Project, Release, ResourceLabelEvent, Snippet, UserStatus]
RSpec::Mocks.with_temporary_scope do RSpec::Mocks.with_temporary_scope do
@project = create(:project, :builds_enabled, :issues_disabled, name: 'project', path: 'project') @project = create(:project, :builds_enabled, :issues_disabled, name: 'project', path: 'project')
...@@ -21,8 +22,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do ...@@ -21,8 +22,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
expect_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch).with('feature', 'DCBA') expect_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch).with('feature', 'DCBA')
allow_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch) allow_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch)
allow_any_instance_of(Project).to receive(:latest_cached_markdown_version).and_return(434343) @markdown_classes.each {|klass| allow_any_instance_of(klass).to receive(:latest_cached_markdown_version).and_return(434343)}
allow_any_instance_of(Note).to receive(:latest_cached_markdown_version).and_return(434343)
@project_tree_restorer = described_class.new(user: @user, shared: @shared, project: @project) @project_tree_restorer = described_class.new(user: @user, shared: @shared, project: @project)
...@@ -61,18 +61,12 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do ...@@ -61,18 +61,12 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
end end
context 'when importing a project with cached_markdown_version and note_html' do context 'when importing a project with cached_markdown_version and note_html' do
before do
expect(Gitlab::ImportExport::RelationFactory).not_to receive(:create).with(hash_including(excluded_keys: ['whatever']))
expect(Gitlab::ImportExport::RelationFactory).to receive(:create).with(hash_including(excluded_keys: %w(note_html, cached_markdown_version))).and_call_original.at_least(:once)
allow(@project_tree_restorer).to receive(:excluded_keys_for_relation).and_return(%w(note_html, cached_markdown_version))
end
let!(:issue) { Issue.find_by(description: 'Aliquam enim illo et possimus.') } let!(:issue) { Issue.find_by(description: 'Aliquam enim illo et possimus.') }
let(:note1) { issue.notes.select {|n| n.note.match(/Quo reprehenderit aliquam qui dicta impedit cupiditate eligendi/)}.first } let(:note1) { issue.notes.select {|n| n.note.match(/Quo reprehenderit aliquam qui dicta impedit cupiditate eligendi/)}.first }
let(:note2) { issue.notes.select {|n| n.note.match(/Est reprehenderit quas aut aspernatur autem recusandae voluptatem/)}.first } let(:note2) { issue.notes.select {|n| n.note.match(/Est reprehenderit quas aut aspernatur autem recusandae voluptatem/)}.first }
it 'does not import the note_html' do it 'does not import the note_html' do
expect(note1.note_html).to match(/Et hic est id similique et non nesciunt voluptate/) expect(note1.note_html).to match(/Quo reprehenderit aliquam qui dicta impedit cupiditate eligendi/)
end end
it 'does not set the old cached_markdown_version' do it 'does not set the old cached_markdown_version' do
......
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