Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rubygem-puma-4 for openSUSE:Factory
checked in at 2022-04-30 22:52:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-puma-4 (Old)
and /work/SRC/openSUSE:Factory/.rubygem-puma-4.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-puma-4"
Sat Apr 30 22:52:41 2022 rev:5 rq:974067 version:4.3.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-puma-4/rubygem-puma-4.changes
2022-02-24 18:23:33.974656711 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-puma-4.new.1538/rubygem-puma-4.changes
2022-04-30 22:52:54.912254886 +0200
@@ -1,0 +2,12 @@
+Thu Apr 28 05:42:04 UTC 2022 - Stephan Kulow <co...@suse.com>
+
+updated to version 4.3.12
+ see installed History.md
+
+ ## 4.3.12 / 2022-03-30
+
+ * Security
+ * Close several HTTP Request Smuggling exploits (CVE-2022-24790)
+
+
+-------------------------------------------------------------------
Old:
----
puma-4.3.11.gem
New:
----
puma-4.3.12.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-puma-4.spec ++++++
--- /var/tmp/diff_new_pack.8zta1m/_old 2022-04-30 22:52:55.420255573 +0200
+++ /var/tmp/diff_new_pack.8zta1m/_new 2022-04-30 22:52:55.424255579 +0200
@@ -24,7 +24,7 @@
#
Name: rubygem-puma-4
-Version: 4.3.11
+Version: 4.3.12
Release: 0
%define mod_name puma
%define mod_full_name %{mod_name}-%{version}
++++++ puma-4.3.11.gem -> puma-4.3.12.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/History.md new/History.md
--- old/History.md 1980-01-01 01:00:00.000000000 +0100
+++ new/History.md 1980-01-01 01:00:00.000000000 +0100
@@ -1,3 +1,8 @@
+## 4.3.12 / 2022-03-30
+
+* Security
+ * Close several HTTP Request Smuggling exploits (CVE-2022-24790)
+
## 4.3.11 / 2022-02-11
* Security
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/puma_http11/extconf.rb
new/ext/puma_http11/extconf.rb
--- old/ext/puma_http11/extconf.rb 1980-01-01 01:00:00.000000000 +0100
+++ new/ext/puma_http11/extconf.rb 1980-01-01 01:00:00.000000000 +0100
@@ -22,6 +22,14 @@
# with versions after 1.1.1
have_func "TLS_server_method" , "openssl/ssl.h"
have_macro "SSL_CTX_set_min_proto_version", "openssl/ssl.h"
+
+ # Random.bytes available in Ruby 2.5 and later, Random::DEFAULT deprecated
in 3.0
+ if Random.respond_to?(:bytes)
+ $defs.push("-DHAVE_RANDOM_BYTES")
+ puts "checking for Random.bytes... yes"
+ else
+ puts "checking for Random.bytes... no"
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/puma_http11/mini_ssl.c
new/ext/puma_http11/mini_ssl.c
--- old/ext/puma_http11/mini_ssl.c 1980-01-01 01:00:00.000000000 +0100
+++ new/ext/puma_http11/mini_ssl.c 1980-01-01 01:00:00.000000000 +0100
@@ -62,44 +62,65 @@
return conn;
}
-DH *get_dh1024() {
- /* `openssl dhparam 1024 -C`
+DH *get_dh2048(void) {
+ /* `openssl dhparam -C 2048`
* -----BEGIN DH PARAMETERS-----
- * MIGHAoGBALPwcEv0OstmQCZdfHw0N5r+07lmXMxkpQacy1blwj0LUqC+Divp6pBk
- * usTJ9W2/dOYr1X7zi6yXNLp4oLzc/31PUL3D9q8CpGS7vPz5gijKSw9BwCTT5z9+
- * KF9v46qw8XqT5HHV87sWFlGQcVFq+pEkA2kPikkKZ/X/CCcpCAV7AgEC
+ * MIIBCAKCAQEAjmh1uQHdTfxOyxEbKAV30fUfzqMDF/ChPzjfyzl2jcrqQMhrk76o
+ * 2NPNXqxHwsddMZ1RzvU8/jl+uhRuPWjXCFZbhET4N1vrviZM3VJhV8PPHuiVOACO
+ * y32jFd+Szx4bo2cXSK83hJ6jRd+0asP1awWjz9/06dFkrILCXMIfQLo0D8rqmppn
+ * EfDDAwuudCpM9kcDmBRAm9JsKbQ6gzZWjkc5+QWSaQofojIHbjvj3xzguaCJn+oQ
+ * vHWM+hsAnaOgEwCyeZ3xqs+/5lwSbkE/tqJW98cEZGygBUVo9jxZRZx6KOfjpdrb
+ * yenO9LJr/qtyrZB31WJbqxI0m0AKTAO8UwIBAg==
* -----END DH PARAMETERS-----
*/
- static unsigned char dh1024_p[] = {
- 0xB3,0xF0,0x70,0x4B,0xF4,0x3A,0xCB,0x66,0x40,0x26,0x5D,0x7C,
- 0x7C,0x34,0x37,0x9A,0xFE,0xD3,0xB9,0x66,0x5C,0xCC,0x64,0xA5,
- 0x06,0x9C,0xCB,0x56,0xE5,0xC2,0x3D,0x0B,0x52,0xA0,0xBE,0x0E,
- 0x2B,0xE9,0xEA,0x90,0x64,0xBA,0xC4,0xC9,0xF5,0x6D,0xBF,0x74,
- 0xE6,0x2B,0xD5,0x7E,0xF3,0x8B,0xAC,0x97,0x34,0xBA,0x78,0xA0,
- 0xBC,0xDC,0xFF,0x7D,0x4F,0x50,0xBD,0xC3,0xF6,0xAF,0x02,0xA4,
- 0x64,0xBB,0xBC,0xFC,0xF9,0x82,0x28,0xCA,0x4B,0x0F,0x41,0xC0,
- 0x24,0xD3,0xE7,0x3F,0x7E,0x28,0x5F,0x6F,0xE3,0xAA,0xB0,0xF1,
- 0x7A,0x93,0xE4,0x71,0xD5,0xF3,0xBB,0x16,0x16,0x51,0x90,0x71,
- 0x51,0x6A,0xFA,0x91,0x24,0x03,0x69,0x0F,0x8A,0x49,0x0A,0x67,
- 0xF5,0xFF,0x08,0x27,0x29,0x08,0x05,0x7B
+ static unsigned char dh2048_p[] = {
+ 0x8E, 0x68, 0x75, 0xB9, 0x01, 0xDD, 0x4D, 0xFC, 0x4E, 0xCB,
+ 0x11, 0x1B, 0x28, 0x05, 0x77, 0xD1, 0xF5, 0x1F, 0xCE, 0xA3,
+ 0x03, 0x17, 0xF0, 0xA1, 0x3F, 0x38, 0xDF, 0xCB, 0x39, 0x76,
+ 0x8D, 0xCA, 0xEA, 0x40, 0xC8, 0x6B, 0x93, 0xBE, 0xA8, 0xD8,
+ 0xD3, 0xCD, 0x5E, 0xAC, 0x47, 0xC2, 0xC7, 0x5D, 0x31, 0x9D,
+ 0x51, 0xCE, 0xF5, 0x3C, 0xFE, 0x39, 0x7E, 0xBA, 0x14, 0x6E,
+ 0x3D, 0x68, 0xD7, 0x08, 0x56, 0x5B, 0x84, 0x44, 0xF8, 0x37,
+ 0x5B, 0xEB, 0xBE, 0x26, 0x4C, 0xDD, 0x52, 0x61, 0x57, 0xC3,
+ 0xCF, 0x1E, 0xE8, 0x95, 0x38, 0x00, 0x8E, 0xCB, 0x7D, 0xA3,
+ 0x15, 0xDF, 0x92, 0xCF, 0x1E, 0x1B, 0xA3, 0x67, 0x17, 0x48,
+ 0xAF, 0x37, 0x84, 0x9E, 0xA3, 0x45, 0xDF, 0xB4, 0x6A, 0xC3,
+ 0xF5, 0x6B, 0x05, 0xA3, 0xCF, 0xDF, 0xF4, 0xE9, 0xD1, 0x64,
+ 0xAC, 0x82, 0xC2, 0x5C, 0xC2, 0x1F, 0x40, 0xBA, 0x34, 0x0F,
+ 0xCA, 0xEA, 0x9A, 0x9A, 0x67, 0x11, 0xF0, 0xC3, 0x03, 0x0B,
+ 0xAE, 0x74, 0x2A, 0x4C, 0xF6, 0x47, 0x03, 0x98, 0x14, 0x40,
+ 0x9B, 0xD2, 0x6C, 0x29, 0xB4, 0x3A, 0x83, 0x36, 0x56, 0x8E,
+ 0x47, 0x39, 0xF9, 0x05, 0x92, 0x69, 0x0A, 0x1F, 0xA2, 0x32,
+ 0x07, 0x6E, 0x3B, 0xE3, 0xDF, 0x1C, 0xE0, 0xB9, 0xA0, 0x89,
+ 0x9F, 0xEA, 0x10, 0xBC, 0x75, 0x8C, 0xFA, 0x1B, 0x00, 0x9D,
+ 0xA3, 0xA0, 0x13, 0x00, 0xB2, 0x79, 0x9D, 0xF1, 0xAA, 0xCF,
+ 0xBF, 0xE6, 0x5C, 0x12, 0x6E, 0x41, 0x3F, 0xB6, 0xA2, 0x56,
+ 0xF7, 0xC7, 0x04, 0x64, 0x6C, 0xA0, 0x05, 0x45, 0x68, 0xF6,
+ 0x3C, 0x59, 0x45, 0x9C, 0x7A, 0x28, 0xE7, 0xE3, 0xA5, 0xDA,
+ 0xDB, 0xC9, 0xE9, 0xCE, 0xF4, 0xB2, 0x6B, 0xFE, 0xAB, 0x72,
+ 0xAD, 0x90, 0x77, 0xD5, 0x62, 0x5B, 0xAB, 0x12, 0x34, 0x9B,
+ 0x40, 0x0A, 0x4C, 0x03, 0xBC, 0x53
};
- static unsigned char dh1024_g[] = { 0x02 };
+ static unsigned char dh2048_g[] = { 0x02 };
DH *dh;
+#if !(OPENSSL_VERSION_NUMBER < 0x10100005L || defined(LIBRESSL_VERSION_NUMBER))
+ BIGNUM *p, *g;
+#endif
+
dh = DH_new();
#if OPENSSL_VERSION_NUMBER < 0x10100005L || defined(LIBRESSL_VERSION_NUMBER)
- dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
- dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
+ dh->p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
+ dh->g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
if ((dh->p == NULL) || (dh->g == NULL)) {
DH_free(dh);
return NULL;
}
#else
- BIGNUM *p, *g;
- p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
- g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
+ p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
+ g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
if (p == NULL || g == NULL || !DH_set0_pqg(dh, p, NULL, g)) {
DH_free(dh);
@@ -139,7 +160,7 @@
}
VALUE engine_init_server(VALUE self, VALUE mini_ssl_ctx) {
- VALUE obj;
+ VALUE obj, session_id_bytes;
SSL_CTX* ctx;
SSL* ssl;
int min, ssl_options;
@@ -198,7 +219,7 @@
else {
min = TLS1_VERSION;
}
-
+
SSL_CTX_set_min_proto_version(ctx, min);
SSL_CTX_set_options(ctx, ssl_options);
@@ -226,7 +247,21 @@
SSL_CTX_set_cipher_list(ctx, "HIGH:!aNULL@STRENGTH");
}
- DH *dh = get_dh1024();
+ // Random.bytes available in Ruby 2.5 and later, Random::DEFAULT deprecated
in 3.0
+ session_id_bytes = rb_funcall(
+#ifdef HAVE_RANDOM_BYTES
+ rb_cRandom,
+#else
+ rb_const_get(rb_cRandom, rb_intern_const("DEFAULT")),
+#endif
+ rb_intern_const("bytes"),
+ 1, ULL2NUM(SSL_MAX_SSL_SESSION_ID_LENGTH));
+
+ SSL_CTX_set_session_id_context(ctx,
+ (unsigned char *)
RSTRING_PTR(session_id_bytes),
+ SSL_MAX_SSL_SESSION_ID_LENGTH);
+
+ DH *dh = get_dh2048();
SSL_CTX_set_tmp_dh(ctx, dh);
#if OPENSSL_VERSION_NUMBER < 0x10002000L
@@ -493,27 +528,27 @@
#else
rb_define_const(mod, "OPENSSL_LIBRARY_VERSION",
rb_str_new2(SSLeay_version(SSLEAY_VERSION)));
#endif
-
-#if defined(OPENSSL_NO_SSL3) || defined(OPENSSL_NO_SSL3_METHOD)
- /* True if SSL3 is not available */
- rb_define_const(mod, "OPENSSL_NO_SSL3", Qtrue);
-#else
- rb_define_const(mod, "OPENSSL_NO_SSL3", Qfalse);
-#endif
-
-#if defined(OPENSSL_NO_TLS1) || defined(OPENSSL_NO_TLS1_METHOD)
- /* True if TLS1 is not available */
- rb_define_const(mod, "OPENSSL_NO_TLS1", Qtrue);
-#else
- rb_define_const(mod, "OPENSSL_NO_TLS1", Qfalse);
-#endif
-
-#if defined(OPENSSL_NO_TLS1_1) || defined(OPENSSL_NO_TLS1_1_METHOD)
- /* True if TLS1_1 is not available */
- rb_define_const(mod, "OPENSSL_NO_TLS1_1", Qtrue);
-#else
- rb_define_const(mod, "OPENSSL_NO_TLS1_1", Qfalse);
-#endif
+
+#if defined(OPENSSL_NO_SSL3) || defined(OPENSSL_NO_SSL3_METHOD)
+ /* True if SSL3 is not available */
+ rb_define_const(mod, "OPENSSL_NO_SSL3", Qtrue);
+#else
+ rb_define_const(mod, "OPENSSL_NO_SSL3", Qfalse);
+#endif
+
+#if defined(OPENSSL_NO_TLS1) || defined(OPENSSL_NO_TLS1_METHOD)
+ /* True if TLS1 is not available */
+ rb_define_const(mod, "OPENSSL_NO_TLS1", Qtrue);
+#else
+ rb_define_const(mod, "OPENSSL_NO_TLS1", Qfalse);
+#endif
+
+#if defined(OPENSSL_NO_TLS1_1) || defined(OPENSSL_NO_TLS1_1_METHOD)
+ /* True if TLS1_1 is not available */
+ rb_define_const(mod, "OPENSSL_NO_TLS1_1", Qtrue);
+#else
+ rb_define_const(mod, "OPENSSL_NO_TLS1_1", Qfalse);
+#endif
rb_define_singleton_method(mod, "check", noop, 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/client.rb new/lib/puma/client.rb
--- old/lib/puma/client.rb 1980-01-01 01:00:00.000000000 +0100
+++ new/lib/puma/client.rb 1980-01-01 01:00:00.000000000 +0100
@@ -23,6 +23,8 @@
class ConnectionError < RuntimeError; end
+ class HttpParserError501 < IOError; end
+
# An instance of this class represents a unique request from a client.
# For example, this could be a web request from a browser or from CURL.
#
@@ -35,7 +37,21 @@
# Instances of this class are responsible for knowing if
# the header and body are fully buffered via the `try_to_finish` method.
# They can be used to "time out" a response via the `timeout_at` reader.
+ #
class Client
+
+ # this tests all values but the last, which must be chunked
+ ALLOWED_TRANSFER_ENCODING = %w[compress deflate gzip].freeze
+
+ # chunked body validation
+ CHUNK_SIZE_INVALID = /[^\h]/.freeze
+ CHUNK_VALID_ENDING = "\r\n".freeze
+
+ # Content-Length header value validation
+ CONTENT_LENGTH_VALUE_INVALID = /[^\d]/.freeze
+
+ TE_ERR_MSG = 'Invalid Transfer-Encoding'
+
# The object used for a request with no body. All requests with
# no body share this one object since it has no state.
EmptyBody = NullIO.new
@@ -284,16 +300,27 @@
body = @parser.body
te = @env[TRANSFER_ENCODING2]
-
if te
- if te.include?(",")
- te.split(",").each do |part|
- if CHUNKED.casecmp(part.strip) == 0
- return setup_chunked_body(body)
- end
+ te_lwr = te.downcase
+ if te.include? ','
+ te_ary = te_lwr.split ','
+ te_count = te_ary.count CHUNKED
+ te_valid = te_ary[0..-2].all? { |e|
ALLOWED_TRANSFER_ENCODING.include? e }
+ if te_ary.last == CHUNKED && te_count == 1 && te_valid
+ @env.delete TRANSFER_ENCODING2
+ return setup_chunked_body body
+ elsif te_count >= 1
+ raise HttpParserError , "#{TE_ERR_MSG}, multiple chunked:
'#{te}'"
+ elsif !te_valid
+ raise HttpParserError501, "#{TE_ERR_MSG}, unknown value: '#{te}'"
end
- elsif CHUNKED.casecmp(te) == 0
- return setup_chunked_body(body)
+ elsif te_lwr == CHUNKED
+ @env.delete TRANSFER_ENCODING2
+ return setup_chunked_body body
+ elsif ALLOWED_TRANSFER_ENCODING.include? te_lwr
+ raise HttpParserError , "#{TE_ERR_MSG}, single value must be
chunked: '#{te}'"
+ else
+ raise HttpParserError501 , "#{TE_ERR_MSG}, unknown value: '#{te}'"
end
end
@@ -301,7 +328,12 @@
cl = @env[CONTENT_LENGTH]
- unless cl
+ if cl
+ # cannot contain characters that are not \d
+ if cl =~ CONTENT_LENGTH_VALUE_INVALID
+ raise HttpParserError, "Invalid Content-Length: #{cl.inspect}"
+ end
+ else
@buffer = body.empty? ? nil : body
@body = EmptyBody
set_ready
@@ -450,7 +482,13 @@
while !io.eof?
line = io.gets
if line.end_with?("\r\n")
- len = line.strip.to_i(16)
+ # Puma doesn't process chunk extensions, but should parse if they're
+ # present, which is the reason for the semicolon regex
+ chunk_hex = line.strip[/\A[^;]+/]
+ if chunk_hex =~ CHUNK_SIZE_INVALID
+ raise HttpParserError, "Invalid chunk size: '#{chunk_hex}'"
+ end
+ len = chunk_hex.to_i(16)
if len == 0
@in_last_chunk = true
@body.rewind
@@ -481,7 +519,12 @@
case
when got == len
- write_chunk(part[0..-3]) # to skip the ending \r\n
+ # proper chunked segment must end with "\r\n"
+ if part.end_with? CHUNK_VALID_ENDING
+ write_chunk(part[0..-3]) # to skip the ending \r\n
+ else
+ raise HttpParserError, "Chunk size mismatch"
+ end
when got <= len - 2
write_chunk(part)
@partial_part_left = len - part.size
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/const.rb new/lib/puma/const.rb
--- old/lib/puma/const.rb 1980-01-01 01:00:00.000000000 +0100
+++ new/lib/puma/const.rb 1980-01-01 01:00:00.000000000 +0100
@@ -76,7 +76,7 @@
508 => 'Loop Detected',
510 => 'Not Extended',
511 => 'Network Authentication Required'
- }
+ }.freeze
# For some HTTP status codes the client only expects headers.
#
@@ -85,7 +85,7 @@
204 => true,
205 => true,
304 => true
- }
+ }.freeze
# Frequently used constants when constructing requests or responses. Many
times
# the constant just refers to a string with the same contents. Using these
constants
@@ -100,7 +100,7 @@
# too taxing on performance.
module Const
- PUMA_VERSION = VERSION = "4.3.11".freeze
+ PUMA_VERSION = VERSION = "4.3.12".freeze
CODE_NAME = "Mysterious Traveller".freeze
PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
@@ -144,9 +144,11 @@
408 => "HTTP/1.1 408 Request Timeout\r\nConnection: close\r\nServer:
Puma #{PUMA_VERSION}\r\n\r\n".freeze,
# Indicate that there was an internal error, obviously.
500 => "HTTP/1.1 500 Internal Server Error\r\n\r\n".freeze,
+ # Incorrect or invalid header value
+ 501 => "HTTP/1.1 501 Not Implemented\r\n\r\n".freeze,
# A common header for indicating the server is too busy. Not used yet.
503 => "HTTP/1.1 503 Service Unavailable\r\n\r\nBUSY".freeze
- }
+ }.freeze
# The basic max request size we'll try to read.
CHUNK_SIZE = 16 * 1024
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/server.rb new/lib/puma/server.rb
--- old/lib/puma/server.rb 1980-01-01 01:00:00.000000000 +0100
+++ new/lib/puma/server.rb 1980-01-01 01:00:00.000000000 +0100
@@ -321,6 +321,10 @@
client.close
@events.parse_error self, client.env, e
+ rescue HttpParserError501 => e
+ client.write_error(501)
+ client.close
+ @events.parse_error self, client.env, e
rescue ConnectionError, EOFError
client.close
else
@@ -530,7 +534,12 @@
client.write_error(400)
@events.parse_error self, client.env, e
+ rescue HttpParserError501 => e
+ lowlevel_error(e, client.env)
+ client.write_error(501)
+
+ @events.parse_error self, client.env, e
# Server error
rescue StandardError => e
lowlevel_error(e, client.env)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 1980-01-01 01:00:00.000000000 +0100
+++ new/metadata 1980-01-01 01:00:00.000000000 +0100
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: puma
version: !ruby/object:Gem::Version
- version: 4.3.11
+ version: 4.3.12
platform: ruby
authors:
- Evan Phoenix
