Merge multiple cookie headers, preserving semantic correctness. #130
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ioquatix
force-pushed
the
merge-cookies
branch
3 times, most recently
from
38a8c14
to
ebbd406
Compare
|
@hsbt CI is failing for < 2.6 on macOS: |
jeremyevans
requested changes
Jun 7, 2024
There was a problem hiding this comment.
The cookie fix looks good. Please drop the minimum version change from this PR, since it is unrelated to the cookie fix. It also appears it is a CI issue, not a general problem with the Ruby version (probably should just drop the related macOS CI jobs and keep the Linux ones).
andrewpollock
pushed a commit
to google/osv.dev
that referenced
this pull request
Sep 24, 2024
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [webrick](https://redirect.github.com/ruby/webrick) | `1.8.1` -> `1.8.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### HTTP Request Smuggling in ruby webrick [CVE-2024-47220](https://nvd.nist.gov/vuln/detail/CVE-2024-47220) / [GHSA-6f62-3596-g6w7](https://redirect.github.com/advisories/GHSA-6f62-3596-g6w7) <details> <summary>More information</summary> #### Details An issue was discovered in the WEBrick toolkit through 1.8.1 for Ruby. It allows HTTP request smuggling by providing both a Content-Length header and a Transfer-Encoding header, e.g., "GET /admin HTTP/1.1\r\n" inside of a "POST /user HTTP/1.1\r\n" request. NOTE: the supplier's position is "Webrick should not be used in production." #### Severity - CVSS Score: 7.5 / 10 (High) - Vector String: `CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:H/A:N` #### References - [https://nvd.nist.gov/vuln/detail/CVE-2024-47220](https://nvd.nist.gov/vuln/detail/CVE-2024-47220) - [ruby/webrick#145 - [https://github.com/ruby/webrick/pull/146/commits/d88321da45dcd230ac2b4585cad4833d6d5e8841](https://redirect.github.com/ruby/webrick/pull/146/commits/d88321da45dcd230ac2b4585cad4833d6d5e8841) - [https://github.com/ruby/webrick/commit/f5faca9222541591e1a7c3c97552ebb0c92733c7](https://redirect.github.com/ruby/webrick/commit/f5faca9222541591e1a7c3c97552ebb0c92733c7) - [https://github.com/ruby/webrick](https://redirect.github.com/ruby/webrick) This data is provided by [OSV](https://osv.dev/vulnerability/GHSA-6f62-3596-g6w7) and the [GitHub Advisory Database](https://redirect.github.com/github/advisory-database) ([CC-BY 4.0](https://redirect.github.com/github/advisory-database/blob/main/LICENSE.md)). </details> --- ### Release Notes <details> <summary>ruby/webrick (webrick)</summary> ### [`v1.8.2`](https://redirect.github.com/ruby/webrick/releases/tag/v1.8.2) [Compare Source](https://redirect.github.com/ruby/webrick/compare/v1.8.1...v1.8.2) #### What's Changed - Drop commented-out line by [@​olleolleolle](https://redirect.github.com/olleolleolle) in [ruby/webrick#108 - Add Ruby 3.1 & 3.2 to CI matrix by [@​tricknotes](https://redirect.github.com/tricknotes) in [ruby/webrick#109 - Fix/redos by [@​ooooooo-q](https://redirect.github.com/ooooooo-q) in [ruby/webrick#114 - Raise HTTPStatus::BadRequest for requests with invalid/duplicate content-length headers by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#120 - Bump actions/checkout from 3 to 4 by [@​dependabot](https://redirect.github.com/dependabot) in [ruby/webrick#121 - Improve CI by [@​hsbt](https://redirect.github.com/hsbt) in [ruby/webrick#123 - Fix WEBrick::TestFileHandler#test_short_filename test not working on mswin by [@​KJTsanaktsidis](https://redirect.github.com/KJTsanaktsidis) in [ruby/webrick#128 - Fix bug chunk extension detection by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#125 - Fix CI. by [@​ioquatix](https://redirect.github.com/ioquatix) in [ruby/webrick#131 - Merge multiple cookie headers, preserving semantic correctness. by [@​ioquatix](https://redirect.github.com/ioquatix) in [ruby/webrick#130 - Test on macos-latest by [@​byroot](https://redirect.github.com/byroot) in [ruby/webrick#132 - Require CRLF line endings in request line and headers by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#138 - Prefer squigly heredocs. by [@​ioquatix](https://redirect.github.com/ioquatix) in [ruby/webrick#143 - Only strip space and horizontal tab in headers by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#141 - Treat missing CRLF separator after headers as an EOFError by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#142 - Return 400 response for chunked requests with unexpected data after chunk by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#136 - Fix reference to URI::REGEXP::PATTERN::HOST by [@​casperisfine](https://redirect.github.com/casperisfine) in [ruby/webrick#144 - Prevent request smuggling by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#146 #### New Contributors - [@​tricknotes](https://redirect.github.com/tricknotes) made their first contribution in [ruby/webrick#109 - [@​ooooooo-q](https://redirect.github.com/ooooooo-q) made their first contribution in [ruby/webrick#114 - [@​KJTsanaktsidis](https://redirect.github.com/KJTsanaktsidis) made their first contribution in [ruby/webrick#128 - [@​byroot](https://redirect.github.com/byroot) made their first contribution in [ruby/webrick#132 - [@​casperisfine](https://redirect.github.com/casperisfine) made their first contribution in [ruby/webrick#144 **Full Changelog**: ruby/webrick@v1.8.1...v1.8.2 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "" in timezone Australia/Sydney, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/google/osv.dev). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC44MC4wIiwidXBkYXRlZEluVmVyIjoiMzguODAuMCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->
andrewpollock
pushed a commit
to google/osv-scanner
that referenced
this pull request
Sep 24, 2024
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [webrick](https://redirect.github.com/ruby/webrick) | `1.8.1` -> `1.8.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### HTTP Request Smuggling in ruby webrick [CVE-2024-47220](https://nvd.nist.gov/vuln/detail/CVE-2024-47220) / [GHSA-6f62-3596-g6w7](https://redirect.github.com/advisories/GHSA-6f62-3596-g6w7) <details> <summary>More information</summary> #### Details An issue was discovered in the WEBrick toolkit through 1.8.1 for Ruby. It allows HTTP request smuggling by providing both a Content-Length header and a Transfer-Encoding header, e.g., "GET /admin HTTP/1.1\r\n" inside of a "POST /user HTTP/1.1\r\n" request. NOTE: the supplier's position is "Webrick should not be used in production." #### Severity - CVSS Score: 7.5 / 10 (High) - Vector String: `CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:H/A:N` #### References - [https://nvd.nist.gov/vuln/detail/CVE-2024-47220](https://nvd.nist.gov/vuln/detail/CVE-2024-47220) - [ruby/webrick#145 - [https://github.com/ruby/webrick/pull/146/commits/d88321da45dcd230ac2b4585cad4833d6d5e8841](https://redirect.github.com/ruby/webrick/pull/146/commits/d88321da45dcd230ac2b4585cad4833d6d5e8841) - [https://github.com/ruby/webrick/commit/f5faca9222541591e1a7c3c97552ebb0c92733c7](https://redirect.github.com/ruby/webrick/commit/f5faca9222541591e1a7c3c97552ebb0c92733c7) - [https://github.com/ruby/webrick](https://redirect.github.com/ruby/webrick) This data is provided by [OSV](https://osv.dev/vulnerability/GHSA-6f62-3596-g6w7) and the [GitHub Advisory Database](https://redirect.github.com/github/advisory-database) ([CC-BY 4.0](https://redirect.github.com/github/advisory-database/blob/main/LICENSE.md)). </details> --- ### Release Notes <details> <summary>ruby/webrick (webrick)</summary> ### [`v1.8.2`](https://redirect.github.com/ruby/webrick/releases/tag/v1.8.2) [Compare Source](https://redirect.github.com/ruby/webrick/compare/v1.8.1...v1.8.2) #### What's Changed - Drop commented-out line by [@​olleolleolle](https://redirect.github.com/olleolleolle) in [ruby/webrick#108 - Add Ruby 3.1 & 3.2 to CI matrix by [@​tricknotes](https://redirect.github.com/tricknotes) in [ruby/webrick#109 - Fix/redos by [@​ooooooo-q](https://redirect.github.com/ooooooo-q) in [ruby/webrick#114 - Raise HTTPStatus::BadRequest for requests with invalid/duplicate content-length headers by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#120 - Bump actions/checkout from 3 to 4 by [@​dependabot](https://redirect.github.com/dependabot) in [ruby/webrick#121 - Improve CI by [@​hsbt](https://redirect.github.com/hsbt) in [ruby/webrick#123 - Fix WEBrick::TestFileHandler#test_short_filename test not working on mswin by [@​KJTsanaktsidis](https://redirect.github.com/KJTsanaktsidis) in [ruby/webrick#128 - Fix bug chunk extension detection by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#125 - Fix CI. by [@​ioquatix](https://redirect.github.com/ioquatix) in [ruby/webrick#131 - Merge multiple cookie headers, preserving semantic correctness. by [@​ioquatix](https://redirect.github.com/ioquatix) in [ruby/webrick#130 - Test on macos-latest by [@​byroot](https://redirect.github.com/byroot) in [ruby/webrick#132 - Require CRLF line endings in request line and headers by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#138 - Prefer squigly heredocs. by [@​ioquatix](https://redirect.github.com/ioquatix) in [ruby/webrick#143 - Only strip space and horizontal tab in headers by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#141 - Treat missing CRLF separator after headers as an EOFError by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#142 - Return 400 response for chunked requests with unexpected data after chunk by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#136 - Fix reference to URI::REGEXP::PATTERN::HOST by [@​casperisfine](https://redirect.github.com/casperisfine) in [ruby/webrick#144 - Prevent request smuggling by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#146 #### New Contributors - [@​tricknotes](https://redirect.github.com/tricknotes) made their first contribution in [ruby/webrick#109 - [@​ooooooo-q](https://redirect.github.com/ooooooo-q) made their first contribution in [ruby/webrick#114 - [@​KJTsanaktsidis](https://redirect.github.com/KJTsanaktsidis) made their first contribution in [ruby/webrick#128 - [@​byroot](https://redirect.github.com/byroot) made their first contribution in [ruby/webrick#132 - [@​casperisfine](https://redirect.github.com/casperisfine) made their first contribution in [ruby/webrick#144 **Full Changelog**: ruby/webrick@v1.8.1...v1.8.2 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "" in timezone Australia/Sydney, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/google/osv-scanner). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC44MC4wIiwidXBkYXRlZEluVmVyIjoiMzguODAuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->
marcelamelara
pushed a commit
to slsa-framework/slsa
that referenced
this pull request
Sep 24, 2024
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [webrick](https://redirect.github.com/ruby/webrick) | `1.8.1` -> `1.8.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | ### GitHub Vulnerability Alerts #### [CVE-2024-47220](https://nvd.nist.gov/vuln/detail/CVE-2024-47220) An issue was discovered in the WEBrick toolkit through 1.8.1 for Ruby. It allows HTTP request smuggling by providing both a Content-Length header and a Transfer-Encoding header, e.g., "GET /admin HTTP/1.1\r\n" inside of a "POST /user HTTP/1.1\r\n" request. NOTE: the supplier's position is "Webrick should not be used in production." --- ### Release Notes <details> <summary>ruby/webrick (webrick)</summary> ### [`v1.8.2`](https://redirect.github.com/ruby/webrick/releases/tag/v1.8.2) [Compare Source](https://redirect.github.com/ruby/webrick/compare/v1.8.1...v1.8.2) #### What's Changed - Drop commented-out line by [@​olleolleolle](https://redirect.github.com/olleolleolle) in [ruby/webrick#108 - Add Ruby 3.1 & 3.2 to CI matrix by [@​tricknotes](https://redirect.github.com/tricknotes) in [ruby/webrick#109 - Fix/redos by [@​ooooooo-q](https://redirect.github.com/ooooooo-q) in [ruby/webrick#114 - Raise HTTPStatus::BadRequest for requests with invalid/duplicate content-length headers by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#120 - Bump actions/checkout from 3 to 4 by [@​dependabot](https://redirect.github.com/dependabot) in [ruby/webrick#121 - Improve CI by [@​hsbt](https://redirect.github.com/hsbt) in [ruby/webrick#123 - Fix WEBrick::TestFileHandler#test_short_filename test not working on mswin by [@​KJTsanaktsidis](https://redirect.github.com/KJTsanaktsidis) in [ruby/webrick#128 - Fix bug chunk extension detection by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#125 - Fix CI. by [@​ioquatix](https://redirect.github.com/ioquatix) in [ruby/webrick#131 - Merge multiple cookie headers, preserving semantic correctness. by [@​ioquatix](https://redirect.github.com/ioquatix) in [ruby/webrick#130 - Test on macos-latest by [@​byroot](https://redirect.github.com/byroot) in [ruby/webrick#132 - Require CRLF line endings in request line and headers by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#138 - Prefer squigly heredocs. by [@​ioquatix](https://redirect.github.com/ioquatix) in [ruby/webrick#143 - Only strip space and horizontal tab in headers by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#141 - Treat missing CRLF separator after headers as an EOFError by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#142 - Return 400 response for chunked requests with unexpected data after chunk by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#136 - Fix reference to URI::REGEXP::PATTERN::HOST by [@​casperisfine](https://redirect.github.com/casperisfine) in [ruby/webrick#144 - Prevent request smuggling by [@​jeremyevans](https://redirect.github.com/jeremyevans) in [ruby/webrick#146 #### New Contributors - [@​tricknotes](https://redirect.github.com/tricknotes) made their first contribution in [ruby/webrick#109 - [@​ooooooo-q](https://redirect.github.com/ooooooo-q) made their first contribution in [ruby/webrick#114 - [@​KJTsanaktsidis](https://redirect.github.com/KJTsanaktsidis) made their first contribution in [ruby/webrick#128 - [@​byroot](https://redirect.github.com/byroot) made their first contribution in [ruby/webrick#132 - [@​casperisfine](https://redirect.github.com/casperisfine) made their first contribution in [ruby/webrick#144 **Full Changelog**: ruby/webrick@v1.8.1...v1.8.2 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/slsa-framework/slsa). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC44MC4wIiwidXBkYXRlZEluVmVyIjoiMzguODAuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Signed-off-by: Mend Renovate <bot@renovateapp.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
HTTP/1 specifies user agent MUST only give one
cookieheader. However, in practice, servers should be robust when encountering more than one, merging them, and preserving the semantics.WEBrick already correctly handles this case, but it fails to correct expose the headers.
See socketry/rack-conform#19 for more context.