diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 35cb5531..ec646a82 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -294,13 +294,13 @@ class WikiController < ApplicationController
def s5
if @web.markup == :markdownMML
- @s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"),
+ @s5_content = sanitize_xhtml(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"),
{:math_enabled => true, :math_numbered => ['\\[','\\begin{equation}'], :content_only => true,
- :author => @page.author, :title => @page.plain_name}).to_s5).to_ncr
+ :author => @page.author, :title => @page.plain_name}).to_s5.to_ncr)
elsif @web.markup == :markdown
- @s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"),
+ @s5_content = sanitize_xhtml(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"),
{:math_enabled => false, :content_only => true,
- :author => @page.author, :title => @page.plain_name}).to_s5).to_ncr
+ :author => @page.author, :title => @page.plain_name}).to_s5.to_ncr)
else
@s5_content = "S5 not supported with this text filter"
end
diff --git a/lib/node.rb b/attic/lib/node.rb
similarity index 100%
rename from lib/node.rb
rename to attic/lib/node.rb
diff --git a/attic/lib/sanitize.rb b/attic/lib/sanitize.rb
new file mode 100644
index 00000000..11f65b5f
--- /dev/null
+++ b/attic/lib/sanitize.rb
@@ -0,0 +1,207 @@
+module Sanitize
+
+# This module provides sanitization of XHTML+MathML+SVG
+# and of inline style attributes.
+#
+# Based heavily on Sam Ruby's code in the Universal FeedParser.
+
+ require 'html/tokenizer'
+ require 'node'
+
+ acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area', 'b',
+ 'big', 'blockquote', 'br', 'button', 'caption', 'center', 'cite',
+ 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+ 'em', 'fieldset', 'font', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+ 'hr', 'i', 'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'map',
+ 'menu', 'ol', 'optgroup', 'option', 'p', 'pre', 'q', 's', 'samp',
+ 'select', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'table',
+ 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'tr', 'tt', 'u',
+ 'ul', 'var']
+
+ mathml_elements = ['maction', 'math', 'merror', 'mfrac', 'mi',
+ 'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded', 'mphantom',
+ 'mprescripts', 'mroot', 'mrow', 'mspace', 'msqrt', 'mstyle', 'msub',
+ 'msubsup', 'msup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder',
+ 'munderover', 'none']
+
+ svg_elements = ['a', 'animate', 'animateColor', 'animateMotion',
+ 'animateTransform', 'circle', 'defs', 'desc', 'ellipse', 'font-face',
+ 'font-face-name', 'font-face-src', 'g', 'glyph', 'hkern', 'image',
+ 'linearGradient', 'line', 'marker', 'metadata', 'missing-glyph',
+ 'mpath', 'path', 'polygon', 'polyline', 'radialGradient', 'rect',
+ 'set', 'stop', 'svg', 'switch', 'text', 'title', 'tspan', 'use']
+
+ acceptable_attributes = ['abbr', 'accept', 'accept-charset', 'accesskey',
+ 'action', 'align', 'alt', 'axis', 'border', 'cellpadding',
+ 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class',
+ 'clear', 'cols', 'colspan', 'color', 'compact', 'coords', 'datetime',
+ 'dir', 'disabled', 'enctype', 'for', 'frame', 'headers', 'height',
+ 'href', 'hreflang', 'hspace', 'id', 'ismap', 'label', 'lang',
+ 'longdesc', 'maxlength', 'media', 'method', 'multiple', 'name',
+ 'nohref', 'noshade', 'nowrap', 'prompt', 'readonly', 'rel', 'rev',
+ 'rows', 'rowspan', 'rules', 'scope', 'selected', 'shape', 'size',
+ 'span', 'src', 'start', 'style', 'summary', 'tabindex', 'target', 'title',
+ 'type', 'usemap', 'valign', 'value', 'vspace', 'width', 'xml:lang']
+
+
+ mathml_attributes = ['actiontype', 'align', 'columnalign', 'columnalign',
+ 'columnalign', 'columnlines', 'columnspacing', 'columnspan', 'depth',
+ 'display', 'displaystyle', 'equalcolumns', 'equalrows', 'fence',
+ 'fontstyle', 'fontweight', 'frame', 'height', 'linethickness', 'lspace',
+ 'mathbackground', 'mathcolor', 'mathvariant', 'mathvariant', 'maxsize',
+ 'minsize', 'other', 'rowalign', 'rowalign', 'rowalign', 'rowlines',
+ 'rowspacing', 'rowspan', 'rspace', 'scriptlevel', 'selection',
+ 'separator', 'stretchy', 'width', 'width', 'xlink:href', 'xlink:show',
+ 'xlink:type', 'xmlns', 'xmlns:xlink']
+
+
+ svg_attributes = ['accent-height', 'accumulate', 'additive', 'alphabetic',
+ 'arabic-form', 'ascent', 'attributeName', 'attributeType',
+ 'baseProfile', 'bbox', 'begin', 'by', 'calcMode', 'cap-height',
+ 'class', 'color', 'color-rendering', 'content', 'cx', 'cy', 'd', 'dx',
+ 'dy', 'descent', 'display', 'dur', 'end', 'fill', 'fill-rule',
+ 'font-family', 'font-size', 'font-stretch', 'font-style', 'font-variant',
+ 'font-weight', 'from', 'fx', 'fy', 'g1', 'g2', 'glyph-name',
+ 'gradientUnits', 'hanging', 'height', 'horiz-adv-x', 'horiz-origin-x',
+ 'id', 'ideographic', 'k', 'keyPoints', 'keySplines', 'keyTimes',
+ 'lang', 'marker-end', 'marker-mid', 'marker-start', 'markerHeight',
+ 'markerUnits', 'markerWidth', 'mathematical', 'max', 'min', 'name',
+ 'offset', 'opacity', 'orient', 'origin', 'overline-position',
+ 'overline-thickness', 'panose-1', 'path', 'pathLength', 'points',
+ 'preserveAspectRatio', 'r', 'refX', 'refY', 'repeatCount', 'repeatDur',
+ 'requiredExtensions', 'requiredFeatures', 'restart', 'rotate', 'rx',
+ 'ry', 'slope', 'stemh', 'stemv', 'stop-color', 'stop-opacity',
+ 'strikethrough-position', 'strikethrough-thickness', 'stroke',
+ 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap',
+ 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity',
+ 'stroke-width', 'systemLanguage', 'target',
+ 'text-anchor', 'to', 'transform', 'type', 'u1', 'u2',
+ 'underline-position', 'underline-thickness', 'unicode',
+ 'unicode-range', 'units-per-em', 'values', 'version', 'viewBox',
+ 'visibility', 'width', 'widths', 'x', 'x-height', 'x1', 'x2',
+ 'xlink:actuate', 'xlink:arcrole', 'xlink:href', 'xlink:role',
+ 'xlink:show', 'xlink:title', 'xlink:type', 'xml:base', 'xml:lang',
+ 'xml:space', 'xmlns', 'xmlns:xlink', 'y', 'y1', 'y2', 'zoomAndPan']
+
+ attr_val_is_uri = ['href', 'src', 'cite', 'action', 'longdesc', 'xlink:href']
+
+ acceptable_css_properties = ['azimuth', 'background-color',
+ 'border-bottom-color', 'border-collapse', 'border-color',
+ 'border-left-color', 'border-right-color', 'border-top-color', 'clear',
+ 'color', 'cursor', 'direction', 'display', 'elevation', 'float', 'font',
+ 'font-family', 'font-size', 'font-style', 'font-variant', 'font-weight',
+ 'height', 'letter-spacing', 'line-height', 'overflow', 'pause',
+ 'pause-after', 'pause-before', 'pitch', 'pitch-range', 'richness',
+ 'speak', 'speak-header', 'speak-numeral', 'speak-punctuation',
+ 'speech-rate', 'stress', 'text-align', 'text-decoration', 'text-indent',
+ 'unicode-bidi', 'vertical-align', 'voice-family', 'volume',
+ 'white-space', 'width']
+
+ acceptable_css_keywords = ['auto', 'aqua', 'black', 'block', 'blue',
+ 'bold', 'both', 'bottom', 'brown', 'center', 'collapse', 'dashed',
+ 'dotted', 'fuchsia', 'gray', 'green', '!important', 'italic', 'left',
+ 'lime', 'maroon', 'medium', 'none', 'navy', 'normal', 'nowrap', 'olive',
+ 'pointer', 'purple', 'red', 'right', 'solid', 'silver', 'teal', 'top',
+ 'transparent', 'underline', 'white', 'yellow']
+
+ acceptable_svg_properties = [ 'fill', 'fill-opacity', 'fill-rule',
+ 'stroke', 'stroke-width', 'stroke-linecap', 'stroke-linejoin',
+ 'stroke-opacity']
+
+ acceptable_protocols = [ 'ed2k', 'ftp', 'http', 'https', 'irc',
+ 'mailto', 'news', 'gopher', 'nntp', 'telnet', 'webcal',
+ 'xmpp', 'callto', 'feed', 'urn', 'aim', 'rsync', 'tag',
+ 'ssh', 'sftp', 'rtsp', 'afs' ]
+
+ ALLOWED_ELEMENTS = acceptable_elements + mathml_elements + svg_elements unless defined?(ALLOWED_ELEMENTS)
+ ALLOWED_ATTRIBUTES = acceptable_attributes + mathml_attributes + svg_attributes unless defined?(ALLOWED_ATTRIBUTES)
+ ALLOWED_CSS_PROPERTIES = acceptable_css_properties unless defined?(ALLOWED_CSS_PROPERTIES)
+ ALLOWED_CSS_KEYWORDS = acceptable_css_keywords unless defined?(ALLOWED_CSS_KEYWORDS)
+ ALLOWED_SVG_PROPERTIES = acceptable_svg_properties unless defined?(ALLOWED_SVG_PROPERTIES)
+ ALLOWED_PROTOCOLS = acceptable_protocols unless defined?(ALLOWED_PROTOCOLS)
+ ATTR_VAL_IS_URI = attr_val_is_uri unless defined?(ATTR_VAL_IS_URI)
+
+ # Sanitize the +html+, escaping all elements not in ALLOWED_ELEMENTS, and stripping out all
+ # attributes not in ALLOWED_ATTRIBUTES. Style attributes are parsed, and a restricted set,
+ # specified by ALLOWED_CSS_PROPERTIES and ALLOWED_CSS_KEYWORDS, are allowed through.
+ # attributes in ATTR_VAL_IS_URI are scanned, and only URI schemes specified in
+ # ALLOWED_PROTOCOLS are allowed.
+ # You can adjust what gets sanitized, by defining these constant arrays before this Module is loaded.
+ #
+ # sanitize_html('')
+ # => <script> do_nasty_stuff() </script>
+ # sanitize_html('Click here for $100')
+ # => Click here for $100
+ def sanitize_html(html)
+ if html.index("<")
+ tokenizer = HTML::Tokenizer.new(html)
+ new_text = ""
+
+ while token = tokenizer.next
+ node = XHTML::Node.parse(nil, 0, 0, token, false)
+ new_text << case node.tag?
+ when true
+ if ALLOWED_ELEMENTS.include?(node.name)
+ if node.closing != :close
+ node.attributes.delete_if { |attr,v| !ALLOWED_ATTRIBUTES.include?(attr) }
+ ATTR_VAL_IS_URI.each do |attr|
+ val_unescaped = CGI.unescapeHTML(node.attributes[attr].to_s).gsub(/[\000-\040\177\s]+|\302*[\200-\240]/,'').downcase
+ if val_unescaped =~ /^[a-z0-9][-+.a-z0-9]*:/ and !ALLOWED_PROTOCOLS.include?(val_unescaped.split(':')[0])
+ node.attributes.delete attr
+ end
+ end
+ if node.attributes['style']
+ node.attributes['style'] = sanitize_css(node.attributes['style'])
+ end
+ end
+ node.to_s
+ else
+ node.to_s.gsub(/foo <bad>bar</bad> baz",
+ sanitize_html("<#{tag_name} title='1'>foo bar baz")
+ end
+ end
+
+ Sanitize::ALLOWED_ELEMENTS.each do |tag_name|
+ define_method "test_should_forbid_#{tag_name.upcase}_tag" do
+ assert_equal "<#{tag_name.upcase} title=\"1\">foo <bad>bar</bad> baz</#{tag_name.upcase}>",
+ sanitize_html("<#{tag_name.upcase} title='1'>foo bar baz")
+ end
+ end
+
+ Sanitize::ALLOWED_ATTRIBUTES.each do |attribute_name|
+ if attribute_name != 'style'
+ define_method "test_should_allow_#{attribute_name}_attribute" do
+ assert_equal "foo <bad>bar</bad> baz
",
+ sanitize_html("foo bar baz
")
+ end
+ end
+ end
+
+ Sanitize::ALLOWED_ATTRIBUTES.each do |attribute_name|
+ define_method "test_should_forbid_#{attribute_name.upcase}_attribute" do
+ assert_equal "foo <bad>bar</bad> baz
",
+ sanitize_html("foo bar baz
")
+ end
+ end
+
+ Sanitize::ALLOWED_PROTOCOLS.each do |protocol|
+ define_method "test_should_allow_#{protocol}_uris" do
+ assert_equal "foo",
+ sanitize_html(%(foo))
+ end
+ end
+
+ Sanitize::ALLOWED_PROTOCOLS.each do |protocol|
+ define_method "test_should_allow_uppercase_#{protocol}_uris" do
+ assert_equal "foo",
+ sanitize_html(%(foo))
+ end
+ end
+
+ def test_should_allow_anchors
+ assert_equal "<script>baz</script>",
+ sanitize_html("")
+ end
+
+ # RFC 3986, sec 4.2
+ def test_allow_colons_in_path_component
+ assert_equal "foo",
+ sanitize_html("foo")
+ end
+
+ %w(src width height alt).each do |img_attr|
+ define_method "test_should_allow_image_#{img_attr}_attribute" do
+ assert_equal "![]()
",
+ sanitize_html("![]()
")
+ end
+ end
+
+ def test_should_handle_non_html
+ assert_equal 'abc', sanitize_html("abc")
+ end
+
+ def test_should_handle_blank_text
+ assert_equal '', sanitize_html('')
+ end
+
+ [%w(img src), %w(a href)].each do |(tag, attr)|
+ define_method "test_should_strip_#{attr}_attribute_in_#{tag}_with_bad_protocols" do
+ assert_equal %(<#{tag} title="1">boo), sanitize_html(%(<#{tag} #{attr}="javascript:XSS" title="1">boo))
+ end
+ end
+
+ [%w(img src), %w(a href)].each do |(tag, attr)|
+ define_method "test_should_strip_#{attr}_attribute_in_#{tag}_with_bad_protocols_and_whitespace" do
+ assert_equal %(<#{tag} title="1">boo), sanitize_html(%(<#{tag} #{attr}=" javascript:XSS" title="1">boo))
+ end
+ end
+
+ [%(;)
),
+ %()
),
+ %()
),
+ %(![](javascript:alert("XSS"))
),
+ %())
),
+ %(),
+ %(),
+ %(),
+ %(;)
),
+ %(;)
),
+ %(;)
),
+ %(;)
),
+ %(;)
),
+ %(;)
),
+ %(;)
)].each_with_index do |img_hack, i|
+ define_method "test_should_not_fall_for_xss_image_hack_#{i}" do
+ assert_equal "![]()
", sanitize_html(img_hack)
+ end
+ end
+
+ def test_should_sanitize_tag_broken_up_by_null
+ assert_equal "<scr>alert(\"XSS\")</scr>", sanitize_html(%(alert(\"XSS\")))
+ end
+
+ def test_should_sanitize_invalid_script_tag
+ assert_equal "<script /></script>", sanitize_html(%())
+ end
+
+ def test_should_sanitize_script_tag_with_multiple_open_brackets
+ assert_equal "<<script>alert(\"XSS\");//<</script>", sanitize_html(%(<))
+ assert_equal %(<iframe src="http:" /><), sanitize_html(%(", sanitize_html(%())
+ assert_equal "foo",
+ sanitize_html('foo')
+ assert_equal "![]()
",
+ sanitize_html('
')
+ end
+
+ def test_img_dynsrc_lowsrc
+ assert_equal "![]()
",
+ sanitize_html(%(![]()
))
+ assert_equal "![]()
",
+ sanitize_html(%(![]()
))
+ end
+
+ def test_div_background_image_unicode_encoded
+ assert_equal 'foo
',
+ sanitize_html(%(foo
))
+ end
+
+ def test_div_expression
+ assert_equal 'foo
',
+ sanitize_html(%(foo
))
+ end
+
+ def test_img_vbscript
+ assert_equal '![]()
',
+ sanitize_html(%(![](vbscript:msgbox("XSS"))
))
+ end
+
+end
diff --git a/lib/chunks/engines.rb b/lib/chunks/engines.rb
index 78d062d4..c870541a 100644
--- a/lib/chunks/engines.rb
+++ b/lib/chunks/engines.rb
@@ -32,7 +32,7 @@ module Engines
redcloth.filter_html = false
redcloth.no_span_caps = false
html = redcloth.to_html(:textile)
- sanitize_html(html)
+ sanitize_xhtml(html)
end
end
@@ -43,7 +43,7 @@ module Engines
require_dependency 'maruku'
require_dependency 'maruku/ext/math'
html = Maruku.new(@content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"), {:math_enabled => false}).to_html
- sanitize_html(html).to_ncr
+ sanitize_xhtml(html.to_ncr)
end
end
@@ -55,7 +55,7 @@ module Engines
require_dependency 'maruku/ext/math'
html = Maruku.new(@content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"),
{:math_enabled => true, :math_numbered => ['\\[','\\begin{equation}']}).to_html
- sanitize_html(html).to_ncr
+ sanitize_xhtml(html.to_ncr)
end
end
@@ -68,7 +68,7 @@ module Engines
redcloth.filter_html = false
redcloth.no_span_caps = false
html = redcloth.to_html
- sanitize_html(html)
+ sanitize_xhtml(html)
end
end
@@ -78,7 +78,7 @@ module Engines
def mask
require_dependency 'rdocsupport'
html = RDocSupport::RDocFormatter.new(@content).to_html
- sanitize_html(html)
+ sanitize_xhtml(html)
end
end
diff --git a/lib/sanitize.rb b/lib/sanitize.rb
index dcef7b1e..69f8e3e7 100644
--- a/lib/sanitize.rb
+++ b/lib/sanitize.rb
@@ -1,207 +1,26 @@
module Sanitize
-# This module provides sanitization of XHTML+MathML+SVG
+# This module provides sanitization of XHTML+MathML+SVG
# and of inline style attributes.
#
-# Based heavily on Sam Ruby's code in the Universal FeedParser.
-
- require 'html/tokenizer'
- require 'node'
-
- acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area', 'b',
- 'big', 'blockquote', 'br', 'button', 'caption', 'center', 'cite',
- 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
- 'em', 'fieldset', 'font', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
- 'hr', 'i', 'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'map',
- 'menu', 'ol', 'optgroup', 'option', 'p', 'pre', 'q', 's', 'samp',
- 'select', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'table',
- 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'tr', 'tt', 'u',
- 'ul', 'var']
-
- mathml_elements = ['maction', 'math', 'merror', 'mfrac', 'mi',
- 'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded', 'mphantom',
- 'mprescripts', 'mroot', 'mrow', 'mspace', 'msqrt', 'mstyle', 'msub',
- 'msubsup', 'msup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder',
- 'munderover', 'none']
-
- svg_elements = ['a', 'animate', 'animateColor', 'animateMotion',
- 'animateTransform', 'circle', 'defs', 'desc', 'ellipse', 'font-face',
- 'font-face-name', 'font-face-src', 'g', 'glyph', 'hkern', 'image',
- 'linearGradient', 'line', 'marker', 'metadata', 'missing-glyph',
- 'mpath', 'path', 'polygon', 'polyline', 'radialGradient', 'rect',
- 'set', 'stop', 'svg', 'switch', 'text', 'title', 'tspan', 'use']
-
- acceptable_attributes = ['abbr', 'accept', 'accept-charset', 'accesskey',
- 'action', 'align', 'alt', 'axis', 'border', 'cellpadding',
- 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class',
- 'clear', 'cols', 'colspan', 'color', 'compact', 'coords', 'datetime',
- 'dir', 'disabled', 'enctype', 'for', 'frame', 'headers', 'height',
- 'href', 'hreflang', 'hspace', 'id', 'ismap', 'label', 'lang',
- 'longdesc', 'maxlength', 'media', 'method', 'multiple', 'name',
- 'nohref', 'noshade', 'nowrap', 'prompt', 'readonly', 'rel', 'rev',
- 'rows', 'rowspan', 'rules', 'scope', 'selected', 'shape', 'size',
- 'span', 'src', 'start', 'style', 'summary', 'tabindex', 'target', 'title',
- 'type', 'usemap', 'valign', 'value', 'vspace', 'width', 'xml:lang']
+# Uses the HTML5lib parser, so that the parsing behaviour should
+# resemble that of browsers.
+#
+# sanitize_xhtml() is a case-sensitive sanitizer, suitable for XHTML
+# sanitize_html() is a case-insensitive sanitizer suitable for HTML
- mathml_attributes = ['actiontype', 'align', 'columnalign', 'columnalign',
- 'columnalign', 'columnlines', 'columnspacing', 'columnspan', 'depth',
- 'display', 'displaystyle', 'equalcolumns', 'equalrows', 'fence',
- 'fontstyle', 'fontweight', 'frame', 'height', 'linethickness', 'lspace',
- 'mathbackground', 'mathcolor', 'mathvariant', 'mathvariant', 'maxsize',
- 'minsize', 'other', 'rowalign', 'rowalign', 'rowalign', 'rowlines',
- 'rowspacing', 'rowspan', 'rspace', 'scriptlevel', 'selection',
- 'separator', 'stretchy', 'width', 'width', 'xlink:href', 'xlink:show',
- 'xlink:type', 'xmlns', 'xmlns:xlink']
+ require 'html5lib/sanitizer'
+ require 'html5lib/html5parser'
+ require 'html5lib/liberalxmlparser'
+ include HTML5lib
-
- svg_attributes = ['accent-height', 'accumulate', 'additive', 'alphabetic',
- 'arabic-form', 'ascent', 'attributeName', 'attributeType',
- 'baseProfile', 'bbox', 'begin', 'by', 'calcMode', 'cap-height',
- 'class', 'color', 'color-rendering', 'content', 'cx', 'cy', 'd', 'dx',
- 'dy', 'descent', 'display', 'dur', 'end', 'fill', 'fill-rule',
- 'font-family', 'font-size', 'font-stretch', 'font-style', 'font-variant',
- 'font-weight', 'from', 'fx', 'fy', 'g1', 'g2', 'glyph-name',
- 'gradientUnits', 'hanging', 'height', 'horiz-adv-x', 'horiz-origin-x',
- 'id', 'ideographic', 'k', 'keyPoints', 'keySplines', 'keyTimes',
- 'lang', 'marker-end', 'marker-mid', 'marker-start', 'markerHeight',
- 'markerUnits', 'markerWidth', 'mathematical', 'max', 'min', 'name',
- 'offset', 'opacity', 'orient', 'origin', 'overline-position',
- 'overline-thickness', 'panose-1', 'path', 'pathLength', 'points',
- 'preserveAspectRatio', 'r', 'refX', 'refY', 'repeatCount', 'repeatDur',
- 'requiredExtensions', 'requiredFeatures', 'restart', 'rotate', 'rx',
- 'ry', 'slope', 'stemh', 'stemv', 'stop-color', 'stop-opacity',
- 'strikethrough-position', 'strikethrough-thickness', 'stroke',
- 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap',
- 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity',
- 'stroke-width', 'systemLanguage', 'target',
- 'text-anchor', 'to', 'transform', 'type', 'u1', 'u2',
- 'underline-position', 'underline-thickness', 'unicode',
- 'unicode-range', 'units-per-em', 'values', 'version', 'viewBox',
- 'visibility', 'width', 'widths', 'x', 'x-height', 'x1', 'x2',
- 'xlink:actuate', 'xlink:arcrole', 'xlink:href', 'xlink:role',
- 'xlink:show', 'xlink:title', 'xlink:type', 'xml:base', 'xml:lang',
- 'xml:space', 'xmlns', 'xmlns:xlink', 'y', 'y1', 'y2', 'zoomAndPan']
+ def sanitize_xhtml(html)
+ XHTMLParser.parseFragment(html, :tokenizer => HTMLSanitizer).to_s
+ end
- attr_val_is_uri = ['href', 'src', 'cite', 'action', 'longdesc', 'xlink:href']
-
- acceptable_css_properties = ['azimuth', 'background-color',
- 'border-bottom-color', 'border-collapse', 'border-color',
- 'border-left-color', 'border-right-color', 'border-top-color', 'clear',
- 'color', 'cursor', 'direction', 'display', 'elevation', 'float', 'font',
- 'font-family', 'font-size', 'font-style', 'font-variant', 'font-weight',
- 'height', 'letter-spacing', 'line-height', 'overflow', 'pause',
- 'pause-after', 'pause-before', 'pitch', 'pitch-range', 'richness',
- 'speak', 'speak-header', 'speak-numeral', 'speak-punctuation',
- 'speech-rate', 'stress', 'text-align', 'text-decoration', 'text-indent',
- 'unicode-bidi', 'vertical-align', 'voice-family', 'volume',
- 'white-space', 'width']
+ def sanitize_html(html)
+ HTMLParser.parseFragment(html, :tokenizer => HTMLSanitizer).to_s
+ end
- acceptable_css_keywords = ['auto', 'aqua', 'black', 'block', 'blue',
- 'bold', 'both', 'bottom', 'brown', 'center', 'collapse', 'dashed',
- 'dotted', 'fuchsia', 'gray', 'green', '!important', 'italic', 'left',
- 'lime', 'maroon', 'medium', 'none', 'navy', 'normal', 'nowrap', 'olive',
- 'pointer', 'purple', 'red', 'right', 'solid', 'silver', 'teal', 'top',
- 'transparent', 'underline', 'white', 'yellow']
-
- acceptable_svg_properties = [ 'fill', 'fill-opacity', 'fill-rule',
- 'stroke', 'stroke-width', 'stroke-linecap', 'stroke-linejoin',
- 'stroke-opacity']
-
- acceptable_protocols = [ 'ed2k', 'ftp', 'http', 'https', 'irc',
- 'mailto', 'news', 'gopher', 'nntp', 'telnet', 'webcal',
- 'xmpp', 'callto', 'feed', 'urn', 'aim', 'rsync', 'tag',
- 'ssh', 'sftp', 'rtsp', 'afs' ]
-
- ALLOWED_ELEMENTS = acceptable_elements + mathml_elements + svg_elements unless defined?(ALLOWED_ELEMENTS)
- ALLOWED_ATTRIBUTES = acceptable_attributes + mathml_attributes + svg_attributes unless defined?(ALLOWED_ATTRIBUTES)
- ALLOWED_CSS_PROPERTIES = acceptable_css_properties unless defined?(ALLOWED_CSS_PROPERTIES)
- ALLOWED_CSS_KEYWORDS = acceptable_css_keywords unless defined?(ALLOWED_CSS_KEYWORDS)
- ALLOWED_SVG_PROPERTIES = acceptable_svg_properties unless defined?(ALLOWED_SVG_PROPERTIES)
- ALLOWED_PROTOCOLS = acceptable_protocols unless defined?(ALLOWED_PROTOCOLS)
- ATTR_VAL_IS_URI = attr_val_is_uri unless defined?(ATTR_VAL_IS_URI)
-
- # Sanitize the +html+, escaping all elements not in ALLOWED_ELEMENTS, and stripping out all
- # attributes not in ALLOWED_ATTRIBUTES. Style attributes are parsed, and a restricted set,
- # specified by ALLOWED_CSS_PROPERTIES and ALLOWED_CSS_KEYWORDS, are allowed through.
- # attributes in ATTR_VAL_IS_URI are scanned, and only URI schemes specified in
- # ALLOWED_PROTOCOLS are allowed.
- # You can adjust what gets sanitized, by defining these constant arrays before this Module is loaded.
- #
- # sanitize_html('')
- # => <script> do_nasty_stuff() </script>
- # sanitize_html('Click here for $100')
- # => Click here for $100
- def sanitize_html(html)
- if html.index("<")
- tokenizer = HTML::Tokenizer.new(html)
- new_text = ""
-
- while token = tokenizer.next
- node = XHTML::Node.parse(nil, 0, 0, token, false)
- new_text << case node.tag?
- when true
- if ALLOWED_ELEMENTS.include?(node.name)
- if node.closing != :close
- node.attributes.delete_if { |attr,v| !ALLOWED_ATTRIBUTES.include?(attr) }
- ATTR_VAL_IS_URI.each do |attr|
- val_unescaped = CGI.unescapeHTML(node.attributes[attr].to_s).gsub(/[\000-\040\177-\240]+/,'').downcase
- if val_unescaped =~ /^[a-z0-9][-+.a-z0-9]*:/ and !ALLOWED_PROTOCOLS.include?(val_unescaped.split(':')[0])
- node.attributes.delete attr
- end
- end
- if node.attributes['style']
- node.attributes['style'] = sanitize_css(node.attributes['style'])
- end
- end
- node.to_s
- else
- node.to_s.gsub(/...