Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed #191: scrub_css drops !important rule from shorthand css properties #192

Merged
merged 3 commits into from
Aug 26, 2020
Merged

fixed #191: scrub_css drops !important rule from shorthand css properties #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50931f4
scrub_css should not drop `!important` from shorthand css props
christiankisssner Aug 25, 2020
ea6fe90
prefer Array#<< to creating a new array
flavorjones Aug 26, 2020
0aba0b9
update CHANGELOG
flavorjones Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## unreleased

### Fixes

* Don't drop the `!important` rule from some CSS properties. [[#191](https://github.com/flavorjones/loofah/issues/191)] (Thanks, [@b7kich](https://github.com/b7kich)!)


## 2.6.0 / 2020-06-16

### Features
Expand Down
2 changes: 2 additions & 0 deletions lib/loofah/html5/scrub.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ module Scrub
CONTROL_CHARACTERS = /[`\u0000-\u0020\u007f\u0080-\u0101]/
CSS_KEYWORDISH = /\A(#[0-9a-fA-F]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|-?\d{0,3}\.?\d{0,10}(ch|cm|r?em|ex|in|lh|mm|pc|pt|px|Q|vmax|vmin|vw|vh|%|,|\))?)\z/
CRASS_SEMICOLON = { :node => :semicolon, :raw => ";" }
CSS_IMPORTANT = '!important'

class << self
def allowed_element?(element_name)
Expand Down Expand Up @@ -90,6 +91,7 @@ def scrub_css(style)
end
end.compact
unless value.empty?
value << CSS_IMPORTANT if node[:important]
propstring = sprintf "%s:%s", name, value.join(" ")
sanitized_node = Crass.parse_properties(propstring).first
sanitized_tree << sanitized_node << CRASS_SEMICOLON
Expand Down
8 changes: 8 additions & 0 deletions test/assets/testdata_sanitizer_tests1.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,14 @@
"rexml": "<div style='color: blue;'></div>"
},

{
"name": "style_attr_shorthand_important",
"input": "<div style=\"border: 2px dashed gray !important;\" />",
"output": "<div style='border:2px dashed gray !important;'/>",
"xhtml": "<div style='border:2px dashed gray !important;'></div>",
"rexml": "<div style='border:2px dashed gray !important;'></div>"
},

{
"name": "attributes_with_embedded_quotes",
"input": "<img src=doesntexist.jpg\"'onerror=\"alert(1) />",
Expand Down