diff options
author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-06-03 22:08:43 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-13 04:05:58 +0300 |
commit | a9eaa20dcb3da119a2d5f2efca615f2273533015 (patch) | |
tree | e1f4b822266aea84261f723999bd44fb4b501971 /lib/gitlab/sanitizers | |
parent | 388f6eaaa6d97a09de6162c457042f491d42f96e (diff) |
Refactored SVG sanitizer
Diffstat (limited to 'lib/gitlab/sanitizers')
-rw-r--r-- | lib/gitlab/sanitizers/svg.rb | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/lib/gitlab/sanitizers/svg.rb b/lib/gitlab/sanitizers/svg.rb index 3e705687873..8304b9a482c 100644 --- a/lib/gitlab/sanitizers/svg.rb +++ b/lib/gitlab/sanitizers/svg.rb @@ -10,30 +10,25 @@ module Gitlab DATA_ATTR_PATTERN = /\Adata-(?!xml)[a-z_][\w.\u00E0-\u00F6\u00F8-\u017F\u01DD-\u02AF-]*\z/u def scrub(node) - if Whitelist::ALLOWED_ELEMENTS.include?(node.name) - valid_attributes = Whitelist::ALLOWED_ATTRIBUTES[node.name] - return unless valid_attributes - - node.attribute_nodes.each do |attr| - attr_name = attribute_name_with_namespace(attr) - - if valid_attributes.include?(attr_name) - # xlink:href is on the whitelist but we should deny any reference other than internal ids - if attr_name == 'xlink:href' && unsafe_href?(attr) - attr.unlink - end - else - if Whitelist::ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS.include?(node.name) && data_attribute?(attr) - # Arbitrary data attributes are allowed. Verify that the attribute - # is a valid data attribute. - attr.unlink unless attr_name =~ DATA_ATTR_PATTERN - else - attr.unlink - end + unless Whitelist::ALLOWED_ELEMENTS.include?(node.name) + node.unlink + return + end + + valid_attributes = Whitelist::ALLOWED_ATTRIBUTES[node.name] + return unless valid_attributes + + node.attribute_nodes.each do |attr| + attr_name = attribute_name_with_namespace(attr) + + if valid_attributes.include?(attr_name) + attr.unlink if unsafe_href?(attr) + else + # Arbitrary data attributes are allowed. + unless allows_data_attribute?(node) && data_attribute?(attr) + attr.unlink end end - else - node.unlink end end @@ -45,12 +40,16 @@ module Gitlab end end + def allows_data_attribute?(node) + Whitelist::ALLOWED_DATA_ATTRIBUTES_IN_ELEMENTS.include?(node.name) + end + def unsafe_href?(attr) - !attr.value.start_with?('#') + attribute_name_with_namespace(attr) == 'xlink:href' && !attr.value.start_with?('#') end def data_attribute?(attr) - attr.name.start_with?('data-') + attr.name.start_with?('data-') && attr.name =~ DATA_ATTR_PATTERN && attr.namespace.nil? end end end |