Bump puma from 6.4.2 to 6.4.3 #672
Merged
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
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?s=60&v=4){kind=small}
Bumps [puma](https://github.com/puma/puma) from 6.4.2 to 6.4.3. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](puma/puma@v6.4.2...v6.4.3) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
gem compare nio4r 2.7.0 2.7.3Compared versions: ["2.7.0", "2.7.3"]
DIFFERENT authors:
2.7.0: ["Tony Arcieri"]
2.7.3: ["Tony Arcieri", "Samuel Williams", "Olle Jonsson", "Gregory Longtin", "Tiago Cardoso", "Joao Fernandes", "Thomas Dziedzic", "Boaz Segev", "Logan Bowers", "Pedro Paiva", "Jun Aruga", "Omer Katz", "Upekshe Jayasekera", "Tim Carey-Smith", "Benoit Daloze", "Sergey Avseyev", "Tomoya Ishida", "Usaku Nakamura", "Cédric Boutillier", "Daniel Berger", "Dirkjan Bussink", "Hiroshi Shibata", "Jesús Burgos Maciá", "Luis Lavena", "Pavel Rosický", "Sadayuki Furuhashi", "Stephen von Takach", "Vladimir Kochnev", "Vít Ondruch", "Anatol Pomozov", "Bernd Ahlers", "Charles Oliver Nutter", "Denis Washington", "Elad Eyal", "Jean byroot Boussier", "Jeffrey Martin", "John Thornton", "Jun Jiang", "Lars Kanis", "Marek Kowalcze", "Maxime Demolin", "Orien Madgwick", "Pavel Lobashov", "Per Lundberg", "Phillip Aldridge", "Ravil Bayramgalin", "Shannon Skipper", "Tao Luo", "Thomas Kuntz", "Tsimnuj Hawj", "Zhang Kang"]
DIFFERENT cert_chain:
2.7.0: []
2.7.3: ["-----BEGIN CERTIFICATE-----\nMIIE2DCCA0CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMRgwFgYDVQQDDA9zYW11\nZWwud2lsbGlhbXMxHTAbBgoJkiaJk/IsZAEZFg1vcmlvbnRyYW5zZmVyMRIwEAYK\nCZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJuejAeFw0yMjA4MDYwNDUz\nMjRaFw0zMjA4MDMwNDUzMjRaMGExGDAWBgNVBAMMD3NhbXVlbC53aWxsaWFtczEd\nMBsGCgmSJomT8ixkARkWDW9yaW9udHJhbnNmZXIxEjAQBgoJkiaJk/IsZAEZFgJj\nbzESMBAGCgmSJomT8ixkARkWAm56MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB\nigKCAYEAomvSopQXQ24+9DBB6I6jxRI2auu3VVb4nOjmmHq7XWM4u3HL+pni63X2\n9qZdoq9xt7H+RPbwL28LDpDNflYQXoOhoVhQ37Pjn9YDjl8/4/9xa9+NUpl9XDIW\nsGkaOY0eqsQm1pEWkHJr3zn/fxoKPZPfaJOglovdxf7dgsHz67Xgd/ka+Wo1YqoE\ne5AUKRwUuvaUaumAKgPH+4E4oiLXI4T1Ff5Q7xxv6yXvHuYtlMHhYfgNn8iiW8WN\nXibYXPNP7NtieSQqwR/xM6IRSoyXKuS+ZNGDPUUGk8RoiV/xvVN4LrVm9upSc0ss\nRZ6qwOQmXCo/lLcDUxJAgG95cPw//sI00tZan75VgsGzSWAOdjQpFM0l4dxvKwHn\ntUeT3ZsAgt0JnGqNm2Bkz81kG4A2hSyFZTFA8vZGhp+hz+8Q573tAR89y9YJBdYM\nzp0FM4zwMNEUwgfRzv1tEVVUEXmoFCyhzonUUw4nE4CFu/sE3ffhjKcXcY//qiSW\nxm4erY3XAgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O\nBBYEFO9t7XWuFf2SKLmuijgqR4sGDlRsMC4GA1UdEQQnMCWBI3NhbXVlbC53aWxs\naWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWBI3NhbXVlbC53aWxs\naWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEBCwUAA4IBgQB5sxkE\ncBsSYwK6fYpM+hA5B5yZY2+L0Z+27jF1pWGgbhPH8/FjjBLVn+VFok3CDpRqwXCl\nxCO40JEkKdznNy2avOMra6PFiQyOE74kCtv7P+Fdc+FhgqI5lMon6tt9rNeXmnW/\nc1NaMRdxy999hmRGzUSFjozcCwxpy/LwabxtdXwXgSay4mQ32EDjqR1TixS1+smp\n8C/NCWgpIfzpHGJsjvmH2wAfKtTTqB9CVKLCWEnCHyCaRVuKkrKjqhYCdmMBqCws\nJkxfQWC+jBVeG9ZtPhQgZpfhvh+6hMhraUYRQ6XGyvBqEUe+yo6DKIT3MtGE2+CP\neX9i9ZWBydWb8/rvmwmX2kkcBbX0hZS1rcR593hGc61JR6lvkGYQ2MYskBveyaxt\nQ2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8\nvoD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=\n-----END CERTIFICATE-----\n"]
DIFFERENT date:
2.7.0: 2023-12-01 00:00:00 UTC
2.7.3: 2024-05-07 00:00:00 UTC
DIFFERENT license:
2.7.0: MIT AND (BSD-2-Clause OR GPL-2.0-or-later)
2.7.3: MIT
DIFFERENT licenses:
2.7.0: ["MIT AND (BSD-2-Clause OR GPL-2.0-or-later)"]
2.7.3: ["MIT", "BSD-2-Clause"]
DIFFERENT metadata:
2.7.0: {"bug_tracker_uri"=>"https://github.com/socketry/nio4r/issues", "changelog_uri"=>"https://github.com/socketry/nio4r/blob/main/changes.md", "documentation_uri"=>"https://www.rubydoc.info/gems/nio4r/2.6.1", "source_code_uri"=>"https://github.com/socketry/nio4r/tree/v2.6.1", "wiki_uri"=>"https://github.com/socketry/nio4r/wiki", "funding_uri"=>"https://github.com/sponsors/ioquatix/"}
2.7.3: {"bug_tracker_uri"=>"https://github.com/socketry/nio4r/issues", "changelog_uri"=>"https://github.com/socketry/nio4r/blob/main/changes.md", "documentation_uri"=>"https://www.rubydoc.info/gems/nio4r", "funding_uri"=>"https://github.com/sponsors/ioquatix/", "source_code_uri"=>"https://github.com/socketry/nio4r.git", "wiki_uri"=>"https://github.com/socketry/nio4r/wiki"}
DIFFERENT require_paths:
2.7.0: ["/opt/hostedtoolcache/Ruby/3.2.5/x64/lib/ruby/gems/3.2.0/extensions/x86_64-linux/3.2.0/nio4r-2.7.0", "lib"]
2.7.3: ["/opt/hostedtoolcache/Ruby/3.2.5/x64/lib/ruby/gems/3.2.0/extensions/x86_64-linux/3.2.0/nio4r-2.7.3", "lib"]
DIFFERENT rubygems_version:
2.7.0: 3.4.22
2.7.3: 3.5.9
DIFFERENT version:
2.7.0: 2.7.0
2.7.3: 2.7.3
DIFFERENT files:
2.7.0->2.7.3:
* Deleted:
.github/workflows/workflow.yml
.gitignore
.mailmap
.rspec
.rubocop.yml
Gemfile
Rakefile
examples/echo_server.rb
logo.png
nio4r.gemspec
rakelib/extension.rake
rakelib/rspec.rake
rakelib/rubocop.rake
spec/nio/acceptables_spec.rb
spec/nio/bytebuffer_spec.rb
spec/nio/monitor_spec.rb
spec/nio/selectables/pipe_spec.rb
spec/nio/selectables/ssl_socket_spec.rb
spec/nio/selectables/tcp_socket_spec.rb
spec/nio/selectables/udp_socket_spec.rb
spec/nio/selector_spec.rb
spec/spec_helper.rb
spec/support/selectable_examples.rb
* Changed:
changes.md +12/-1
ext/nio4r/org/nio4r/ByteBuffer.java +1/-1
ext/nio4r/org/nio4r/Monitor.java +2/-2
ext/nio4r/org/nio4r/Selector.java +2/-2
lib/nio/version.rb +2/-2
lib/nio4r.rb +2/-0
license.md +5/-2
readme.md +5/-5
DIFFERENT test_files:
2.7.0->2.7.3:
* Deleted:
spec/nio/acceptables_spec.rb
spec/nio/bytebuffer_spec.rb
spec/nio/monitor_spec.rb
spec/nio/selectables/pipe_spec.rb
spec/nio/selectables/ssl_socket_spec.rb
spec/nio/selectables/tcp_socket_spec.rb
spec/nio/selectables/udp_socket_spec.rb
spec/nio/selector_spec.rb
spec/spec_helper.rb
spec/support/selectable_examples.rb
DIFFERENT development dependencies:
2.7.0->2.7.3:
* Deleted:
bundler [">= 0"] (development)
rake [">= 0"] (development)
DIFFERENT Gemfile dependencies
2.7.0->2.7.3:
* Deleted
bake [">= 0"] (runtime)
bake-gem [">= 0"] (runtime)
rake-compiler ["~> 1.1.9"] (development)
rspec ["~> 3.7"] (development)
rubocop ["= 0.82.0"] (development) |
gem compare --diff nio4r 2.7.0 2.7.3Compared versions: ["2.7.0", "2.7.3"]
DIFFERENT files:
2.7.0->2.7.3:
* Deleted:
.github/workflows/workflow.yml
.gitignore
.mailmap
.rspec
.rubocop.yml
Gemfile
Rakefile
examples/echo_server.rb
logo.png
nio4r.gemspec
rakelib/extension.rake
rakelib/rspec.rake
rakelib/rubocop.rake
spec/nio/acceptables_spec.rb
spec/nio/bytebuffer_spec.rb
spec/nio/monitor_spec.rb
spec/nio/selectables/pipe_spec.rb
spec/nio/selectables/ssl_socket_spec.rb
spec/nio/selectables/tcp_socket_spec.rb
spec/nio/selectables/udp_socket_spec.rb
spec/nio/selector_spec.rb
spec/spec_helper.rb
spec/support/selectable_examples.rb
* Changed:
changes.md
--- /tmp/d20240920-1854-r9pr80/nio4r-2.7.0/changes.md 2024-09-20 02:14:19.359060724 +0000
+++ /tmp/d20240920-1854-r9pr80/nio4r-2.7.3/changes.md 2024-09-20 02:14:19.369060782 +0000
@@ -1 +1,12 @@
-## 2.6.2
+## 2.7.2
+
+* Modernize gem (list all authors, etc).
+* Drop official support for Ruby 2.4.
+* Fix JRuby release version.
+
+## 2.7.1
+
+* Fix license specification.
+* Fix JRuby build warnings.
+
+## 2.7.0
ext/nio4r/org/nio4r/ByteBuffer.java
--- /tmp/d20240920-1854-r9pr80/nio4r-2.7.0/ext/nio4r/org/nio4r/ByteBuffer.java 2024-09-20 02:14:19.365060759 +0000
+++ /tmp/d20240920-1854-r9pr80/nio4r-2.7.3/ext/nio4r/org/nio4r/ByteBuffer.java 2024-09-20 02:14:19.374060812 +0000
@@ -30 +30 @@
- private java.nio.ByteBuffer byteBuffer;
+ private transient java.nio.ByteBuffer byteBuffer;
ext/nio4r/org/nio4r/Monitor.java
--- /tmp/d20240920-1854-r9pr80/nio4r-2.7.0/ext/nio4r/org/nio4r/Monitor.java 2024-09-20 02:14:19.365060759 +0000
+++ /tmp/d20240920-1854-r9pr80/nio4r-2.7.3/ext/nio4r/org/nio4r/Monitor.java 2024-09-20 02:14:19.374060812 +0000
@@ -17 +17 @@
- private SelectionKey key;
+ private transient SelectionKey key;
@@ -19 +19 @@
- private IRubyObject interests, selector, value, closed;
+ private transient IRubyObject interests, selector, value, closed;
ext/nio4r/org/nio4r/Selector.java
--- /tmp/d20240920-1854-r9pr80/nio4r-2.7.0/ext/nio4r/org/nio4r/Selector.java 2024-09-20 02:14:19.365060759 +0000
+++ /tmp/d20240920-1854-r9pr80/nio4r-2.7.3/ext/nio4r/org/nio4r/Selector.java 2024-09-20 02:14:19.374060812 +0000
@@ -25 +25 @@
- private java.nio.channels.Selector selector;
+ private transient java.nio.channels.Selector selector;
@@ -237 +237 @@
- context.getThread().beforeBlockingCall();
+ context.getThread().beforeBlockingCall(context);
lib/nio/version.rb
--- /tmp/d20240920-1854-r9pr80/nio4r-2.7.0/lib/nio/version.rb 2024-09-20 02:14:19.366060765 +0000
+++ /tmp/d20240920-1854-r9pr80/nio4r-2.7.3/lib/nio/version.rb 2024-09-20 02:14:19.375060818 +0000
@@ -5 +5 @@
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
@@ -9 +9 @@
- VERSION = "2.7.0"
+ VERSION = "2.7.3"
lib/nio4r.rb
--- /tmp/d20240920-1854-r9pr80/nio4r-2.7.0/lib/nio4r.rb 2024-09-20 02:14:19.366060765 +0000
+++ /tmp/d20240920-1854-r9pr80/nio4r-2.7.3/lib/nio4r.rb 2024-09-20 02:14:19.375060818 +0000
@@ -0,0 +1,2 @@
+# frozen_string_literal: true
+
license.md
--- /tmp/d20240920-1854-r9pr80/nio4r-2.7.0/license.md 2024-09-20 02:14:19.366060765 +0000
+++ /tmp/d20240920-1854-r9pr80/nio4r-2.7.3/license.md 2024-09-20 02:14:19.376060823 +0000
@@ -32 +32 @@
-Copyright, 2018-2023, by Samuel Williams.
+Copyright, 2018-2024, by Samuel Williams.
@@ -48 +48 @@
-Copyright, 2023, by Pavel Rosický.
+Copyright, 2023-2024, by Pavel Rosický.
@@ -50,0 +51,3 @@
+Copyright, 2023, by Maxime Demolin.
+Copyright, 2023-2024, by Vít Ondruch.
+Copyright, 2023, by Jean Boussier.
readme.md
--- /tmp/d20240920-1854-r9pr80/nio4r-2.7.0/readme.md 2024-09-20 02:14:19.367060771 +0000
+++ /tmp/d20240920-1854-r9pr80/nio4r-2.7.3/readme.md 2024-09-20 02:14:19.376060823 +0000
@@ -3,4 +3 @@
-[](http://rubygems.org/gems/nio4r)
-[](https://github.com/socketry/nio4r/actions?query=workflow:nio4r)
-[](https://codeclimate.com/github/socketry/nio4r)
-[](http://www.rubydoc.info/gems/nio4r/2.2.0)
+[](https://github.com/socketry/nio4r/actions?workflow=Test)
@@ -33 +29,0 @@
- - Ruby 2.4
@@ -69,0 +66,4 @@
+
+Bump the version first:
+
+ bundle exec bake gem:release:version:patch |
gem compare puma 6.4.2 6.4.3Compared versions: ["6.4.2", "6.4.3"]
DIFFERENT date:
6.4.2: 2024-01-08 00:00:00 UTC
6.4.3: 2024-09-19 00:00:00 UTC
DIFFERENT require_paths:
6.4.2: ["/opt/hostedtoolcache/Ruby/3.2.5/x64/lib/ruby/gems/3.2.0/extensions/x86_64-linux/3.2.0/puma-6.4.2", "lib"]
6.4.3: ["/opt/hostedtoolcache/Ruby/3.2.5/x64/lib/ruby/gems/3.2.0/extensions/x86_64-linux/3.2.0/puma-6.4.3", "lib"]
DIFFERENT rubygems_version:
6.4.2: 3.5.3
6.4.3: 3.5.16
DIFFERENT version:
6.4.2: 6.4.2
6.4.3: 6.4.3
DIFFERENT files:
6.4.2->6.4.3:
* Changed:
History.md +10/-0
ext/puma_http11/org/jruby/puma/Http11.java +2/-0
lib/puma/const.rb +9/-1
lib/puma/request.rb +16/-3 |
gem compare --diff puma 6.4.2 6.4.3Compared versions: ["6.4.2", "6.4.3"]
DIFFERENT files:
6.4.2->6.4.3:
* Changed:
History.md
--- /tmp/d20240920-2007-wk5cjr/puma-6.4.2/History.md 2024-09-20 02:14:25.402094202 +0000
+++ /tmp/d20240920-2007-wk5cjr/puma-6.4.3/History.md 2024-09-20 02:14:25.417094277 +0000
@@ -0,0 +1,5 @@
+## 6.4.3 / 2024-09-19
+
+* Security
+ * Discards any headers using underscores if the non-underscore version also exists. Without this, an attacker could overwrite values set by intermediate proxies (e.g. X-Forwarded-For). ([CVE-2024-45614](https://github.com/puma/puma/security/advisories/GHSA-9hf4-67fc-4vf4)/GHSA-9hf4-67fc-4vf4)
+
@@ -174,0 +180,5 @@
+
+## 5.6.9 / 2024-09-19
+
+* Security
+ * Discards any headers using underscores if the non-underscore version also exists. Without this, an attacker could overwrite values set by intermediate proxies (e.g. X-Forwarded-For). ([CVE-2024-45614](https://github.com/puma/puma/security/advisories/GHSA-9hf4-67fc-4vf4)/GHSA-9hf4-67fc-4vf4)
ext/puma_http11/org/jruby/puma/Http11.java
--- /tmp/d20240920-2007-wk5cjr/puma-6.4.2/ext/puma_http11/org/jruby/puma/Http11.java 2024-09-20 02:14:25.408094232 +0000
+++ /tmp/d20240920-2007-wk5cjr/puma-6.4.3/ext/puma_http11/org/jruby/puma/Http11.java 2024-09-20 02:14:25.423094307 +0000
@@ -101,0 +102,2 @@
+ } else if(bite == '_') {
+ b.set(i, (byte)',');
lib/puma/const.rb
--- /tmp/d20240920-2007-wk5cjr/puma-6.4.2/lib/puma/const.rb 2024-09-20 02:14:25.411094247 +0000
+++ /tmp/d20240920-2007-wk5cjr/puma-6.4.3/lib/puma/const.rb 2024-09-20 02:14:25.426094322 +0000
@@ -103 +103 @@
- PUMA_VERSION = VERSION = "6.4.2"
+ PUMA_VERSION = VERSION = "6.4.3"
@@ -282,0 +283,8 @@
+
+ # The keys of headers that should not be convert to underscore
+ # normalized versions. These headers are ignored at the request reading layer,
+ # but if we normalize them after reading, it's just confusing for the application.
+ UNMASKABLE_HEADERS = {
+ "HTTP_TRANSFER,ENCODING" => true,
+ "HTTP_CONTENT,LENGTH" => true,
+ }
lib/puma/request.rb
--- /tmp/d20240920-2007-wk5cjr/puma-6.4.2/lib/puma/request.rb 2024-09-20 02:14:25.414094262 +0000
+++ /tmp/d20240920-2007-wk5cjr/puma-6.4.3/lib/puma/request.rb 2024-09-20 02:14:25.429094337 +0000
@@ -497,0 +498,5 @@
+ #
+ # @note If a normalized version of a `,` header already exists, we ignore
+ # the `,` version. This prevents clobbering headers managed by proxies
+ # but not by clients (Like X-Forwarded-For).
+ #
@@ -506 +511 @@
- if k.start_with?("HTTP_") && k.include?(",") && k != "HTTP_TRANSFER,ENCODING"
+ if k.start_with?("HTTP_") && k.include?(",") && !UNMASKABLE_HEADERS.key?(k)
@@ -512,0 +518,5 @@
+ new_k = k.tr(",", "_")
+ if env.key?(new_k)
+ next
+ end
+
@@ -517 +527 @@
- to_add[k.tr(",", "_")] = v
+ to_add[new_k] = v
@@ -521 +531 @@
- if to_delete
+ if to_delete # rubocop:disable Style/SafeNavigation
@@ -522,0 +533,3 @@
+ end
+
+ if to_add |
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.
Bumps puma from 6.4.2 to 6.4.3.
Release notes
Sourced from puma's releases.
Changelog
Sourced from puma's changelog.
Commits
e867e536.4.363a27b55.6.9 release note [ci skip]cac3fd1Merge commit from forkDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)