Merge branch 'no_link_inside_code_block' into 'master'

No link inside code block

app/helpers/gitlab_markdown_helper.rb

@@ -59,90 +59,67 @@ module GitlabMarkdownHelper
     end
   end
 
-  # text - whole text from a markdown file
+  def create_relative_links(text)
-  # project_path_with_namespace - namespace/projectname, eg. gitlabhq/gitlabhq
-  # ref - name of the branch or reference, eg. stable
-  # requested_path - path of request, eg. doc/api/README.md, used in special case when path is pointing to the .md file were the original request is coming from
-  def create_relative_links(text, project, ref, requested_path)
-    @path_to_satellite = project.satellite.path
-    project_path_with_namespace = project.path_with_namespace
     paths = extract_paths(text)
-    paths.each do |file_path|
+
-      original_file_path = extract(file_path)
+    paths.uniq.each do |file_path|
-      new_path = rebuild_path(project_path_with_namespace, original_file_path, requested_path, ref)
+      new_path = rebuild_path(file_path)
-      if reference_path?(file_path)
+      # Finds quoted path so we don't replace other mentions of the string
-        # Replacing old string with a new one that contains updated path
+      # eg. "doc/api" will be replaced and "/home/doc/api/text" won't
-        # eg. [some document]: document.md will be replaced with [some document] /namespace/project/master/blob/document.md
+      text.gsub!("\"#{file_path}\"", "\"/#{new_path}\"")
-        text.gsub!(file_path, file_path.gsub(original_file_path, "/#{new_path}"))
-      else
-        # Replacing old string with a new one with brackets ]() to prevent replacing occurence of a word
-        # e.g. If we have a markdown like [test](test) this will replace ](test) and not the word test
-        text.gsub!("](#{file_path})", "](/#{new_path})")
-      end
     end
+
     text
   end
 
-  def extract_paths(markdown_text)
+  def extract_paths(text)
-    all_markdown_paths = pick_out_paths(markdown_text)
+    links = substitute_links(text)
-    paths = remove_empty(all_markdown_paths)
+    image_links = substitute_image_links(text)
-    select_relative(paths)
+    links + image_links
   end
 
-  # Split the markdown text to each line and find all paths, this will match anything with - ]("some_text") and [some text]: file.md
+  def substitute_links(text)
-  def pick_out_paths(markdown_text)
+    links = text.scan(/<a href=\"([^"]*)\">/)
-    inline_paths = markdown_text.split("\n").map { |text| text.scan(/\]\(([^(]+)\)/) }
+    relative_links = links.flatten.reject{ |link| link_to_ignore? link }
-    reference_paths = markdown_text.split("\n").map { |text| text.scan(/\[.*\]:.*/) }
+    relative_links
-    inline_paths + reference_paths
   end
 
-  # Removes any empty result produced by not matching the regexp
+  def substitute_image_links(text)
-  def remove_empty(paths)
+    links = text.scan(/<img src=\"([^"]*)\"/)
-    paths.reject{|l| l.empty? }.flatten
+    relative_links = links.flatten.reject{ |link| link_to_ignore? link }
+    relative_links
   end
 
-  # If a path is a reference style link we need to omit ]:
+  def link_to_ignore?(link)
-  def extract(path)
+    ignored_protocols.map{ |protocol| link.include?(protocol) }.any?
-    path.split("]: ").last
-  end
-
-  # Reject any path that contains ignored protocol
-  # eg. reject "https://gitlab.org} but accept "doc/api/README.md"
-  def select_relative(paths)
-    paths.reject{|path| ignored_protocols.map{|protocol| path.include?(protocol)}.any?}
-  end
-
-  # Check whether a path is a reference-style link
-  def reference_path?(path)
-    path.include?("]: ")
   end
 
   def ignored_protocols
     ["http://","https://", "ftp://", "mailto:"]
   end
 
-  def rebuild_path(path_with_namespace, path, requested_path, ref)
+  def rebuild_path(path)
     path.gsub!(/(#.*)/, "")
     id = $1 || ""
-    file_path = relative_file_path(path, requested_path)
+    file_path = relative_file_path(path)
+    file_path = sanitize_slashes(file_path)
+
     [
-      path_with_namespace,
+      Gitlab.config.gitlab.relative_url_root,
-      path_with_ref(file_path, ref),
+      @project.path_with_namespace,
+      path_with_ref(file_path),
       file_path
-    ].compact.join("/").gsub(/\/*$/, '') + id
+    ].compact.join("/").gsub(/^\/*|\/*$/, '') + id
   end
 
-  # Checks if the path exists in the repo
+  def sanitize_slashes(path)
-  # eg. checks if doc/README.md exists, if not then link to blob
+    path[0] = "" if path.start_with?("/")
-  def path_with_ref(path, ref)
+    path.chop if path.end_with?("/")
-    if file_exists?(path)
+    path
-      "#{local_path(path)}/#{correct_ref(ref)}"
-    else
-      "blob/#{correct_ref(ref)}"
-    end
   end
 
-  def relative_file_path(path, requested_path)
+  def relative_file_path(path)
+    requested_path = @path
     nested_path = build_nested_path(path, requested_path)
     return nested_path if file_exists?(nested_path)
     path
@@ -166,6 +143,16 @@ module GitlabMarkdownHelper
     end
   end
 
+  # Checks if the path exists in the repo
+  # eg. checks if doc/README.md exists, if not then link to blob
+  def path_with_ref(path)
+    if file_exists?(path)
+      "#{local_path(path)}/#{correct_ref}"
+    else
+      "blob/#{correct_ref}"
+    end
+  end
+
   def file_exists?(path)
     return false if path.nil?
     return @repository.blob_at(current_sha, path).present? || @repository.tree(current_sha, path).entries.any?
@@ -179,10 +166,6 @@ module GitlabMarkdownHelper
     return "blob"
   end
 
-  def current_ref
-    @commit.nil? ? "master" : @commit.id
-  end
-
   def current_sha
     if @commit
       @commit.id
@@ -192,7 +175,7 @@ module GitlabMarkdownHelper
   end
 
   # We will assume that if no ref exists we can point to master
-  def correct_ref(ref)
+  def correct_ref
-    ref ? ref : "master"
+    @ref ? @ref : "master"
   end
 end

features/project/issues/issues.feature

@@ -68,6 +68,12 @@ Feature: Project Issues
     And I leave a comment with a header containing "Comment with a header"
     Then The comment with the header should not have an ID
 
+  @javascript
+  Scenario: Blocks inside comments should not build relative links
+    Given I visit issue page "Release 0.4"
+    And I leave a comment with code block
+    Then The code block should be unchanged
+
   Scenario: Issues on empty project
     Given empty project "Empty Project"
     When I visit empty project page

features/steps/project/issues.rb

@@ -163,4 +163,16 @@ class ProjectIssues < Spinach::FeatureSteps
     project = Project.find_by(name: 'Empty Project')
     visit project_issues_path(project)
   end
+
+  step 'I leave a comment with code block' do
+    within(".js-main-target-form") do
+      fill_in "note[note]", with: "```\nCommand [1]: /usr/local/bin/git , see [text](doc/text)\n```"
+      click_button "Add Comment"
+      sleep 0.05
+    end
+  end
+
+  step 'The code block should be unchanged' do
+    page.should have_content("```\nCommand [1]: /usr/local/bin/git , see [text](doc/text)\n```")
+  end
 end

lib/redcarpet/render/gitlab_html.rb

@@ -6,8 +6,6 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
   def initialize(template, options = {})
     @template = template
     @project = @template.instance_variable_get("@project")
-    @ref = @template.instance_variable_get("@ref")
-    @request_path = @template.instance_variable_get("@path")
     @options = options.dup
     super options
   end
@@ -45,23 +43,10 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
     end
   end
 
-  def preprocess(full_document)
-    if is_wiki?
-      full_document
-    elsif @project
-      h.create_relative_links(full_document, @project, @ref, @request_path)
-    else
-      full_document
-    end
-  end
-
   def postprocess(full_document)
+    unless @template.instance_variable_get("@project_wiki") || @project.nil?
+      full_document = h.create_relative_links(full_document)
+    end
     h.gfm(full_document)
   end
-
-  def is_wiki?
-    if @template.instance_variable_get("@project_wiki")
-      @template.instance_variable_get("@page")
-    end
-  end
 end