From d453cf523ab821a793b3611b3673ad519f154776 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 8 Nov 2023 17:15:54 +0300 Subject: [PATCH] import squid-5.5-6.el9_3.1 --- SOURCES/squid-5.5-CVE-2023-46846.patch | 178 +++++++++++++++++++++++++ SOURCES/squid-5.5-CVE-2023-46847.patch | 43 ++++++ SOURCES/squid-5.5-CVE-2023-46848.patch | 46 +++++++ SPECS/squid.spec | 18 ++- 4 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 SOURCES/squid-5.5-CVE-2023-46846.patch create mode 100644 SOURCES/squid-5.5-CVE-2023-46847.patch create mode 100644 SOURCES/squid-5.5-CVE-2023-46848.patch diff --git a/SOURCES/squid-5.5-CVE-2023-46846.patch b/SOURCES/squid-5.5-CVE-2023-46846.patch new file mode 100644 index 0000000..cea8e2f --- /dev/null +++ b/SOURCES/squid-5.5-CVE-2023-46846.patch @@ -0,0 +1,178 @@ +From 05f6af2f4c85cc99323cfff6149c3d74af661b6d Mon Sep 17 00:00:00 2001 +From: Amos Jeffries +Date: Fri, 13 Oct 2023 08:44:16 +0000 +Subject: [PATCH] RFC 9112: Improve HTTP chunked encoding compliance (#1498) + +--- + src/http/one/Parser.cc | 8 +------- + src/http/one/Parser.h | 4 +--- + src/http/one/TeChunkedParser.cc | 23 ++++++++++++++++++----- + src/parser/Tokenizer.cc | 12 ++++++++++++ + src/parser/Tokenizer.h | 7 +++++++ + 5 files changed, 39 insertions(+), 15 deletions(-) + +diff --git a/src/http/one/Parser.cc b/src/http/one/Parser.cc +index c78ddd7f0..291ae39f0 100644 +--- a/src/http/one/Parser.cc ++++ b/src/http/one/Parser.cc +@@ -65,16 +65,10 @@ Http::One::Parser::DelimiterCharacters() + void + Http::One::Parser::skipLineTerminator(Tokenizer &tok) const + { +- if (tok.skip(Http1::CrLf())) +- return; +- + if (Config.onoff.relaxed_header_parser && tok.skipOne(CharacterSet::LF)) + return; + +- if (tok.atEnd() || (tok.remaining().length() == 1 && tok.remaining().at(0) == '\r')) +- throw InsufficientInput(); +- +- throw TexcHere("garbage instead of CRLF line terminator"); ++ tok.skipRequired("line-terminating CRLF", Http1::CrLf()); + } + + /// all characters except the LF line terminator +diff --git a/src/http/one/Parser.h b/src/http/one/Parser.h +index f83c01a9a..aab895583 100644 +--- a/src/http/one/Parser.h ++++ b/src/http/one/Parser.h +@@ -124,9 +124,7 @@ protected: + * detect and skip the CRLF or (if tolerant) LF line terminator + * consume from the tokenizer. + * +- * \throws exception on bad or InsuffientInput. +- * \retval true only if line terminator found. +- * \retval false incomplete or missing line terminator, need more data. ++ * \throws exception on bad or InsufficientInput + */ + void skipLineTerminator(Tokenizer &) const; + +diff --git a/src/http/one/TeChunkedParser.cc b/src/http/one/TeChunkedParser.cc +index 1434100b6..8bdb65abb 100644 +--- a/src/http/one/TeChunkedParser.cc ++++ b/src/http/one/TeChunkedParser.cc +@@ -91,6 +91,11 @@ Http::One::TeChunkedParser::parseChunkSize(Tokenizer &tok) + { + Must(theChunkSize <= 0); // Should(), really + ++ static const SBuf bannedHexPrefixLower("0x"); ++ static const SBuf bannedHexPrefixUpper("0X"); ++ if (tok.skip(bannedHexPrefixLower) || tok.skip(bannedHexPrefixUpper)) ++ throw TextException("chunk starts with 0x", Here()); ++ + int64_t size = -1; + if (tok.int64(size, 16, false) && !tok.atEnd()) { + if (size < 0) +@@ -121,7 +126,7 @@ Http::One::TeChunkedParser::parseChunkMetadataSuffix(Tokenizer &tok) + // bad or insufficient input, like in the code below. TODO: Expand up. + try { + parseChunkExtensions(tok); // a possibly empty chunk-ext list +- skipLineTerminator(tok); ++ tok.skipRequired("CRLF after [chunk-ext]", Http1::CrLf()); + buf_ = tok.remaining(); + parsingStage_ = theChunkSize ? Http1::HTTP_PARSE_CHUNK : Http1::HTTP_PARSE_MIME; + return true; +@@ -132,12 +137,14 @@ Http::One::TeChunkedParser::parseChunkMetadataSuffix(Tokenizer &tok) + // other exceptions bubble up to kill message parsing + } + +-/// Parses the chunk-ext list (RFC 7230 section 4.1.1 and its Errata #4667): ++/// Parses the chunk-ext list (RFC 9112 section 7.1.1: + /// chunk-ext = *( BWS ";" BWS chunk-ext-name [ BWS "=" BWS chunk-ext-val ] ) + void +-Http::One::TeChunkedParser::parseChunkExtensions(Tokenizer &tok) ++Http::One::TeChunkedParser::parseChunkExtensions(Tokenizer &callerTok) + { + do { ++ auto tok = callerTok; ++ + ParseBws(tok); // Bug 4492: IBM_HTTP_Server sends SP after chunk-size + + if (!tok.skip(';')) +@@ -145,6 +152,7 @@ Http::One::TeChunkedParser::parseChunkExtensions(Tokenizer &tok) + + parseOneChunkExtension(tok); + buf_ = tok.remaining(); // got one extension ++ callerTok = tok; + } while (true); + } + +@@ -158,11 +166,14 @@ Http::One::ChunkExtensionValueParser::Ignore(Tokenizer &tok, const SBuf &extName + /// Parses a single chunk-ext list element: + /// chunk-ext = *( BWS ";" BWS chunk-ext-name [ BWS "=" BWS chunk-ext-val ] ) + void +-Http::One::TeChunkedParser::parseOneChunkExtension(Tokenizer &tok) ++Http::One::TeChunkedParser::parseOneChunkExtension(Tokenizer &callerTok) + { ++ auto tok = callerTok; ++ + ParseBws(tok); // Bug 4492: ICAP servers send SP before chunk-ext-name + + const auto extName = tok.prefix("chunk-ext-name", CharacterSet::TCHAR); ++ callerTok = tok; // in case we determine that this is a valueless chunk-ext + + ParseBws(tok); + +@@ -176,6 +187,8 @@ Http::One::TeChunkedParser::parseOneChunkExtension(Tokenizer &tok) + customExtensionValueParser->parse(tok, extName); + else + ChunkExtensionValueParser::Ignore(tok, extName); ++ ++ callerTok = tok; + } + + bool +@@ -209,7 +222,7 @@ Http::One::TeChunkedParser::parseChunkEnd(Tokenizer &tok) + Must(theLeftBodySize == 0); // Should(), really + + try { +- skipLineTerminator(tok); ++ tok.skipRequired("chunk CRLF", Http1::CrLf()); + buf_ = tok.remaining(); // parse checkpoint + theChunkSize = 0; // done with the current chunk + parsingStage_ = Http1::HTTP_PARSE_CHUNK_SZ; +diff --git a/src/parser/Tokenizer.cc b/src/parser/Tokenizer.cc +index edaffd8d3..15df793b8 100644 +--- a/src/parser/Tokenizer.cc ++++ b/src/parser/Tokenizer.cc +@@ -147,6 +147,18 @@ Parser::Tokenizer::skipAll(const CharacterSet &tokenChars) + return success(prefixLen); + } + ++void ++Parser::Tokenizer::skipRequired(const char *description, const SBuf &tokenToSkip) ++{ ++ if (skip(tokenToSkip) || tokenToSkip.isEmpty()) ++ return; ++ ++ if (tokenToSkip.startsWith(buf_)) ++ throw InsufficientInput(); ++ ++ throw TextException(ToSBuf("cannot skip ", description), Here()); ++} ++ + bool + Parser::Tokenizer::skipOne(const CharacterSet &chars) + { +diff --git a/src/parser/Tokenizer.h b/src/parser/Tokenizer.h +index 7bae1ccbb..3cfa7dd6c 100644 +--- a/src/parser/Tokenizer.h ++++ b/src/parser/Tokenizer.h +@@ -115,6 +115,13 @@ public: + */ + SBuf::size_type skipAll(const CharacterSet &discardables); + ++ /** skips a given character sequence (string); ++ * does nothing if the sequence is empty ++ * ++ * \throws exception on mismatching prefix or InsufficientInput ++ */ ++ void skipRequired(const char *description, const SBuf &tokenToSkip); ++ + /** Removes a single trailing character from the set. + * + * \return whether a character was removed +-- +2.25.1 + diff --git a/SOURCES/squid-5.5-CVE-2023-46847.patch b/SOURCES/squid-5.5-CVE-2023-46847.patch new file mode 100644 index 0000000..29d9b0d --- /dev/null +++ b/SOURCES/squid-5.5-CVE-2023-46847.patch @@ -0,0 +1,43 @@ +From 052cf082b0faaef4eaaa4e94119d7a1437aac4a3 Mon Sep 17 00:00:00 2001 +From: squidadm +Date: Wed, 18 Oct 2023 04:50:56 +1300 +Subject: [PATCH] Fix stack buffer overflow when parsing Digest Authorization + (#1517) + +The bug was discovered and detailed by Joshua Rogers at +https://megamansec.github.io/Squid-Security-Audit/digest-overflow.html +where it was filed as "Stack Buffer Overflow in Digest Authentication". + +--------- + +Co-authored-by: Alex Bason +Co-authored-by: Amos Jeffries +--- + src/auth/digest/Config.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/auth/digest/Config.cc b/src/auth/digest/Config.cc +index d42831a55..be9f3c433 100644 +--- a/src/auth/digest/Config.cc ++++ b/src/auth/digest/Config.cc +@@ -844,11 +844,15 @@ Auth::Digest::Config::decode(char const *proxy_auth, const HttpRequest *request, + break; + + case DIGEST_NC: +- if (value.size() != 8) { ++ if (value.size() == 8) { ++ // for historical reasons, the nc value MUST be exactly 8 bytes ++ static_assert(sizeof(digest_request->nc) == 8 + 1, "bad nc buffer size"); ++ xstrncpy(digest_request->nc, value.rawBuf(), value.size() + 1); ++ debugs(29, 9, "Found noncecount '" << digest_request->nc << "'"); ++ } else { + debugs(29, 9, "Invalid nc '" << value << "' in '" << temp << "'"); ++ digest_request->nc[0] = 0; + } +- xstrncpy(digest_request->nc, value.rawBuf(), value.size() + 1); +- debugs(29, 9, "Found noncecount '" << digest_request->nc << "'"); + break; + + case DIGEST_CNONCE: +-- +2.25.1 diff --git a/SOURCES/squid-5.5-CVE-2023-46848.patch b/SOURCES/squid-5.5-CVE-2023-46848.patch new file mode 100644 index 0000000..9a66f37 --- /dev/null +++ b/SOURCES/squid-5.5-CVE-2023-46848.patch @@ -0,0 +1,46 @@ +From c67bf049871a49e9871efe50b230a7f37b7039f6 Mon Sep 17 00:00:00 2001 +From: Alex Rousskov +Date: Thu, 25 May 2023 02:10:28 +0000 +Subject: [PATCH] Fix userinfo percent-encoding (#1367) + +%X expects an unsigned int, and that is what we were giving it. However, +to get to the correct unsigned int value from a (signed) char, one has +to cast to an unsigned char (or equivalent) first. + +Broken since inception in commit 7b75100. + +Also adjusted similar (commented out) ext_edirectory_userip_acl code. +--- + src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc | 2 +- + src/anyp/Uri.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc +index dbc20ae54..9028d1562 100644 +--- a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc ++++ b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc +@@ -1612,7 +1612,7 @@ MainSafe(int argc, char **argv) + /* BINARY DEBUGGING * + local_printfx("while() -> bufa[%" PRIuSIZE "]: %s", k, bufa); + for (i = 0; i < k; ++i) +- local_printfx("%02X", bufa[i]); ++ local_printfx("%02X", static_cast(static_cast(bufa[i]))); + local_printfx("\n"); + * BINARY DEBUGGING */ + /* Check for CRLF */ +diff --git a/src/anyp/Uri.cc b/src/anyp/Uri.cc +index a6a5d5d9e..3d19188e9 100644 +--- a/src/anyp/Uri.cc ++++ b/src/anyp/Uri.cc +@@ -70,7 +70,7 @@ AnyP::Uri::Encode(const SBuf &buf, const CharacterSet &ignore) + while (!tk.atEnd()) { + // TODO: Add Tokenizer::parseOne(void). + const auto ch = tk.remaining()[0]; +- output.appendf("%%%02X", static_cast(ch)); // TODO: Optimize using a table ++ output.appendf("%%%02X", static_cast(static_cast(ch))); // TODO: Optimize using a table + (void)tk.skip(ch); + + if (tk.prefix(goodSection, ignore)) +-- +2.25.1 + diff --git a/SPECS/squid.spec b/SPECS/squid.spec index 752248f..e160ec0 100644 --- a/SPECS/squid.spec +++ b/SPECS/squid.spec @@ -2,7 +2,7 @@ Name: squid Version: 5.5 -Release: 6%{?dist} +Release: 6%{?dist}.1 Summary: The Squid proxy caching server Epoch: 7 # See CREDITS for breakdown of non GPLv2+ code @@ -52,6 +52,12 @@ Patch209: squid-5.5-halfclosed.patch Patch501: squid-5.5-CVE-2021-46784.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2129771 Patch502: squid-5.5-CVE-2022-41318.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2245910 +Patch503: squid-5.5-CVE-2023-46846.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2245916 +Patch504: squid-5.5-CVE-2023-46847.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2245919 +Patch505: squid-5.5-CVE-2023-46848.patch # cache_swap.sh Requires: bash gawk @@ -129,6 +135,9 @@ lookup program (dnsserver), a program for retrieving FTP data %patch501 -p1 -b .CVE-2021-46784 %patch502 -p1 -b .CVE-2022-41318 +%patch503 -p1 -b .CVE-2023-46846 +%patch504 -p1 -b .CVE-2023-46847 +%patch505 -p1 -b .CVE-2023-46848 # https://bugzilla.redhat.com/show_bug.cgi?id=1679526 # Patch in the vendor documentation and used different location for documentation @@ -355,6 +364,13 @@ fi %changelog +* Mon Oct 30 2023 Luboš Uhliarik - 7:5.5-6.1 +- Resolves: RHEL-14819 - squid: squid: denial of Servicein FTP +- Resolves: RHEL-14807 - squid: squid: Denial of Service in HTTP Digest + Authentication +- Resolves: RHEL-14780 - squid: squid: Request/Response smuggling in HTTP/1.1 + and ICAP + * Wed Aug 16 2023 Luboš Uhliarik - 7:5.5-6 - Resolves: #2231827 - Crash with half_closed_client on