Commit 18398152 authored by Sean McGivern's avatar Sean McGivern Committed by Fatih Acet

Raise errors for large and binary files

parent f2f84469
......@@ -10,8 +10,12 @@ module Gitlab
class MissingEndDelimiter < ParserError
end
class UnmergeableFile < ParserError
end
def parse(text, our_path:, their_path:, parent: nil)
return [] if text.blank?
raise UnmergeableFile if text.blank? # Typically a binary file
raise UnmergeableFile if text.length > 102400
line_obj_index = 0
line_old = 1
......
......@@ -4,6 +4,10 @@ describe Gitlab::Conflict::Parser, lib: true do
let(:parser) { Gitlab::Conflict::Parser.new }
describe '#parse' do
def parse_text(text)
parser.parse(text, our_path: 'README.md', their_path: 'README.md')
end
context 'when the file has valid conflicts' do
let(:text) do
<<CONFLICT
......@@ -116,12 +120,6 @@ CONFLICT
end
context 'when the file contents include conflict delimiters' do
let(:path) { 'README.md' }
def parse_text(text)
parser.parse(text, our_path: path, their_path: path)
end
it 'raises UnexpectedDelimiter when there is a non-start delimiter first' do
expect { parse_text('=======') }.
to raise_error(Gitlab::Conflict::Parser::UnexpectedDelimiter)
......@@ -172,9 +170,19 @@ CONFLICT
end
end
context 'when lines is blank' do
it { expect(parser.parse('', our_path: 'README.md', their_path: 'README.md')).to eq([]) }
it { expect(parser.parse(nil, our_path: 'README.md', their_path: 'README.md')).to eq([]) }
context 'other file types' do
it 'raises UnmergeableFile when lines is blank, indicating a binary file' do
expect { parse_text('') }.
to raise_error(Gitlab::Conflict::Parser::UnmergeableFile)
expect { parse_text(nil) }.
to raise_error(Gitlab::Conflict::Parser::UnmergeableFile)
end
it 'raises UnmergeableFile when the file is over 100 KB' do
expect { parse_text('a' * 102401) }.
to raise_error(Gitlab::Conflict::Parser::UnmergeableFile)
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