diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-03-19 09:13:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 09:13:49 -0700 |
| commit | 12a1a6658c0eff71d528cdda25f29ef1c950d53a (patch) | |
| tree | 95c14c34a52594ed5b92f83436a39d29667576fe /actionpack/lib/action_dispatch | |
| parent | 04ae0b0b5e594e0bb99c5cd608921745977bcdcd (diff) | |
| parent | ab38aa45497a38bc4a97f5eca430d43989f0b124 (diff) | |
| download | rails-12a1a6658c0eff71d528cdda25f29ef1c950d53a.tar.gz rails-12a1a6658c0eff71d528cdda25f29ef1c950d53a.tar.bz2 rails-12a1a6658c0eff71d528cdda25f29ef1c950d53a.zip | |
Merge pull request #35669 from cpruitt/update-mime-type-regexp
Update regular expression for checking valid MIME type
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_type.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb index 296a36ad28..962d10d81b 100644 --- a/actionpack/lib/action_dispatch/http/mime_type.rb +++ b/actionpack/lib/action_dispatch/http/mime_type.rb @@ -223,7 +223,10 @@ module Mime attr_reader :hash MIME_NAME = "[a-zA-Z0-9][a-zA-Z0-9#{Regexp.escape('!#$&-^_.+')}]{0,126}" - MIME_REGEXP = /\A(?:\*\/\*|#{MIME_NAME}\/(?:\*|#{MIME_NAME}))\z/ + MIME_PARAMETER_KEY = "[a-zA-Z0-9][a-zA-Z0-9#{Regexp.escape('!#$&-^_.+')}]{0,126}" + MIME_PARAMETER_VALUE = "#{Regexp.escape('"')}?[a-zA-Z0-9][a-zA-Z0-9#{Regexp.escape('!#$&-^_.+')}]{0,126}#{Regexp.escape('"')}?" + MIME_PARAMETER = "\s*\;\s+#{MIME_PARAMETER_KEY}(?:\=#{MIME_PARAMETER_VALUE})?" + MIME_REGEXP = /\A(?:\*\/\*|#{MIME_NAME}\/(?:\*|#{MIME_NAME})(?:\s*#{MIME_PARAMETER}\s*)*)\z/ class InvalidMimeType < StandardError; end |