Commit 8ea9c815 authored by Ahmad Hassan's avatar Ahmad Hassan

Use rugged to validate ref name

parent 59b82fbc
...@@ -7,11 +7,11 @@ module Gitlab ...@@ -7,11 +7,11 @@ module Gitlab
# #
# Returns true for a valid reference name, false otherwise # Returns true for a valid reference name, false otherwise
def validate(ref_name) def validate(ref_name)
return false if ref_name.start_with?('refs/heads/') not_allowed_prefixes = %w(refs/heads/ refs/remotes/ -)
return false if ref_name.start_with?('refs/remotes/') return false if ref_name.start_with?(*not_allowed_prefixes)
return false if ref_name == 'HEAD'
Gitlab::Utils.system_silent( Rugged::Reference.valid_name? "refs/heads/#{ref_name}"
%W(#{Gitlab.config.git.bin_path} check-ref-format --branch #{ref_name}))
end end
end end
end end
...@@ -14,7 +14,10 @@ ALLOWED = [ ...@@ -14,7 +14,10 @@ ALLOWED = [
'lib/tasks/gitlab/cleanup.rake', 'lib/tasks/gitlab/cleanup.rake',
# The only place where Rugged code is still allowed in production # The only place where Rugged code is still allowed in production
'lib/gitlab/git/' 'lib/gitlab/git/',
# Needed to avoid using the git binary to validate a branch name
'lib/gitlab/git_ref_validator.rb'
].freeze ].freeze
rugged_lines = IO.popen(%w[git grep -i -n rugged -- app config lib], &:read).lines rugged_lines = IO.popen(%w[git grep -i -n rugged -- app config lib], &:read).lines
......
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