Skip to content

Fix/redos #114

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

Merged
merged 2 commits into from
Jun 13, 2023
Merged

Fix/redos #114

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5b7622
fix ReDoS parse_header
ooooooo-q Apr 16, 2023
9e32248
fix ReDoS split_header_value
ooooooo-q Apr 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/webrick/httputils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,13 @@ def parse_header(raw)
field = nil
raw.each_line{|line|
case line
when /^([A-Za-z0-9!\#$%&'*+\-.^_`|~]+):\s*(.*?)\s*\z/om
field, value = $1, $2
when /^([A-Za-z0-9!\#$%&'*+\-.^_`|~]+):(.*?)\z/om
field, value = $1, $2.strip
field.downcase!
header[field] = [] unless header.has_key?(field)
header[field] << value
when /^\s+(.*?)\s*\z/om
value = $1
when /^\s+(.*?)/om
value = line.strip
unless field
raise HTTPStatus::BadRequest, "bad header '#{line}'."
end
Expand All @@ -183,7 +183,7 @@ def parse_header(raw)
# Splits a header value +str+ according to HTTP specification.

def split_header_value(str)
str.scan(%r'\G((?:"(?:\\.|[^"])+?"|[^",]+)+)
str.scan(%r'\G((?:"(?:\\.|[^"])+?"|[^",]++)+)
(?:,\s*|\Z)'xn).flatten
end
module_function :split_header_value
Expand Down