diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-22 18:33:17 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-07-20 06:28:41 +0300 |
commit | ba60d4f6e4f3a6d3cb56c9320f475bee8f0b38da (patch) | |
tree | 51245b9a3f7df6df3e396f3335f88d79f5d2f328 /lib/gitlab/route_map.rb | |
parent | ceda6bd5a6d5e7b24f0ec003ce2e7b446d0917c0 (diff) |
Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'
24570 use re2 for user supplied regexp 9 3
See merge request !2129
Diffstat (limited to 'lib/gitlab/route_map.rb')
-rw-r--r-- | lib/gitlab/route_map.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/route_map.rb b/lib/gitlab/route_map.rb index 877aa6e6a28..f3952657983 100644 --- a/lib/gitlab/route_map.rb +++ b/lib/gitlab/route_map.rb @@ -18,7 +18,11 @@ module Gitlab mapping = @map.find { |mapping| mapping[:source] === path } return unless mapping - path.sub(mapping[:source], mapping[:public]) + if mapping[:source].is_a?(String) + path.sub(mapping[:source], mapping[:public]) + else + mapping[:source].replace(path, mapping[:public]) + end end private @@ -35,7 +39,7 @@ module Gitlab source_pattern = source_pattern[1...-1].gsub('\/', '/') begin - source_pattern = /\A#{source_pattern}\z/ + source_pattern = Gitlab::UntrustedRegexp.new('\A' + source_pattern + '\z') rescue RegexpError => e raise FormatError, "Route map entry source is not a valid regular expression: #{e}" end |