From 7c025e0eb45b846f7f673f61c275b53066f617ce Mon Sep 17 00:00:00 2001
From: Juanito Fatas <katehuang0320@gmail.com>
Date: Tue, 26 Nov 2019 08:57:41 +0900
Subject: [PATCH] CSS sanitizer allows vw length unit

vw  https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Values_and_units#Relative_length_units
---
 lib/loofah/html5/scrub.rb    | 2 +-
 test/html5/test_sanitizer.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/loofah/html5/scrub.rb b/lib/loofah/html5/scrub.rb
index 1c5c8555..5d8d73ed 100644
--- a/lib/loofah/html5/scrub.rb
+++ b/lib/loofah/html5/scrub.rb
@@ -6,7 +6,7 @@ module Loofah
   module HTML5 # :nodoc:
     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|mm|pc|pt|px|%|,|\))?)\z/
+      CSS_KEYWORDISH = /\A(#[0-9a-fA-F]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|-?\d{0,3}\.?\d{0,10}(ch|cm|r?em|ex|in|mm|pc|pt|px|vw|%|,|\))?)\z/
       CRASS_SEMICOLON = { :node => :semicolon, :raw => ";" }
 
       class << self
diff --git a/test/html5/test_sanitizer.rb b/test/html5/test_sanitizer.rb
index 4b4c022b..ad4c1dbe 100755
--- a/test/html5/test_sanitizer.rb
+++ b/test/html5/test_sanitizer.rb
@@ -305,6 +305,12 @@ def test_css_ch_value
     assert_match %r/60ch/, sane.inner_html
   end
 
+  def test_css_vw_value
+    html = "<div style=\"font-size: calc(16px + 1vw);\"></body>"
+    sane = Nokogiri::HTML(Loofah.scrub_fragment(html, :escape).to_xml)
+    assert_match %r/1vw/, sane.inner_html
+  end
+
   def test_css_function_sanitization_leaves_safelisted_functions_calc
     html = "<span style=\"width:calc(5%)\">"
     sane = Nokogiri::HTML(Loofah.scrub_fragment(html, :strip).to_html)