Validate route map
This commit is contained in:
parent
5bf22606ef
commit
8f85a11d9f
|
@ -1312,7 +1312,7 @@ class Project < ActiveRecord::Base
|
||||||
deployments_query = with_tags ? 'ref = ? OR tag IS TRUE' : 'ref = ?'
|
deployments_query = with_tags ? 'ref = ? OR tag IS TRUE' : 'ref = ?'
|
||||||
deployments.where(deployments_query, ref.to_s)
|
deployments.where(deployments_query, ref.to_s)
|
||||||
elsif commit
|
elsif commit
|
||||||
deps = deployments.where(sha: commit.sha)
|
deployments.where(sha: commit.sha)
|
||||||
else
|
else
|
||||||
Deployment.none
|
Deployment.none
|
||||||
end
|
end
|
||||||
|
@ -1348,13 +1348,9 @@ class Project < ActiveRecord::Base
|
||||||
data = repository.route_map_file(sha)
|
data = repository.route_map_file(sha)
|
||||||
next unless data
|
next unless data
|
||||||
|
|
||||||
# TODO: Validate
|
Gitlab::RouteMap.new(data)
|
||||||
YAML.safe_load(data).map do |mapping|
|
rescue Gitlab::RouteMap::FormatError
|
||||||
{
|
nil
|
||||||
source: Regexp.new("^#{mapping['source'][1...-1]}$"),
|
|
||||||
public: mapping['public']
|
|
||||||
}
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1365,10 +1361,7 @@ class Project < ActiveRecord::Base
|
||||||
map = route_map_for_commit(commit_sha)
|
map = route_map_for_commit(commit_sha)
|
||||||
return unless map
|
return unless map
|
||||||
|
|
||||||
mapping = map.find { |mapping| path =~ mapping[:source] }
|
map.public_path_for_source_path(path)
|
||||||
return unless mapping
|
|
||||||
|
|
||||||
path.sub(mapping[:source], mapping[:public])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
.btn-group
|
.btn-group
|
||||||
= view_on_environment_btn(@commit.sha, @path, @environment) if @environment
|
= view_on_environment_btn(@commit.sha, @path, @environment) if @environment
|
||||||
|
|
||||||
.btn-group.tree-btn-group
|
.btn-group.tree-btn-group
|
||||||
= link_to 'Raw', namespace_project_raw_path(@project.namespace, @project, @id),
|
= link_to 'Raw', namespace_project_raw_path(@project.namespace, @project, @id),
|
||||||
class: 'btn btn-sm', target: '_blank'
|
class: 'btn btn-sm', target: '_blank'
|
||||||
|
|
|
@ -0,0 +1,52 @@
|
||||||
|
module Gitlab
|
||||||
|
class RouteMap
|
||||||
|
class FormatError < StandardError; end
|
||||||
|
|
||||||
|
def initialize(data)
|
||||||
|
begin
|
||||||
|
entries = YAML.safe_load(data)
|
||||||
|
rescue
|
||||||
|
raise FormatError, 'Route map needs to be valid YAML'
|
||||||
|
end
|
||||||
|
|
||||||
|
raise FormatError, 'Route map needs to be an array' unless entries.is_a?(Array)
|
||||||
|
|
||||||
|
@map = entries.map { |entry| parse_entry(entry) }
|
||||||
|
end
|
||||||
|
|
||||||
|
def public_path_for_source_path(path)
|
||||||
|
mapping = @map.find { |mapping| path =~ mapping[:source] }
|
||||||
|
return unless mapping
|
||||||
|
|
||||||
|
path.sub(mapping[:source], mapping[:public])
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def parse_entry(entry)
|
||||||
|
raise FormatError, 'Route map entry needs to be a hash' unless entry.is_a?(Hash)
|
||||||
|
raise FormatError, 'Route map entry requires a source key' unless entry.has_key?('source')
|
||||||
|
raise FormatError, 'Route map entry requires a public key' unless entry.has_key?('public')
|
||||||
|
|
||||||
|
source_regexp = entry['source']
|
||||||
|
public_path = entry['public']
|
||||||
|
|
||||||
|
unless source_regexp.start_with?('/') && source_regexp.end_with?('/')
|
||||||
|
raise FormatError, 'Route map entry source needs to start and end in a slash (/)'
|
||||||
|
end
|
||||||
|
|
||||||
|
source_regexp = source_regexp[1...-1].gsub('\/', '/')
|
||||||
|
|
||||||
|
begin
|
||||||
|
source_regexp = Regexp.new("^#{source_regexp}$")
|
||||||
|
rescue RegexpError => e
|
||||||
|
raise FormatError, "Route map entry source needs to be a valid regular expression: #{e}"
|
||||||
|
end
|
||||||
|
|
||||||
|
{
|
||||||
|
source: source_regexp,
|
||||||
|
public: public_path
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue