summaryrefslogtreecommitdiff
path: root/lib/banzai
diff options
context:
space:
mode:
authorwinniehell <git@winniehell.de>2016-08-01 04:52:05 +0200
committerwinniehell <git@winniehell.de>2016-08-02 03:52:24 +0200
commit40da543f2fddefcdebf12e52425314355a16a57d (patch)
treecb6faef381fa3b122452366a70e40b1306139605 /lib/banzai
parent701e5ccbe6018129130ee70a78f213c406c93fcf (diff)
downloadgitlab-ce-40da543f2fddefcdebf12e52425314355a16a57d.tar.gz
Add support for relative links starting with ./ or / to RelativeLinkFilter (!5586)
Diffstat (limited to 'lib/banzai')
-rw-r--r--lib/banzai/filter/relative_link_filter.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb
index 337fb50317d..5b73fc8fcee 100644
--- a/lib/banzai/filter/relative_link_filter.rb
+++ b/lib/banzai/filter/relative_link_filter.rb
@@ -87,10 +87,13 @@ module Banzai
def build_relative_path(path, request_path)
return request_path if path.empty?
return path unless request_path
+ return path[1..-1] if path.start_with?('/')
parts = request_path.split('/')
parts.pop if uri_type(request_path) != :tree
+ path.sub!(%r{^\./}, '')
+
while path.start_with?('../')
parts.pop
path.sub!('../', '')