From 2d02199e1581db8dc84361803950b1697f493fc0 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Sun, 23 Sep 2007 00:11:08 +0000 Subject: Secure #sanitize, #strip_tags, and #strip_links helpers against xss attacks. Closes #8877. [Rick, lifofifo, Jacques Distler] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7589 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/base.rb | 129 ++++++++++++++++++++ actionpack/lib/action_view/helpers/text_helper.rb | 136 ++++++++++++++++------ 2 files changed, 227 insertions(+), 38 deletions(-) (limited to 'actionpack/lib/action_view') diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 14c42ce855..8e778f6830 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -198,6 +198,135 @@ module ActionView #:nodoc: @@erb_variable = '_erbout' cattr_accessor :erb_variable + + # A regular expression of the valid characters used to separate protocols like + # the ':' in 'http://foo.com' + @@sanitized_protocol_separator = /:|(�*58)|(p)|(%|%)3A/ + cattr_accessor :sanitized_protocol_separator + + # Specifies a Set of HTML attributes that can have URIs. + @@sanitized_uri_attributes = Set.new(%w(href src cite action longdesc xlink:href lowsrc)) + cattr_reader :sanitized_uri_attributes + + # Adds valid HTML attributes that the #sanitize helper checks for URIs. + # + # Rails::Initializer.run do |config| + # config.action_view.sanitized_uri_attributes = 'lowsrc', 'target' + # end + # + def self.sanitized_uri_attributes=(attributes) + @@sanitized_uri_attributes.merge(attributes) + end + + # Specifies a Set of 'bad' tags that the #sanitize helper will remove completely, as opposed + # to just escaping harmless tags like <font> + @@sanitized_bad_tags = Set.new('script') + cattr_reader :sanitized_bad_tags + + # Adds to the Set of 'bad' tags for the #sanitize helper. + # + # Rails::Initializer.run do |config| + # config.action_view.sanitized_bad_tags = 'embed', 'object' + # end + # + def self.sanitized_bad_tags=(attributes) + @@sanitized_bad_tags.merge(attributes) + end + + # Specifies the default Set of tags that the #sanitize helper will allow unscathed. + @@sanitized_allowed_tags = Set.new(%w(strong em b i p code pre tt output samp kbd var sub + sup dfn cite big small address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dt dd abbr + acronym a img blockquote del ins fieldset legend)) + cattr_reader :sanitized_allowed_tags + + # Adds to the Set of allowed tags for the #sanitize helper. + # + # Rails::Initializer.run do |config| + # config.action_view.sanitized_allowed_tags = 'table', 'tr', 'td' + # end + # + def self.sanitized_allowed_tags=(attributes) + @@sanitized_allowed_tags.merge(attributes) + end + + # Specifies the default Set of html attributes that the #sanitize helper will leave + # in the allowed tag. + @@sanitized_allowed_attributes = Set.new(%w(href src width height alt cite datetime title class name xml:lang abbr)) + cattr_reader :sanitized_allowed_attributes + + # Adds to the Set of allowed html attributes for the #sanitize helper. + # + # Rails::Initializer.run do |config| + # config.action_view.sanitized_allowed_attributes = 'onclick', 'longdesc' + # end + # + def self.sanitized_allowed_attributes=(attributes) + @@sanitized_allowed_attributes.merge(attributes) + end + + # Specifies the default Set of acceptable css properties that #sanitize and #sanitize_css will accept. + @@sanitized_allowed_css_properties = Set.new(%w(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)) + cattr_reader :sanitized_allowed_css_properties + + # Adds to the Set of allowed css properties for the #sanitize and #sanitize_css heleprs. + # + # Rails::Initializer.run do |config| + # config.action_view.sanitized_allowed_css_properties = 'expression' + # end + # + def self.sanitized_allowed_css_properties=(attributes) + @@sanitized_allowed_css_properties.merge(attributes) + end + + # Specifies the default Set of acceptable css keywords that #sanitize and #sanitize_css will accept. + @@sanitized_allowed_css_keywords = Set.new(%w(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)) + cattr_reader :sanitized_allowed_css_keywords + + # Adds to the Set of allowed css keywords for the #sanitize and #sanitize_css helpers. + # + # Rails::Initializer.run do |config| + # config.action_view.sanitized_allowed_css_keywords = 'expression' + # end + # + def self.sanitized_allowed_css_keywords=(attributes) + @@sanitized_allowed_css_keywords.merge(attributes) + end + + # Specifies the default Set of allowed shorthand css properties for the #sanitize and #sanitize_css helpers. + @@sanitized_shorthand_css_properties = Set.new(%w(background border margin padding)) + cattr_reader :sanitized_shorthand_css_properties + + # Adds to the Set of allowed shorthand css properties for the #sanitize and #sanitize_css helpers. + # + # Rails::Initializer.run do |config| + # config.action_view.sanitized_shorthand_css_properties = 'expression' + # end + # + def self.sanitized_shorthand_css_properties=(attributes) + @@sanitized_shorthand_css_properties.merge(attributes) + end + + # Specifies the default Set of protocols that the #sanitize helper will leave in + # protocol attributes. + @@sanitized_allowed_protocols = Set.new(%w(ed2k ftp http https irc mailto news gopher nntp telnet webcal xmpp callto feed svn urn aim rsync tag ssh sftp rtsp afs)) + cattr_reader :sanitized_allowed_protocols + + # Adds to the Set of allowed protocols for the #sanitize helper. + # + # Rails::Initializer.run do |config| + # config.action_view.sanitized_allowed_protocols = 'ssh', 'feed' + # end + # + def self.sanitized_allowed_protocols=(attributes) + @@sanitized_allowed_protocols.merge(attributes) + end @@template_handlers = HashWithIndifferentAccess.new diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index e7a6303154..af6f6e4bb8 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -324,63 +324,118 @@ module ActionView # # strip_links('Blog: Visit.') # # => Blog: Visit - def strip_links(text) - text.gsub(/(.*?)<\/a>/mi, '\1') + def strip_links(html) + # Stupid firefox treats 'something' as link! + if html.index(" and ') - # # => <script> do_nasty_stuff() </script> + # <%= sanitize @article.body %> + # + # You can add or remove tags/attributes if you want to customize it a bit. See ActionView::Base for full docs on the + # available options. You can add tags/attributes for single uses of #sanitize by passing either the :attributes or :tags options: # - # sanitize('Click here for $100') - # # => Click here for $100 + # Normal Use # - # sanitize('Click here!!!') - # # => Click here!!! + # <%= sanitize @article.body %> # - # sanitize('') - # # => - def sanitize(html) - # only do this if absolutely necessary - if html.index("<") + # Custom Use + # + # <%= sanitize @article.body, :tags => %w(table tr td), :attributes => %w(id class style) + # + # Add table tags + # + # Rails::Initializer.run do |config| + # config.action_view.sanitized_allowed_tags = 'table', 'tr', 'td' + # end + # + # Remove tags + # + # Rails::Initializer.run do |config| + # config.after_initialize do + # ActionView::Base.sanitized_allowed_tags.delete 'div' + # end + # end + # + # Change allowed attributes + # + # Rails::Initializer.run do |config| + # config.action_view.sanitized_allowed_attributes = 'id', 'class', 'style' + # end + # + def sanitize(html, options = {}) + return html if html.blank? || !html.include?('<') + attrs = options.key?(:attributes) ? Set.new(options[:attributes]).merge(sanitized_allowed_attributes) : sanitized_allowed_attributes + tags = options.key?(:tags) ? Set.new(options[:tags] ).merge(sanitized_allowed_tags) : sanitized_allowed_tags + returning [] do |new_text| tokenizer = HTML::Tokenizer.new(html) - new_text = "" - + parent = [] while token = tokenizer.next node = HTML::Node.parse(nil, 0, 0, token, false) new_text << case node when HTML::Tag - if VERBOTEN_TAGS.include?(node.name) - node.to_s.gsub(/[\n]?/m, "") + strip_tags(text.gsub(/[\n]?/m, "")) # Recurse - handle all dirty nested tags else html # already plain text end @@ -574,6 +629,11 @@ module ActionView end end end + + def contains_bad_protocols?(attr_name, value) + sanitized_uri_attributes.include?(attr_name) && + (value =~ /(^[^\/:]*):|(�*58)|(p)|(%|%)3A/ && !sanitized_allowed_protocols.include?(value.split(sanitized_protocol_separator).first)) + end end end end -- cgit v1.2.3