diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-16 13:22:41 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-16 13:22:41 +0000 |
| commit | 0ea170b44d7b286e690df4a880ea75aa07c1e3d9 (patch) | |
| tree | 97fc704ee11a2a806fb38d43e05d96f41cddf541 /lib | |
| parent | 3fdf104b966527e0bbcd38bc5b6da9c26372f127 (diff) | |
| parent | ae6a54f73caaa0d9023d09f0820f3bee1e0cd0d4 (diff) | |
| download | gitlab-ce-0ea170b44d7b286e690df4a880ea75aa07c1e3d9.tar.gz | |
Merge branch '18582-banzai-filter-external-link-filter' into 'master'
Banzai::Filter::ExternalLinkFilter use XPath
See merge request !4702
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/filter/external_link_filter.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/banzai/filter/external_link_filter.rb b/lib/banzai/filter/external_link_filter.rb index f73ecfc9418..0a29c547a4d 100644 --- a/lib/banzai/filter/external_link_filter.rb +++ b/lib/banzai/filter/external_link_filter.rb @@ -3,17 +3,8 @@ module Banzai # HTML Filter to modify the attributes of external links class ExternalLinkFilter < HTML::Pipeline::Filter def call - doc.search('a').each do |node| - link = node.attr('href') - - next unless link - - # Skip non-HTTP(S) links - next unless link.start_with?('http') - - # Skip internal links - next if link.start_with?(internal_url) - + # Skip non-HTTP(S) links and internal links + doc.xpath("descendant-or-self::a[starts-with(@href, 'http') and not(starts-with(@href, '#{internal_url}'))]").each do |node| node.set_attribute('rel', 'nofollow noreferrer') node.set_attribute('target', '_blank') end |