summaryrefslogtreecommitdiffstats
path: root/app/lib
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2020-02-08 21:22:38 +0100
committerGitHub <noreply@github.com>2020-02-08 21:22:38 +0100
commitb1349342d200937665ca6486c4b3ba1bae2f9d05 (patch)
treee1c1c157f4e756b55fc86d3b9207b815ce2e4e34 /app/lib
parentb686e275e7651532b2203083717d5ef88acb04b1 (diff)
Fix rendering `<a>` without `href` when scheme unsupported (#13040)
- Disallow links with relative paths - Disallow iframes with non-http protocols and relative paths Close #13037
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/sanitize_config.rb45
1 files changed, 39 insertions, 6 deletions
diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb
index a8241112793..4ad1199a604 100644
--- a/app/lib/sanitize_config.rb
+++ b/app/lib/sanitize_config.rb
@@ -2,7 +2,23 @@
class Sanitize
module Config
- HTTP_PROTOCOLS ||= ['http', 'https', 'dat', 'dweb', 'ipfs', 'ipns', 'ssb', 'gopher', 'xmpp', 'magnet', :relative].freeze
+ HTTP_PROTOCOLS = %w(
+ http
+ https
+ ).freeze
+
+ LINK_PROTOCOLS = %w(
+ http
+ https
+ dat
+ dweb
+ ipfs
+ ipns
+ ssb
+ gopher
+ xmpp
+ magnet
+ ).freeze
CLASS_WHITELIST_TRANSFORMER = lambda do |env|
node = env[:node]
@@ -19,19 +35,37 @@ class Sanitize
node['class'] = class_list.join(' ')
end
+ UNSUPPORTED_HREF_TRANSFORMER = lambda do |env|
+ return unless env[:node_name] == 'a'
+
+ current_node = env[:node]
+
+ scheme = begin
+ if current_node['href'] =~ Sanitize::REGEX_PROTOCOL
+ Regexp.last_match(1).downcase
+ else
+ :relative
+ end
+ end
+
+ current_node.replace(current_node.text) unless LINK_PROTOCOLS.include?(scheme)
+ end
+
UNSUPPORTED_ELEMENTS_TRANSFORMER = lambda do |env|
return unless %w(h1 h2 h3 h4 h5 h6 blockquote pre ul ol li).include?(env[:node_name])
+ current_node = env[:node]
+
case env[:node_name]
when 'li'
- env[:node].traverse do |node|
+ current_node.traverse do |node|
next unless %w(p ul ol li).include?(node.name)
node.add_next_sibling('<br>') if node.next_sibling
node.replace(node.children) unless node.text?
end
else
- env[:node].name = 'p'
+ current_node.name = 'p'
end
end
@@ -50,13 +84,12 @@ class Sanitize
},
},
- protocols: {
- 'a' => { 'href' => HTTP_PROTOCOLS },
- },
+ protocols: {},
transformers: [
CLASS_WHITELIST_TRANSFORMER,
UNSUPPORTED_ELEMENTS_TRANSFORMER,
+ UNSUPPORTED_HREF_TRANSFORMER,
]
)