From aac981a316c93868df2ea8f8b9a9ac222db7bea5 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Tue, 10 Feb 2026 10:02:10 +0100 Subject: [PATCH] - bundled urllib3: fix CVE-2024-37891, CVE-2025-66418, CVE-2025-66471, CVE-2026-21441, and pyasn1 CVE-2026-23490 on all archs Resolves: RHEL-146344 --- ...9-fix-bundled-urllib3-CVE-2025-66418.patch | 23 -- ...9-fix-bundled-urllib3-CVE-2025-66471.patch | 282 ------------------ ...2-fix-bundled-urllib3-CVE-2026-21441.patch | 32 -- ...60-fix-bundled-pyasn1-CVE-2026-23490.patch | 29 -- ...1-fix-bundled-urllib3-CVE-2024-37891.patch | 32 ++ ...2-fix-bundled-urllib3-CVE-2025-66418.patch | 22 ++ ...3-fix-bundled-urllib3-CVE-2025-66471.patch | 281 +++++++++++++++++ ...2-fix-bundled-urllib3-CVE-2026-21441.patch | 31 ++ ...1-fix-bundled-urllib3-CVE-2024-37891.patch | 16 - ...2-fix-bundled-urllib3-CVE-2025-66418.patch | 23 -- ...3-fix-bundled-urllib3-CVE-2025-66471.patch | 282 ------------------ ...2-fix-bundled-urllib3-CVE-2026-21441.patch | 32 -- ...-5-fix-bundled-pyasn1-CVE-2026-23490.patch | 28 ++ ...2-fix-bundled-urllib3-CVE-2024-37891.patch | 16 - fence-agents.spec | 24 +- 15 files changed, 411 insertions(+), 742 deletions(-) create mode 100644 RHEL-146344-ibm-1-fix-bundled-urllib3-CVE-2024-37891.patch create mode 100644 RHEL-146344-ibm-2-fix-bundled-urllib3-CVE-2025-66418.patch create mode 100644 RHEL-146344-ibm-3-fix-bundled-urllib3-CVE-2025-66471.patch create mode 100644 RHEL-146344-ibm-4-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch rename RHEL-146344-fix-bundled-urllib3-CVE-2024-37891.patch => RHEL-146344-kubevirt-1-fix-bundled-urllib3-CVE-2024-37891.patch (67%) rename RHEL-146344-fix-bundled-urllib3-CVE-2025-66418.patch => RHEL-146344-kubevirt-2-fix-bundled-urllib3-CVE-2025-66418.patch (50%) rename RHEL-146344-fix-bundled-urllib3-CVE-2025-66471.patch => RHEL-146344-kubevirt-3-fix-bundled-urllib3-CVE-2025-66471.patch (50%) rename RHEL-146344-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch => RHEL-146344-kubevirt-4-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch (50%) create mode 100644 RHEL-146344-kubevirt-5-fix-bundled-pyasn1-CVE-2026-23490.patch diff --git a/RHEL-136069-fix-bundled-urllib3-CVE-2025-66418.patch b/RHEL-136069-fix-bundled-urllib3-CVE-2025-66418.patch index 91dcdf7..ece497b 100644 --- a/RHEL-136069-fix-bundled-urllib3-CVE-2025-66418.patch +++ b/RHEL-136069-fix-bundled-urllib3-CVE-2025-66418.patch @@ -66,26 +66,3 @@ def flush(self): return self._decoders[0].flush() - ---- a/kubevirt/urllib3/response.py 2023-10-17 19:42:56.000000000 +0200 -+++ b/kubevirt/urllib3/response.py 2026-01-02 11:19:25.583808492 +0100 -@@ -135,8 +135,18 @@ - they were applied. - """ - -+ # Maximum allowed number of chained HTTP encodings in the -+ # Content-Encoding header. -+ max_decode_links = 5 -+ - def __init__(self, modes): -- self._decoders = [_get_decoder(m.strip()) for m in modes.split(",")] -+ encodings = [m.strip() for m in modes.split(",")] -+ if len(encodings) > self.max_decode_links: -+ raise DecodeError( -+ "Too many content encodings in the chain: " -+ f"{len(encodings)} > {self.max_decode_links}" -+ ) -+ self._decoders = [_get_decoder(e) for e in encodings] - - def flush(self): - return self._decoders[0].flush() diff --git a/RHEL-139799-fix-bundled-urllib3-CVE-2025-66471.patch b/RHEL-139799-fix-bundled-urllib3-CVE-2025-66471.patch index 031c2ef..7363272 100644 --- a/RHEL-139799-fix-bundled-urllib3-CVE-2025-66471.patch +++ b/RHEL-139799-fix-bundled-urllib3-CVE-2025-66471.patch @@ -790,288 +790,6 @@ + return any(d.has_unconsumed_tail for d in self._decoders) - def _get_decoder(mode): -@@ -405,16 +517,25 @@ - if brotli is not None: - DECODER_ERROR_CLASSES += (brotli.error,) - -- def _decode(self, data, decode_content, flush_decoder): -+ def _decode( -+ self, -+ data: bytes, -+ decode_content: bool, -+ flush_decoder: bool, -+ max_length: int = None, -+ ) -> bytes: - """ - Decode the data passed in and potentially flush the decoder. - """ - if not decode_content: - return data - -+ if max_length is None or flush_decoder: -+ max_length = -1 -+ - try: - if self._decoder: -- data = self._decoder.decompress(data) -+ data = self._decoder.decompress(data, max_length=max_length) - except self.DECODER_ERROR_CLASSES as e: - content_encoding = self.headers.get("content-encoding", "").lower() - raise DecodeError( -@@ -634,7 +755,10 @@ - for line in self.read_chunked(amt, decode_content=decode_content): - yield line - else: -- while not is_fp_closed(self._fp): -+ while ( -+ not is_fp_closed(self._fp) -+ or (self._decoder and self._decoder.has_unconsumed_tail) -+ ): - data = self.read(amt=amt, decode_content=decode_content) - - if data: -@@ -840,7 +964,10 @@ - break - chunk = self._handle_chunk(amt) - decoded = self._decode( -- chunk, decode_content=decode_content, flush_decoder=False -+ chunk, -+ decode_content=decode_content, -+ flush_decoder=False, -+ max_length=amt, - ) - if decoded: - yield decoded - ---- a/kubevirt/urllib3/response.py 2026-01-20 10:46:57.006470161 +0100 -+++ b/kubevirt/urllib3/response.py 2026-01-20 10:55:44.090084896 +0100 -@@ -23,6 +23,7 @@ - from .exceptions import ( - BodyNotHttplibCompatible, - DecodeError, -+ DependencyWarning, - HTTPError, - IncompleteRead, - InvalidChunkLength, -@@ -41,34 +42,60 @@ - class DeflateDecoder(object): - def __init__(self): - self._first_try = True -- self._data = b"" -+ self._first_try_data = b"" -+ self._unfed_data = b"" - self._obj = zlib.decompressobj() - - def __getattr__(self, name): - return getattr(self._obj, name) - -- def decompress(self, data): -- if not data: -+ def decompress(self, data: bytes, max_length: int = -1) -> bytes: -+ data = self._unfed_data + data -+ self._unfed_data = b"" -+ if not data and not self._obj.unconsumed_tail: - return data -+ original_max_length = max_length -+ if original_max_length < 0: -+ max_length = 0 -+ elif original_max_length == 0: -+ # We should not pass 0 to the zlib decompressor because 0 is -+ # the default value that will make zlib decompress without a -+ # length limit. -+ # Data should be stored for subsequent calls. -+ self._unfed_data = data -+ return b"" - -+ # Subsequent calls always reuse `self._obj`. zlib requires -+ # passing the unconsumed tail if decompression is to continue. - if not self._first_try: -- return self._obj.decompress(data) -+ return self._obj.decompress( -+ self._obj.unconsumed_tail + data, max_length=max_length -+ ) - -- self._data += data -+ # First call tries with RFC 1950 ZLIB format. -+ self._first_try_data += data - try: -- decompressed = self._obj.decompress(data) -+ decompressed = self._obj.decompress(data, max_length=max_length) - if decompressed: - self._first_try = False -- self._data = None -+ self._first_try_data = b"" - return decompressed -+ # On failure, it falls back to RFC 1951 DEFLATE format. - except zlib.error: - self._first_try = False - self._obj = zlib.decompressobj(-zlib.MAX_WBITS) - try: -- return self.decompress(self._data) -+ return self.decompress( -+ self._first_try_data, max_length=original_max_length -+ ) - finally: -- self._data = None -+ self._first_try_data = b"" - -+ @property -+ def has_unconsumed_tail(self) -> bool: -+ return bool(self._unfed_data) or ( -+ bool(self._obj.unconsumed_tail) and not self._first_try -+ ) - - class GzipDecoderState(object): - -@@ -81,30 +108,64 @@ - def __init__(self): - self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS) - self._state = GzipDecoderState.FIRST_MEMBER -+ self._unconsumed_tail = b"" - - def __getattr__(self, name): - return getattr(self._obj, name) - -- def decompress(self, data): -+ def decompress(self, data: bytes, max_length: int = -1) -> bytes: - ret = bytearray() -- if self._state == GzipDecoderState.SWALLOW_DATA or not data: -+ if self._state == GzipDecoderState.SWALLOW_DATA: -+ return bytes(ret) -+ -+ if max_length == 0: -+ # We should not pass 0 to the zlib decompressor because 0 is -+ # the default value that will make zlib decompress without a -+ # length limit. -+ # Data should be stored for subsequent calls. -+ self._unconsumed_tail += data -+ return b"" -+ -+ # zlib requires passing the unconsumed tail to the subsequent -+ # call if decompression is to continue. -+ data = self._unconsumed_tail + data -+ if not data and self._obj.eof: - return bytes(ret) -+ - while True: - try: -- ret += self._obj.decompress(data) -+ ret += self._obj.decompress( -+ data, max_length=max(max_length - len(ret), 0) -+ ) - except zlib.error: - previous_state = self._state - # Ignore data after the first error - self._state = GzipDecoderState.SWALLOW_DATA -+ self._unconsumed_tail = b"" - if previous_state == GzipDecoderState.OTHER_MEMBERS: - # Allow trailing garbage acceptable in other gzip clients - return bytes(ret) - raise -- data = self._obj.unused_data -+ -+ self._unconsumed_tail = data = ( -+ self._obj.unconsumed_tail or self._obj.unused_data -+ ) -+ if max_length > 0 and len(ret) >= max_length: -+ break -+ - if not data: - return bytes(ret) -- self._state = GzipDecoderState.OTHER_MEMBERS -- self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS) -+ # When the end of a gzip member is reached, a new decompressor -+ # must be created for unused (possibly future) data. -+ if self._obj.eof: -+ self._state = GzipDecoderState.OTHER_MEMBERS -+ self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS) -+ -+ return bytes(ret) -+ -+ @property -+ def has_unconsumed_tail(self) -> bool: -+ return bool(self._unconsumed_tail) - - - if brotli is not None: -@@ -116,9 +177,35 @@ - def __init__(self): - self._obj = brotli.Decompressor() - if hasattr(self._obj, "decompress"): -- self.decompress = self._obj.decompress -+ setattr(self, "_decompress", self._obj.decompress) - else: -- self.decompress = self._obj.process -+ setattr(self, "_decompress", self._obj.process) -+ -+ # Requires Brotli >= 1.2.0 for `output_buffer_limit`. -+ def _decompress(self, data: bytes, output_buffer_limit: int = -1) -> bytes: -+ raise NotImplementedError() -+ -+ def decompress(self, data: bytes, max_length: int = -1) -> bytes: -+ try: -+ if max_length > 0: -+ return self._decompress(data, output_buffer_limit=max_length) -+ else: -+ return self._decompress(data) -+ except TypeError: -+ # Fallback for Brotli/brotlicffi/brotlipy versions without -+ # the `output_buffer_limit` parameter. -+ warnings.warn( -+ "Brotli >= 1.2.0 is required to prevent decompression bombs.", -+ DependencyWarning, -+ ) -+ return self._decompress(data) -+ -+ @property -+ def has_unconsumed_tail(self) -> bool: -+ try: -+ return not self._obj.can_accept_more_data() -+ except AttributeError: -+ return False - - def flush(self): - if hasattr(self._obj, "flush"): -@@ -151,10 +238,35 @@ - def flush(self): - return self._decoders[0].flush() - -- def decompress(self, data): -- for d in reversed(self._decoders): -- data = d.decompress(data) -- return data -+ def decompress(self, data: bytes, max_length: int = -1) -> bytes: -+ if max_length <= 0: -+ for d in reversed(self._decoders): -+ data = d.decompress(data) -+ return data -+ -+ ret = bytearray() -+ # Every while loop iteration goes through all decoders once. -+ # It exits when enough data is read or no more data can be read. -+ # It is possible that the while loop iteration does not produce -+ # any data because we retrieve up to `max_length` from every -+ # decoder, and the amount of bytes may be insufficient for the -+ # next decoder to produce enough/any output. -+ while True: -+ any_data = False -+ for d in reversed(self._decoders): -+ data = d.decompress(data, max_length=max_length - len(ret)) -+ if data: -+ any_data = True -+ # We should not break when no data is returned because -+ # next decoders may produce data even with empty input. -+ ret += data -+ if not any_data or len(ret) >= max_length: -+ return bytes(ret) -+ data = b"" -+ -+ @property -+ def has_unconsumed_tail(self) -> bool: -+ return any(d.has_unconsumed_tail for d in self._decoders) - - def _get_decoder(mode): @@ -405,16 +517,25 @@ if brotli is not None: diff --git a/RHEL-140796-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch b/RHEL-140796-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch index 381f311..ce3acbc 100644 --- a/RHEL-140796-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch +++ b/RHEL-140796-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch @@ -93,35 +93,3 @@ except self.DECODER_ERROR_CLASSES as e: content_encoding = self.headers.get("content-encoding", "").lower() raise DecodeError( - ---- a/kubevirt/urllib3/response.py 2026-02-03 08:20:11.000000000 +0100 -+++ b/kubevirt/urllib3/response.py 2026-02-03 09:11:38.017998476 +0100 -@@ -350,6 +350,7 @@ - self.reason = reason - self.strict = strict - self.decode_content = decode_content -+ self._has_decoded_content = False - self.retries = retries - self.enforce_content_length = enforce_content_length - self.auto_close = auto_close -@@ -414,7 +415,11 @@ - Unread data in the HTTPResponse connection blocks the connection from being released back to the pool. - """ - try: -- self.read() -+ self.read( -+ # Do not spend resources decoding the content unless -+ # decoding has already been initiated. -+ decode_content=self._has_decoded_content, -+ ) - except (HTTPError, SocketError, BaseSSLError, HTTPException): - pass - -@@ -536,6 +541,7 @@ - try: - if self._decoder: - data = self._decoder.decompress(data, max_length=max_length) -+ self._has_decoded_content = True - except self.DECODER_ERROR_CLASSES as e: - content_encoding = self.headers.get("content-encoding", "").lower() - raise DecodeError( diff --git a/RHEL-142460-fix-bundled-pyasn1-CVE-2026-23490.patch b/RHEL-142460-fix-bundled-pyasn1-CVE-2026-23490.patch index a6de378..4f73e78 100644 --- a/RHEL-142460-fix-bundled-pyasn1-CVE-2026-23490.patch +++ b/RHEL-142460-fix-bundled-pyasn1-CVE-2026-23490.patch @@ -26,32 +26,3 @@ subId = (subId << 7) + (nextSubId & 0x7F) if index >= substrateLen: raise error.SubstrateUnderrunError( - ---- a/kubevirt/pyasn1/codec/ber/decoder.py 2019-10-17 07:00:19.000000000 +0200 -+++ b/kubevirt/pyasn1/codec/ber/decoder.py 2026-01-27 10:43:12.757563432 +0100 -@@ -22,6 +22,10 @@ - - noValue = base.noValue - -+# Maximum number of continuation octets (high-bit set) allowed per OID arc. -+# 20 octets allows up to 140-bit integers, supporting UUID-based OIDs -+MAX_OID_ARC_CONTINUATION_OCTETS = 20 -+ - - class AbstractDecoder(object): - protoComponent = None -@@ -342,7 +346,14 @@ - # Construct subid from a number of octets - nextSubId = subId - subId = 0 -+ continuationOctetCount = 0 - while nextSubId >= 128: -+ continuationOctetCount += 1 -+ if continuationOctetCount > MAX_OID_ARC_CONTINUATION_OCTETS: -+ raise error.PyAsn1Error( -+ 'OID arc exceeds maximum continuation octets limit (%d) ' -+ 'at position %d' % (MAX_OID_ARC_CONTINUATION_OCTETS, index) -+ ) - subId = (subId << 7) + (nextSubId & 0x7F) - if index >= substrateLen: - raise error.SubstrateUnderrunError( diff --git a/RHEL-146344-ibm-1-fix-bundled-urllib3-CVE-2024-37891.patch b/RHEL-146344-ibm-1-fix-bundled-urllib3-CVE-2024-37891.patch new file mode 100644 index 0000000..dd7abb5 --- /dev/null +++ b/RHEL-146344-ibm-1-fix-bundled-urllib3-CVE-2024-37891.patch @@ -0,0 +1,32 @@ +From accff72ecc2f6cf5a76d9570198a93ac7c90270e Mon Sep 17 00:00:00 2001 +From: Quentin Pradet +Date: Mon, 17 Jun 2024 11:09:06 +0400 +Subject: [PATCH] Merge pull request from GHSA-34jh-p97f-mpxf + +* Strip Proxy-Authorization header on redirects + +* Fix test_retry_default_remove_headers_on_redirect + +* Set release date +--- + CHANGES.rst | 5 +++++ + src/urllib3/util/retry.py | 4 +++- + test/test_retry.py | 6 ++++- + test/with_dummyserver/test_poolmanager.py | 27 ++++++++++++++++++++--- + 4 files changed, 37 insertions(+), 5 deletions(-) + +diff --git a/ibm/urllib3/util/retry.py b/ibm/urllib3/util/retry.py +index 7a76a4a6ad..0456cceba4 100644 +--- a/ibm/urllib3/util/retry.py ++++ b/ibm/urllib3/util/retry.py +@@ -189,7 +189,9 @@ class Retry: + RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503]) + + #: Default headers to be used for ``remove_headers_on_redirect`` +- DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"]) ++ DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset( ++ ["Cookie", "Authorization", "Proxy-Authorization"] ++ ) + + #: Default maximum backoff time. + DEFAULT_BACKOFF_MAX = 120 diff --git a/RHEL-146344-ibm-2-fix-bundled-urllib3-CVE-2025-66418.patch b/RHEL-146344-ibm-2-fix-bundled-urllib3-CVE-2025-66418.patch new file mode 100644 index 0000000..8592d81 --- /dev/null +++ b/RHEL-146344-ibm-2-fix-bundled-urllib3-CVE-2025-66418.patch @@ -0,0 +1,22 @@ +--- a/ibm/urllib3/response.py 2023-10-17 19:42:56.000000000 +0200 ++++ b/ibm/urllib3/response.py 2026-01-02 11:19:25.583808492 +0100 +@@ -135,8 +135,18 @@ + they were applied. + """ + ++ # Maximum allowed number of chained HTTP encodings in the ++ # Content-Encoding header. ++ max_decode_links = 5 ++ + def __init__(self, modes): +- self._decoders = [_get_decoder(m.strip()) for m in modes.split(",")] ++ encodings = [m.strip() for m in modes.split(",")] ++ if len(encodings) > self.max_decode_links: ++ raise DecodeError( ++ "Too many content encodings in the chain: " ++ f"{len(encodings)} > {self.max_decode_links}" ++ ) ++ self._decoders = [_get_decoder(e) for e in encodings] + + def flush(self): + return self._decoders[0].flush() diff --git a/RHEL-146344-ibm-3-fix-bundled-urllib3-CVE-2025-66471.patch b/RHEL-146344-ibm-3-fix-bundled-urllib3-CVE-2025-66471.patch new file mode 100644 index 0000000..761b186 --- /dev/null +++ b/RHEL-146344-ibm-3-fix-bundled-urllib3-CVE-2025-66471.patch @@ -0,0 +1,281 @@ +--- a/ibm/urllib3/response.py 2026-01-20 10:46:57.006470161 +0100 ++++ b/ibm/urllib3/response.py 2026-01-20 10:55:44.090084896 +0100 +@@ -23,6 +23,7 @@ + from .exceptions import ( + BodyNotHttplibCompatible, + DecodeError, ++ DependencyWarning, + HTTPError, + IncompleteRead, + InvalidChunkLength, +@@ -41,34 +42,60 @@ + class DeflateDecoder(object): + def __init__(self): + self._first_try = True +- self._data = b"" ++ self._first_try_data = b"" ++ self._unfed_data = b"" + self._obj = zlib.decompressobj() + + def __getattr__(self, name): + return getattr(self._obj, name) + +- def decompress(self, data): +- if not data: ++ def decompress(self, data: bytes, max_length: int = -1) -> bytes: ++ data = self._unfed_data + data ++ self._unfed_data = b"" ++ if not data and not self._obj.unconsumed_tail: + return data ++ original_max_length = max_length ++ if original_max_length < 0: ++ max_length = 0 ++ elif original_max_length == 0: ++ # We should not pass 0 to the zlib decompressor because 0 is ++ # the default value that will make zlib decompress without a ++ # length limit. ++ # Data should be stored for subsequent calls. ++ self._unfed_data = data ++ return b"" + ++ # Subsequent calls always reuse `self._obj`. zlib requires ++ # passing the unconsumed tail if decompression is to continue. + if not self._first_try: +- return self._obj.decompress(data) ++ return self._obj.decompress( ++ self._obj.unconsumed_tail + data, max_length=max_length ++ ) + +- self._data += data ++ # First call tries with RFC 1950 ZLIB format. ++ self._first_try_data += data + try: +- decompressed = self._obj.decompress(data) ++ decompressed = self._obj.decompress(data, max_length=max_length) + if decompressed: + self._first_try = False +- self._data = None ++ self._first_try_data = b"" + return decompressed ++ # On failure, it falls back to RFC 1951 DEFLATE format. + except zlib.error: + self._first_try = False + self._obj = zlib.decompressobj(-zlib.MAX_WBITS) + try: +- return self.decompress(self._data) ++ return self.decompress( ++ self._first_try_data, max_length=original_max_length ++ ) + finally: +- self._data = None ++ self._first_try_data = b"" + ++ @property ++ def has_unconsumed_tail(self) -> bool: ++ return bool(self._unfed_data) or ( ++ bool(self._obj.unconsumed_tail) and not self._first_try ++ ) + + class GzipDecoderState(object): + +@@ -81,30 +108,64 @@ + def __init__(self): + self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS) + self._state = GzipDecoderState.FIRST_MEMBER ++ self._unconsumed_tail = b"" + + def __getattr__(self, name): + return getattr(self._obj, name) + +- def decompress(self, data): ++ def decompress(self, data: bytes, max_length: int = -1) -> bytes: + ret = bytearray() +- if self._state == GzipDecoderState.SWALLOW_DATA or not data: ++ if self._state == GzipDecoderState.SWALLOW_DATA: ++ return bytes(ret) ++ ++ if max_length == 0: ++ # We should not pass 0 to the zlib decompressor because 0 is ++ # the default value that will make zlib decompress without a ++ # length limit. ++ # Data should be stored for subsequent calls. ++ self._unconsumed_tail += data ++ return b"" ++ ++ # zlib requires passing the unconsumed tail to the subsequent ++ # call if decompression is to continue. ++ data = self._unconsumed_tail + data ++ if not data and self._obj.eof: + return bytes(ret) ++ + while True: + try: +- ret += self._obj.decompress(data) ++ ret += self._obj.decompress( ++ data, max_length=max(max_length - len(ret), 0) ++ ) + except zlib.error: + previous_state = self._state + # Ignore data after the first error + self._state = GzipDecoderState.SWALLOW_DATA ++ self._unconsumed_tail = b"" + if previous_state == GzipDecoderState.OTHER_MEMBERS: + # Allow trailing garbage acceptable in other gzip clients + return bytes(ret) + raise +- data = self._obj.unused_data ++ ++ self._unconsumed_tail = data = ( ++ self._obj.unconsumed_tail or self._obj.unused_data ++ ) ++ if max_length > 0 and len(ret) >= max_length: ++ break ++ + if not data: + return bytes(ret) +- self._state = GzipDecoderState.OTHER_MEMBERS +- self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS) ++ # When the end of a gzip member is reached, a new decompressor ++ # must be created for unused (possibly future) data. ++ if self._obj.eof: ++ self._state = GzipDecoderState.OTHER_MEMBERS ++ self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS) ++ ++ return bytes(ret) ++ ++ @property ++ def has_unconsumed_tail(self) -> bool: ++ return bool(self._unconsumed_tail) + + + if brotli is not None: +@@ -116,9 +177,35 @@ + def __init__(self): + self._obj = brotli.Decompressor() + if hasattr(self._obj, "decompress"): +- self.decompress = self._obj.decompress ++ setattr(self, "_decompress", self._obj.decompress) + else: +- self.decompress = self._obj.process ++ setattr(self, "_decompress", self._obj.process) ++ ++ # Requires Brotli >= 1.2.0 for `output_buffer_limit`. ++ def _decompress(self, data: bytes, output_buffer_limit: int = -1) -> bytes: ++ raise NotImplementedError() ++ ++ def decompress(self, data: bytes, max_length: int = -1) -> bytes: ++ try: ++ if max_length > 0: ++ return self._decompress(data, output_buffer_limit=max_length) ++ else: ++ return self._decompress(data) ++ except TypeError: ++ # Fallback for Brotli/brotlicffi/brotlipy versions without ++ # the `output_buffer_limit` parameter. ++ warnings.warn( ++ "Brotli >= 1.2.0 is required to prevent decompression bombs.", ++ DependencyWarning, ++ ) ++ return self._decompress(data) ++ ++ @property ++ def has_unconsumed_tail(self) -> bool: ++ try: ++ return not self._obj.can_accept_more_data() ++ except AttributeError: ++ return False + + def flush(self): + if hasattr(self._obj, "flush"): +@@ -151,10 +238,35 @@ + def flush(self): + return self._decoders[0].flush() + +- def decompress(self, data): +- for d in reversed(self._decoders): +- data = d.decompress(data) +- return data ++ def decompress(self, data: bytes, max_length: int = -1) -> bytes: ++ if max_length <= 0: ++ for d in reversed(self._decoders): ++ data = d.decompress(data) ++ return data ++ ++ ret = bytearray() ++ # Every while loop iteration goes through all decoders once. ++ # It exits when enough data is read or no more data can be read. ++ # It is possible that the while loop iteration does not produce ++ # any data because we retrieve up to `max_length` from every ++ # decoder, and the amount of bytes may be insufficient for the ++ # next decoder to produce enough/any output. ++ while True: ++ any_data = False ++ for d in reversed(self._decoders): ++ data = d.decompress(data, max_length=max_length - len(ret)) ++ if data: ++ any_data = True ++ # We should not break when no data is returned because ++ # next decoders may produce data even with empty input. ++ ret += data ++ if not any_data or len(ret) >= max_length: ++ return bytes(ret) ++ data = b"" ++ ++ @property ++ def has_unconsumed_tail(self) -> bool: ++ return any(d.has_unconsumed_tail for d in self._decoders) + + + def _get_decoder(mode): +@@ -405,16 +517,25 @@ + if brotli is not None: + DECODER_ERROR_CLASSES += (brotli.error,) + +- def _decode(self, data, decode_content, flush_decoder): ++ def _decode( ++ self, ++ data: bytes, ++ decode_content: bool, ++ flush_decoder: bool, ++ max_length: int = None, ++ ) -> bytes: + """ + Decode the data passed in and potentially flush the decoder. + """ + if not decode_content: + return data + ++ if max_length is None or flush_decoder: ++ max_length = -1 ++ + try: + if self._decoder: +- data = self._decoder.decompress(data) ++ data = self._decoder.decompress(data, max_length=max_length) + except self.DECODER_ERROR_CLASSES as e: + content_encoding = self.headers.get("content-encoding", "").lower() + raise DecodeError( +@@ -634,7 +755,10 @@ + for line in self.read_chunked(amt, decode_content=decode_content): + yield line + else: +- while not is_fp_closed(self._fp): ++ while ( ++ not is_fp_closed(self._fp) ++ or (self._decoder and self._decoder.has_unconsumed_tail) ++ ): + data = self.read(amt=amt, decode_content=decode_content) + + if data: +@@ -840,7 +964,10 @@ + break + chunk = self._handle_chunk(amt) + decoded = self._decode( +- chunk, decode_content=decode_content, flush_decoder=False ++ chunk, ++ decode_content=decode_content, ++ flush_decoder=False, ++ max_length=amt, + ) + if decoded: + yield decoded diff --git a/RHEL-146344-ibm-4-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch b/RHEL-146344-ibm-4-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch new file mode 100644 index 0000000..99ee1ca --- /dev/null +++ b/RHEL-146344-ibm-4-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch @@ -0,0 +1,31 @@ +--- a/ibm/urllib3/response.py 2026-02-03 08:20:11.000000000 +0100 ++++ b/ibm/urllib3/response.py 2026-02-03 09:11:38.017998476 +0100 +@@ -350,6 +350,7 @@ + self.reason = reason + self.strict = strict + self.decode_content = decode_content ++ self._has_decoded_content = False + self.retries = retries + self.enforce_content_length = enforce_content_length + self.auto_close = auto_close +@@ -414,7 +415,11 @@ + Unread data in the HTTPResponse connection blocks the connection from being released back to the pool. + """ + try: +- self.read() ++ self.read( ++ # Do not spend resources decoding the content unless ++ # decoding has already been initiated. ++ decode_content=self._has_decoded_content, ++ ) + except (HTTPError, SocketError, BaseSSLError, HTTPException): + pass + +@@ -536,6 +541,7 @@ + try: + if self._decoder: + data = self._decoder.decompress(data, max_length=max_length) ++ self._has_decoded_content = True + except self.DECODER_ERROR_CLASSES as e: + content_encoding = self.headers.get("content-encoding", "").lower() + raise DecodeError( diff --git a/RHEL-146344-fix-bundled-urllib3-CVE-2024-37891.patch b/RHEL-146344-kubevirt-1-fix-bundled-urllib3-CVE-2024-37891.patch similarity index 67% rename from RHEL-146344-fix-bundled-urllib3-CVE-2024-37891.patch rename to RHEL-146344-kubevirt-1-fix-bundled-urllib3-CVE-2024-37891.patch index 9d89145..f5abf83 100644 --- a/RHEL-146344-fix-bundled-urllib3-CVE-2024-37891.patch +++ b/RHEL-146344-kubevirt-1-fix-bundled-urllib3-CVE-2024-37891.patch @@ -15,22 +15,6 @@ Subject: [PATCH] Merge pull request from GHSA-34jh-p97f-mpxf test/with_dummyserver/test_poolmanager.py | 27 ++++++++++++++++++++--- 4 files changed, 37 insertions(+), 5 deletions(-) -diff --git a/ibm/urllib3/util/retry.py b/ibm/urllib3/util/retry.py -index 7a76a4a6ad..0456cceba4 100644 ---- a/ibm/urllib3/util/retry.py -+++ b/ibm/urllib3/util/retry.py -@@ -189,7 +189,9 @@ class Retry: - RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503]) - - #: Default headers to be used for ``remove_headers_on_redirect`` -- DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"]) -+ DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset( -+ ["Cookie", "Authorization", "Proxy-Authorization"] -+ ) - - #: Default maximum backoff time. - DEFAULT_BACKOFF_MAX = 120 - diff --git a/kubevirt/urllib3/util/retry.py b/kubevirt/urllib3/util/retry.py index 7a76a4a6ad..0456cceba4 100644 --- a/kubevirt/urllib3/util/retry.py diff --git a/RHEL-146344-fix-bundled-urllib3-CVE-2025-66418.patch b/RHEL-146344-kubevirt-2-fix-bundled-urllib3-CVE-2025-66418.patch similarity index 50% rename from RHEL-146344-fix-bundled-urllib3-CVE-2025-66418.patch rename to RHEL-146344-kubevirt-2-fix-bundled-urllib3-CVE-2025-66418.patch index 818397c..49a9c40 100644 --- a/RHEL-146344-fix-bundled-urllib3-CVE-2025-66418.patch +++ b/RHEL-146344-kubevirt-2-fix-bundled-urllib3-CVE-2025-66418.patch @@ -1,26 +1,3 @@ ---- a/ibm/urllib3/response.py 2023-10-17 19:42:56.000000000 +0200 -+++ b/ibm/urllib3/response.py 2026-01-02 11:19:25.583808492 +0100 -@@ -135,8 +135,18 @@ - they were applied. - """ - -+ # Maximum allowed number of chained HTTP encodings in the -+ # Content-Encoding header. -+ max_decode_links = 5 -+ - def __init__(self, modes): -- self._decoders = [_get_decoder(m.strip()) for m in modes.split(",")] -+ encodings = [m.strip() for m in modes.split(",")] -+ if len(encodings) > self.max_decode_links: -+ raise DecodeError( -+ "Too many content encodings in the chain: " -+ f"{len(encodings)} > {self.max_decode_links}" -+ ) -+ self._decoders = [_get_decoder(e) for e in encodings] - - def flush(self): - return self._decoders[0].flush() - --- a/kubevirt/urllib3/response.py 2023-10-17 19:42:56.000000000 +0200 +++ b/kubevirt/urllib3/response.py 2026-01-02 11:19:25.583808492 +0100 @@ -135,8 +135,18 @@ diff --git a/RHEL-146344-fix-bundled-urllib3-CVE-2025-66471.patch b/RHEL-146344-kubevirt-3-fix-bundled-urllib3-CVE-2025-66471.patch similarity index 50% rename from RHEL-146344-fix-bundled-urllib3-CVE-2025-66471.patch rename to RHEL-146344-kubevirt-3-fix-bundled-urllib3-CVE-2025-66471.patch index fcecae0..b2aa99c 100644 --- a/RHEL-146344-fix-bundled-urllib3-CVE-2025-66471.patch +++ b/RHEL-146344-kubevirt-3-fix-bundled-urllib3-CVE-2025-66471.patch @@ -1,285 +1,3 @@ ---- a/ibm/urllib3/response.py 2026-01-20 10:46:57.006470161 +0100 -+++ b/ibm/urllib3/response.py 2026-01-20 10:55:44.090084896 +0100 -@@ -23,6 +23,7 @@ - from .exceptions import ( - BodyNotHttplibCompatible, - DecodeError, -+ DependencyWarning, - HTTPError, - IncompleteRead, - InvalidChunkLength, -@@ -41,34 +42,60 @@ - class DeflateDecoder(object): - def __init__(self): - self._first_try = True -- self._data = b"" -+ self._first_try_data = b"" -+ self._unfed_data = b"" - self._obj = zlib.decompressobj() - - def __getattr__(self, name): - return getattr(self._obj, name) - -- def decompress(self, data): -- if not data: -+ def decompress(self, data: bytes, max_length: int = -1) -> bytes: -+ data = self._unfed_data + data -+ self._unfed_data = b"" -+ if not data and not self._obj.unconsumed_tail: - return data -+ original_max_length = max_length -+ if original_max_length < 0: -+ max_length = 0 -+ elif original_max_length == 0: -+ # We should not pass 0 to the zlib decompressor because 0 is -+ # the default value that will make zlib decompress without a -+ # length limit. -+ # Data should be stored for subsequent calls. -+ self._unfed_data = data -+ return b"" - -+ # Subsequent calls always reuse `self._obj`. zlib requires -+ # passing the unconsumed tail if decompression is to continue. - if not self._first_try: -- return self._obj.decompress(data) -+ return self._obj.decompress( -+ self._obj.unconsumed_tail + data, max_length=max_length -+ ) - -- self._data += data -+ # First call tries with RFC 1950 ZLIB format. -+ self._first_try_data += data - try: -- decompressed = self._obj.decompress(data) -+ decompressed = self._obj.decompress(data, max_length=max_length) - if decompressed: - self._first_try = False -- self._data = None -+ self._first_try_data = b"" - return decompressed -+ # On failure, it falls back to RFC 1951 DEFLATE format. - except zlib.error: - self._first_try = False - self._obj = zlib.decompressobj(-zlib.MAX_WBITS) - try: -- return self.decompress(self._data) -+ return self.decompress( -+ self._first_try_data, max_length=original_max_length -+ ) - finally: -- self._data = None -+ self._first_try_data = b"" - -+ @property -+ def has_unconsumed_tail(self) -> bool: -+ return bool(self._unfed_data) or ( -+ bool(self._obj.unconsumed_tail) and not self._first_try -+ ) - - class GzipDecoderState(object): - -@@ -81,30 +108,64 @@ - def __init__(self): - self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS) - self._state = GzipDecoderState.FIRST_MEMBER -+ self._unconsumed_tail = b"" - - def __getattr__(self, name): - return getattr(self._obj, name) - -- def decompress(self, data): -+ def decompress(self, data: bytes, max_length: int = -1) -> bytes: - ret = bytearray() -- if self._state == GzipDecoderState.SWALLOW_DATA or not data: -+ if self._state == GzipDecoderState.SWALLOW_DATA: -+ return bytes(ret) -+ -+ if max_length == 0: -+ # We should not pass 0 to the zlib decompressor because 0 is -+ # the default value that will make zlib decompress without a -+ # length limit. -+ # Data should be stored for subsequent calls. -+ self._unconsumed_tail += data -+ return b"" -+ -+ # zlib requires passing the unconsumed tail to the subsequent -+ # call if decompression is to continue. -+ data = self._unconsumed_tail + data -+ if not data and self._obj.eof: - return bytes(ret) -+ - while True: - try: -- ret += self._obj.decompress(data) -+ ret += self._obj.decompress( -+ data, max_length=max(max_length - len(ret), 0) -+ ) - except zlib.error: - previous_state = self._state - # Ignore data after the first error - self._state = GzipDecoderState.SWALLOW_DATA -+ self._unconsumed_tail = b"" - if previous_state == GzipDecoderState.OTHER_MEMBERS: - # Allow trailing garbage acceptable in other gzip clients - return bytes(ret) - raise -- data = self._obj.unused_data -+ -+ self._unconsumed_tail = data = ( -+ self._obj.unconsumed_tail or self._obj.unused_data -+ ) -+ if max_length > 0 and len(ret) >= max_length: -+ break -+ - if not data: - return bytes(ret) -- self._state = GzipDecoderState.OTHER_MEMBERS -- self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS) -+ # When the end of a gzip member is reached, a new decompressor -+ # must be created for unused (possibly future) data. -+ if self._obj.eof: -+ self._state = GzipDecoderState.OTHER_MEMBERS -+ self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS) -+ -+ return bytes(ret) -+ -+ @property -+ def has_unconsumed_tail(self) -> bool: -+ return bool(self._unconsumed_tail) - - - if brotli is not None: -@@ -116,9 +177,35 @@ - def __init__(self): - self._obj = brotli.Decompressor() - if hasattr(self._obj, "decompress"): -- self.decompress = self._obj.decompress -+ setattr(self, "_decompress", self._obj.decompress) - else: -- self.decompress = self._obj.process -+ setattr(self, "_decompress", self._obj.process) -+ -+ # Requires Brotli >= 1.2.0 for `output_buffer_limit`. -+ def _decompress(self, data: bytes, output_buffer_limit: int = -1) -> bytes: -+ raise NotImplementedError() -+ -+ def decompress(self, data: bytes, max_length: int = -1) -> bytes: -+ try: -+ if max_length > 0: -+ return self._decompress(data, output_buffer_limit=max_length) -+ else: -+ return self._decompress(data) -+ except TypeError: -+ # Fallback for Brotli/brotlicffi/brotlipy versions without -+ # the `output_buffer_limit` parameter. -+ warnings.warn( -+ "Brotli >= 1.2.0 is required to prevent decompression bombs.", -+ DependencyWarning, -+ ) -+ return self._decompress(data) -+ -+ @property -+ def has_unconsumed_tail(self) -> bool: -+ try: -+ return not self._obj.can_accept_more_data() -+ except AttributeError: -+ return False - - def flush(self): - if hasattr(self._obj, "flush"): -@@ -151,10 +238,35 @@ - def flush(self): - return self._decoders[0].flush() - -- def decompress(self, data): -- for d in reversed(self._decoders): -- data = d.decompress(data) -- return data -+ def decompress(self, data: bytes, max_length: int = -1) -> bytes: -+ if max_length <= 0: -+ for d in reversed(self._decoders): -+ data = d.decompress(data) -+ return data -+ -+ ret = bytearray() -+ # Every while loop iteration goes through all decoders once. -+ # It exits when enough data is read or no more data can be read. -+ # It is possible that the while loop iteration does not produce -+ # any data because we retrieve up to `max_length` from every -+ # decoder, and the amount of bytes may be insufficient for the -+ # next decoder to produce enough/any output. -+ while True: -+ any_data = False -+ for d in reversed(self._decoders): -+ data = d.decompress(data, max_length=max_length - len(ret)) -+ if data: -+ any_data = True -+ # We should not break when no data is returned because -+ # next decoders may produce data even with empty input. -+ ret += data -+ if not any_data or len(ret) >= max_length: -+ return bytes(ret) -+ data = b"" -+ -+ @property -+ def has_unconsumed_tail(self) -> bool: -+ return any(d.has_unconsumed_tail for d in self._decoders) - - - def _get_decoder(mode): -@@ -405,16 +517,25 @@ - if brotli is not None: - DECODER_ERROR_CLASSES += (brotli.error,) - -- def _decode(self, data, decode_content, flush_decoder): -+ def _decode( -+ self, -+ data: bytes, -+ decode_content: bool, -+ flush_decoder: bool, -+ max_length: int = None, -+ ) -> bytes: - """ - Decode the data passed in and potentially flush the decoder. - """ - if not decode_content: - return data - -+ if max_length is None or flush_decoder: -+ max_length = -1 -+ - try: - if self._decoder: -- data = self._decoder.decompress(data) -+ data = self._decoder.decompress(data, max_length=max_length) - except self.DECODER_ERROR_CLASSES as e: - content_encoding = self.headers.get("content-encoding", "").lower() - raise DecodeError( -@@ -634,7 +755,10 @@ - for line in self.read_chunked(amt, decode_content=decode_content): - yield line - else: -- while not is_fp_closed(self._fp): -+ while ( -+ not is_fp_closed(self._fp) -+ or (self._decoder and self._decoder.has_unconsumed_tail) -+ ): - data = self.read(amt=amt, decode_content=decode_content) - - if data: -@@ -840,7 +964,10 @@ - break - chunk = self._handle_chunk(amt) - decoded = self._decode( -- chunk, decode_content=decode_content, flush_decoder=False -+ chunk, -+ decode_content=decode_content, -+ flush_decoder=False, -+ max_length=amt, - ) - if decoded: - yield decoded - --- a/kubevirt/urllib3/response.py 2026-01-20 10:46:57.006470161 +0100 +++ b/kubevirt/urllib3/response.py 2026-01-20 10:55:44.090084896 +0100 @@ -23,6 +23,7 @@ diff --git a/RHEL-146344-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch b/RHEL-146344-kubevirt-4-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch similarity index 50% rename from RHEL-146344-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch rename to RHEL-146344-kubevirt-4-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch index 90ec1c7..5e42f36 100644 --- a/RHEL-146344-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch +++ b/RHEL-146344-kubevirt-4-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch @@ -1,35 +1,3 @@ ---- a/ibm/urllib3/response.py 2026-02-03 08:20:11.000000000 +0100 -+++ b/ibm/urllib3/response.py 2026-02-03 09:11:38.017998476 +0100 -@@ -350,6 +350,7 @@ - self.reason = reason - self.strict = strict - self.decode_content = decode_content -+ self._has_decoded_content = False - self.retries = retries - self.enforce_content_length = enforce_content_length - self.auto_close = auto_close -@@ -414,7 +415,11 @@ - Unread data in the HTTPResponse connection blocks the connection from being released back to the pool. - """ - try: -- self.read() -+ self.read( -+ # Do not spend resources decoding the content unless -+ # decoding has already been initiated. -+ decode_content=self._has_decoded_content, -+ ) - except (HTTPError, SocketError, BaseSSLError, HTTPException): - pass - -@@ -536,6 +541,7 @@ - try: - if self._decoder: - data = self._decoder.decompress(data, max_length=max_length) -+ self._has_decoded_content = True - except self.DECODER_ERROR_CLASSES as e: - content_encoding = self.headers.get("content-encoding", "").lower() - raise DecodeError( - --- a/kubevirt/urllib3/response.py 2026-02-03 08:20:11.000000000 +0100 +++ b/kubevirt/urllib3/response.py 2026-02-03 09:11:38.017998476 +0100 @@ -350,6 +350,7 @@ diff --git a/RHEL-146344-kubevirt-5-fix-bundled-pyasn1-CVE-2026-23490.patch b/RHEL-146344-kubevirt-5-fix-bundled-pyasn1-CVE-2026-23490.patch new file mode 100644 index 0000000..e7ba33d --- /dev/null +++ b/RHEL-146344-kubevirt-5-fix-bundled-pyasn1-CVE-2026-23490.patch @@ -0,0 +1,28 @@ +--- a/kubevirt/pyasn1/codec/ber/decoder.py 2019-10-17 07:00:19.000000000 +0200 ++++ b/kubevirt/pyasn1/codec/ber/decoder.py 2026-01-27 10:43:12.757563432 +0100 +@@ -22,6 +22,10 @@ + + noValue = base.noValue + ++# Maximum number of continuation octets (high-bit set) allowed per OID arc. ++# 20 octets allows up to 140-bit integers, supporting UUID-based OIDs ++MAX_OID_ARC_CONTINUATION_OCTETS = 20 ++ + + class AbstractDecoder(object): + protoComponent = None +@@ -342,7 +346,14 @@ + # Construct subid from a number of octets + nextSubId = subId + subId = 0 ++ continuationOctetCount = 0 + while nextSubId >= 128: ++ continuationOctetCount += 1 ++ if continuationOctetCount > MAX_OID_ARC_CONTINUATION_OCTETS: ++ raise error.PyAsn1Error( ++ 'OID arc exceeds maximum continuation octets limit (%d) ' ++ 'at position %d' % (MAX_OID_ARC_CONTINUATION_OCTETS, index) ++ ) + subId = (subId << 7) + (nextSubId & 0x7F) + if index >= substrateLen: + raise error.SubstrateUnderrunError( diff --git a/RHEL-43562-fix-bundled-urllib3-CVE-2024-37891.patch b/RHEL-43562-fix-bundled-urllib3-CVE-2024-37891.patch index 88258d4..84eec46 100644 --- a/RHEL-43562-fix-bundled-urllib3-CVE-2024-37891.patch +++ b/RHEL-43562-fix-bundled-urllib3-CVE-2024-37891.patch @@ -62,19 +62,3 @@ index 7a76a4a6ad..0456cceba4 100644 #: Default maximum backoff time. DEFAULT_BACKOFF_MAX = 120 - -diff --git a/kubevirt/urllib3/util/retry.py b/kubevirt/urllib3/util/retry.py -index 7a76a4a6ad..0456cceba4 100644 ---- a/kubevirt/urllib3/util/retry.py -+++ b/kubevirt/urllib3/util/retry.py -@@ -189,7 +189,9 @@ class Retry: - RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503]) - - #: Default headers to be used for ``remove_headers_on_redirect`` -- DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"]) -+ DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset( -+ ["Cookie", "Authorization", "Proxy-Authorization"] -+ ) - - #: Default maximum backoff time. - DEFAULT_BACKOFF_MAX = 120 diff --git a/fence-agents.spec b/fence-agents.spec index b068608..e455ec6 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -57,7 +57,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.10.0 -Release: 109%{?alphatag:.%{alphatag}}%{?dist} +Release: 110%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/fence-agents Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz @@ -262,6 +262,11 @@ Patch76: RHEL-145088-fence_ibm_vpc-fix-missing-statuses.patch ### HA support libs/utils ### # all archs Patch1000: bz2217902-1-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch +Patch1001: RHEL-146344-kubevirt-1-fix-bundled-urllib3-CVE-2024-37891.patch +Patch1002: RHEL-146344-kubevirt-2-fix-bundled-urllib3-CVE-2025-66418.patch +Patch1003: RHEL-146344-kubevirt-3-fix-bundled-urllib3-CVE-2025-66471.patch +Patch1004: RHEL-146344-kubevirt-4-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch +Patch1005: RHEL-146344-kubevirt-5-fix-bundled-pyasn1-CVE-2026-23490.patch # cloud (x86_64 only) Patch2000: bz2217902-2-aws-azure-fix-bundled-dateutil-CVE-2007-4559.patch Patch2001: RHEL-43562-fix-bundled-urllib3-CVE-2024-37891.patch @@ -271,10 +276,10 @@ Patch2004: RHEL-139799-fix-bundled-urllib3-CVE-2025-66471.patch Patch2005: RHEL-140796-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch Patch2006: RHEL-142460-fix-bundled-pyasn1-CVE-2026-23490.patch # cloud (ppc64le only) -Patch3000: RHEL-146344-fix-bundled-urllib3-CVE-2024-37891.patch -Patch3001: RHEL-146344-fix-bundled-urllib3-CVE-2025-66418.patch -Patch3002: RHEL-146344-fix-bundled-urllib3-CVE-2025-66471.patch -Patch3003: RHEL-146344-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch +Patch3000: RHEL-146344-ibm-1-fix-bundled-urllib3-CVE-2024-37891.patch +Patch3001: RHEL-146344-ibm-2-fix-bundled-urllib3-CVE-2025-66418.patch +Patch3002: RHEL-146344-ibm-3-fix-bundled-urllib3-CVE-2025-66471.patch +Patch3003: RHEL-146344-ibm-4-RHEL-146282-fix-bundled-urllib3-CVE-2026-21441.patch %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ibm_powervs ibm_vpc ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump kubevirt lpar mpath nutanix_ahv redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti %ifarch x86_64 @@ -520,6 +525,11 @@ rm -rf kubevirt/rsa* # regular patch doesnt work in build-section pushd support /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=2 < %{PATCH1000} +/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=2 < %{PATCH1001} +/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH1002} +/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH1003} +/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH1004} +/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH1005} %ifarch x86_64 /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=2 < %{PATCH2000} @@ -1595,9 +1605,9 @@ are located on corosync cluster nodes. %endif %changelog -* Mon Feb 9 2026 Oyvind Albrigtsen - 4.10.0-109 +* Tue Feb 10 2026 Oyvind Albrigtsen - 4.10.0-110 - bundled urllib3: fix CVE-2024-37891, CVE-2025-66418, CVE-2025-66471, - and CVE-2026-21441 on ppc64le + CVE-2026-21441, and pyasn1 CVE-2026-23490 on all archs Resolves: RHEL-146344 * Thu Feb 5 2026 Oyvind Albrigtsen - 4.10.0-108