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

Introduce Request::ALLOWED_SCHEMES and deprecate existing constant #1314

Merged
merged 1 commit into from
Nov 19, 2018
Merged

Introduce Request::ALLOWED_SCHEMES and deprecate existing constant #1314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file. For info on

### Changed
- `Rack::Utils.status_code` now raises an error when the status symbol is invalid instead of `500`.
- `Rack::Request::SCHEME_WHITELIST` has been renamed to `Rack::Request::ALLOWED_SCHEMES`

### Removed
- HISTORY.md by @twitnithegirl
Expand All @@ -16,7 +17,7 @@ All notable changes to this project will be documented in this file. For info on
#
#
# History/News Archive
Items below this line are from the previously maintained HISTORY.md and NEWS.md files.
Items below this line are from the previously maintained HISTORY.md and NEWS.md files.
#

## [2.0.0]
Expand Down Expand Up @@ -65,13 +66,13 @@ Items below this line are from the previously maintained HISTORY.md and NEWS.md
- Prevent extremely deep parameters from being parsed. CVE-2015-3225

## [1.6.1] 2015-05-06
- Fix CVE-2014-9490, denial of service attack in OkJson
- Use a monotonic time for Rack::Runtime, if available
- Fix CVE-2014-9490, denial of service attack in OkJson
- Use a monotonic time for Rack::Runtime, if available
- RACK_MULTIPART_LIMIT changed to RACK_MULTIPART_PART_LIMIT (RACK_MULTIPART_LIMIT is deprecated and will be removed in 1.7.0)

## [1.5.3] 2015-05-06
- Fix CVE-2014-9490, denial of service attack in OkJson
- Backport bug fixes to 1.5 series
- Backport bug fixes to 1.5 series

## [1.6.0] 2014-01-18
- Response#unauthorized? helper
Expand Down
8 changes: 6 additions & 2 deletions lib/rack/request.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ class << self
end

self.ip_filter = lambda { |ip| ip =~ /\A127\.0\.0\.1\Z|\A(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.|\A::1\Z|\Afd[0-9a-f]{2}:.+|\Alocalhost\Z|\Aunix\Z|\Aunix:/i }
SCHEME_WHITELIST = %w(https http).freeze
ALLOWED_SCHEMES = %w(https http).freeze
SCHEME_WHITELIST = ALLOWED_SCHEMES
if Object.respond_to?(:deprecate_constant)
deprecate_constant :SCHEME_WHITELIST
end

def initialize(env)
@params = nil
Expand Down Expand Up @@ -507,7 +511,7 @@ def forwarded_scheme
]

scheme_headers.each do |header|
return header if SCHEME_WHITELIST.include?(header)
return header if ALLOWED_SCHEMES.include?(header)
end

nil
Expand Down