82f4564fb7
A file containing /:\d+:/ in its contents would break the search results if those contents were part of the results, because we were splitting on colons, which can't work with untrusted input. Changing to use the null byte as a separator is much safer.
136 lines
3.4 KiB
Ruby
136 lines
3.4 KiB
Ruby
module Gitlab
|
|
class ProjectSearchResults < SearchResults
|
|
attr_reader :project, :repository_ref
|
|
|
|
def initialize(current_user, project, query, repository_ref = nil)
|
|
@current_user = current_user
|
|
@project = project
|
|
@repository_ref = repository_ref.presence || project.default_branch
|
|
@query = query
|
|
end
|
|
|
|
def objects(scope, page = nil)
|
|
case scope
|
|
when 'notes'
|
|
notes.page(page).per(per_page)
|
|
when 'blobs'
|
|
Kaminari.paginate_array(blobs).page(page).per(per_page)
|
|
when 'wiki_blobs'
|
|
Kaminari.paginate_array(wiki_blobs).page(page).per(per_page)
|
|
when 'commits'
|
|
Kaminari.paginate_array(commits).page(page).per(per_page)
|
|
else
|
|
super
|
|
end
|
|
end
|
|
|
|
def blobs_count
|
|
@blobs_count ||= blobs.count
|
|
end
|
|
|
|
def notes_count
|
|
@notes_count ||= notes.count
|
|
end
|
|
|
|
def wiki_blobs_count
|
|
@wiki_blobs_count ||= wiki_blobs.count
|
|
end
|
|
|
|
def commits_count
|
|
@commits_count ||= commits.count
|
|
end
|
|
|
|
def self.parse_search_result(result)
|
|
ref = nil
|
|
filename = nil
|
|
basename = nil
|
|
data = ""
|
|
startline = 0
|
|
|
|
result.strip.each_line.each_with_index do |line, index|
|
|
prefix ||= line.match(/^(?<ref>[^:]*):(?<filename>.*)\x00(?<startline>\d+)\x00/)&.tap do |matches|
|
|
ref = matches[:ref]
|
|
filename = matches[:filename]
|
|
startline = matches[:startline]
|
|
startline = startline.to_i - index
|
|
extname = Regexp.escape(File.extname(filename))
|
|
basename = filename.sub(/#{extname}$/, '')
|
|
end
|
|
|
|
data << line.sub(prefix.to_s, '')
|
|
end
|
|
|
|
FoundBlob.new(
|
|
filename: filename,
|
|
basename: basename,
|
|
ref: ref,
|
|
startline: startline,
|
|
data: data
|
|
)
|
|
end
|
|
|
|
def single_commit_result?
|
|
commits_count == 1 && total_result_count == 1
|
|
end
|
|
|
|
def total_result_count
|
|
issues_count + merge_requests_count + milestones_count + notes_count + blobs_count + wiki_blobs_count + commits_count
|
|
end
|
|
|
|
private
|
|
|
|
def blobs
|
|
return [] unless Ability.allowed?(@current_user, :download_code, @project)
|
|
|
|
@blobs ||= Gitlab::FileFinder.new(project, repository_ref).find(query)
|
|
end
|
|
|
|
def wiki_blobs
|
|
return [] unless Ability.allowed?(@current_user, :read_wiki, @project)
|
|
|
|
@wiki_blobs ||= begin
|
|
if project.wiki_enabled? && query.present?
|
|
project_wiki = ProjectWiki.new(project)
|
|
|
|
unless project_wiki.empty?
|
|
project_wiki.search_files(query)
|
|
else
|
|
[]
|
|
end
|
|
else
|
|
[]
|
|
end
|
|
end
|
|
end
|
|
|
|
def notes
|
|
@notes ||= NotesFinder.new(project, @current_user, search: query).execute.user.order('updated_at DESC')
|
|
end
|
|
|
|
def commits
|
|
@commits ||= find_commits(query)
|
|
end
|
|
|
|
def find_commits(query)
|
|
return [] unless Ability.allowed?(@current_user, :download_code, @project)
|
|
|
|
commits = find_commits_by_message(query)
|
|
commit_by_sha = find_commit_by_sha(query)
|
|
commits |= [commit_by_sha] if commit_by_sha
|
|
commits
|
|
end
|
|
|
|
def find_commits_by_message(query)
|
|
project.repository.find_commits_by_message(query)
|
|
end
|
|
|
|
def find_commit_by_sha(query)
|
|
key = query.strip
|
|
project.repository.commit(key) if Commit.valid_hash?(key)
|
|
end
|
|
|
|
def project_ids_relation
|
|
project
|
|
end
|
|
end
|
|
end
|