public inbox for buildroot@busybox.net
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/squid: add patch for CVE-2025-62168
@ 2026-03-03 10:38 Thomas Perale via buildroot
  2026-03-03 17:25 ` Julien Olivain via buildroot
  2026-03-06 19:53 ` Thomas Perale via buildroot
  0 siblings, 2 replies; 3+ messages in thread
From: Thomas Perale via buildroot @ 2026-03-03 10:38 UTC (permalink / raw)
  To: buildroot

Fixes the following vulnerability:

- CVE-2025-62168:
    Squid is a caching proxy for the Web. In Squid versions prior to 7.2,
    a failure to redact HTTP authentication credentials in error handling
    allows information disclosure. The vulnerability allows a script to
    bypass browser security protections and learn the credentials a
    trusted client uses to authenticate. This potentially allows a remote
    client to identify security tokens or credentials used internally by a
    web application using Squid for backend load balancing. These attacks
    do not require Squid to be configured with HTTP authentication. The
    vulnerability is fixed in version 7.2. As a workaround, disable debug
    information in administrator mailto links generated by Squid by
    configuring squid.conf with email_err_data off.

For more information, see:
  - https://www.cve.org/CVERecord?id=CVE-2025-62168
  - https://github.com/squid-cache/squid/commit/0951a0681011dfca3d78c84fd7f1e19c78a4443f

The backport has been compared against debian patch [1].

[1] https://sources.debian.org/src/squid/6.13-2%2Bdeb13u1/debian/patches/CVE-2025-62168.patch

Signed-off-by: Thomas Perale <thomas.perale@mind.be>
---
 ...2-Proxy-auth-data-visible-to-scripts.patch | 212 ++++++++++++++++++
 package/squid/squid.mk                        |   3 +
 2 files changed, 215 insertions(+)
 create mode 100644 package/squid/0002-Proxy-auth-data-visible-to-scripts.patch

diff --git a/package/squid/0002-Proxy-auth-data-visible-to-scripts.patch b/package/squid/0002-Proxy-auth-data-visible-to-scripts.patch
new file mode 100644
index 0000000000..2e5c67c8c1
--- /dev/null
+++ b/package/squid/0002-Proxy-auth-data-visible-to-scripts.patch
@@ -0,0 +1,212 @@
+From 0951a0681011dfca3d78c84fd7f1e19c78a4443f Mon Sep 17 00:00:00 2001
+From: Amos Jeffries <yadij@users.noreply.github.com>
+Date: Sat, 11 Oct 2025 16:33:02 +1300
+Subject: [PATCH] Bug 3390: Proxy auth data visible to scripts (#2249)
+
+Original changes to redact credentials from error page %R code
+expansion output was incomplete. It missed the parse failure
+case where ErrorState::request_hdrs raw buffer contained
+sensitive information.
+
+Also missed was the %W case where full request message headers
+were generated in a mailto link. This case is especially
+problematic as it may be delivered over insecure SMTP even if
+the error was secured with HTTPS.
+
+After this change:
+* The HttpRequest message packing code for error pages is de-duplicated
+  and elides authentication headers for both %R and %W code outputs.
+* The %R code output includes the CRLF request message terminator.
+* The email_err_data directive causing advanced details to be added to
+  %W mailto links is disabled by default.
+
+Also redact credentials from generated TRACE responses.
+
+---------
+
+Co-authored-by: Alex Rousskov <rousskov@measurement-factory.com>
+
+CVE: CVE-2025-62168
+Upstream: https://github.com/squid-cache/squid/commit/0951a0681011dfca3d78c84fd7f1e19c78a4443f
+[thomas: remove release note, backport errorpage.cc]
+Signed-off-by: Thomas Perale <thomas.perale@mind.be>
+---
+ src/HttpRequest.cc                  |  6 +++---
+ src/HttpRequest.h                   |  2 +-
+ src/cf.data.pre                     |  8 +++++++-
+ src/client_side_reply.cc            | 14 +++++++-------
+ src/errorpage.cc                    | 17 ++++-------------
+ src/errorpage.h                     |  1 -
+ src/tests/stub_HttpRequest.cc       |  2 +-
+ 8 files changed, 26 insertions(+), 27 deletions(-)
+
+diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
+index cd7ee71d4af..c6ed5bee45d 100644
+--- a/src/HttpRequest.cc
++++ b/src/HttpRequest.cc
+@@ -341,7 +341,7 @@ HttpRequest::swapOut(StoreEntry * e)
+ 
+ /* packs request-line and headers, appends <crlf> terminator */
+ void
+-HttpRequest::pack(Packable * p) const
++HttpRequest::pack(Packable * const p, const bool maskSensitiveInfo) const
+ {
+     assert(p);
+     /* pack request-line */
+@@ -349,8 +349,8 @@ HttpRequest::pack(Packable * p) const
+                SQUIDSBUFPRINT(method.image()), SQUIDSBUFPRINT(url.path()),
+                http_ver.major, http_ver.minor);
+     /* headers */
+-    header.packInto(p);
+-    /* trailer */
++    header.packInto(p, maskSensitiveInfo);
++    /* indicate the end of the header section */
+     p->append("\r\n", 2);
+ }
+ 
+diff --git a/src/HttpRequest.h b/src/HttpRequest.h
+index 6d369029322..28dc4daf99d 100644
+--- a/src/HttpRequest.h
++++ b/src/HttpRequest.h
+@@ -206,7 +206,7 @@ class HttpRequest: public Http::Message
+ 
+     void swapOut(StoreEntry * e);
+ 
+-    void pack(Packable * p) const;
++    void pack(Packable * p, bool maskSensitiveInfo = false) const;
+ 
+     static void httpRequestPack(void *obj, Packable *p);
+ 
+diff --git a/src/cf.data.pre b/src/cf.data.pre
+index 0a73020e111..2dce65a4d0a 100644
+--- a/src/cf.data.pre
++++ b/src/cf.data.pre
+@@ -8941,12 +8941,18 @@ NAME: email_err_data
+ COMMENT: on|off
+ TYPE: onoff
+ LOC: Config.onoff.emailErrData
+-DEFAULT: on
++DEFAULT: off
+ DOC_START
+ 	If enabled, information about the occurred error will be
+ 	included in the mailto links of the ERR pages (if %W is set)
+ 	so that the email body contains the data.
+ 	Syntax is <A HREF="mailto:%w%W">%w</A>
++
++	SECURITY WARNING:
++		Request headers and other included facts may contain
++		sensitive information about transaction history, the
++		Squid instance, and its environment which would be
++		unavailable to error recipients otherwise.
+ DOC_END
+ 
+ NAME: deny_info
+diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
+index d73bf3f99f6..fc2feccf802 100644
+--- a/src/client_side_reply.cc
++++ b/src/client_side_reply.cc
+@@ -94,7 +94,7 @@ clientReplyContext::clientReplyContext(ClientHttpRequest *clientContext) :
+ void
+ clientReplyContext::setReplyToError(
+     err_type err, Http::StatusCode status, char const *uri,
+-    const ConnStateData *conn, HttpRequest *failedrequest, const char *unparsedrequest,
++    const ConnStateData *conn, HttpRequest *failedrequest, const char *,
+ #if USE_AUTH
+     Auth::UserRequest::Pointer auth_user_request
+ #else
+@@ -104,9 +104,6 @@ clientReplyContext::setReplyToError(
+ {
+     auto errstate = clientBuildError(err, status, uri, conn, failedrequest, http->al);
+ 
+-    if (unparsedrequest)
+-        errstate->request_hdrs = xstrdup(unparsedrequest);
+-
+ #if USE_AUTH
+     errstate->auth_user_request = auth_user_request;
+ #endif
+@@ -995,11 +992,14 @@ clientReplyContext::traceReply()
+     triggerInitialStoreRead();
+     http->storeEntry()->releaseRequest();
+     http->storeEntry()->buffer();
++    MemBuf content;
++    content.init();
++    http->request->pack(&content, true /* hide authorization data */);
+     const HttpReplyPointer rep(new HttpReply);
+-    rep->setHeaders(Http::scOkay, nullptr, "text/plain", http->request->prefixLen(), 0, squid_curtime);
++    rep->setHeaders(Http::scOkay, nullptr, "message/http", content.contentSize(), 0, squid_curtime);
++    rep->body.set(SBuf(content.buf, content.size));
+     http->storeEntry()->replaceHttpReply(rep);
+-    http->request->swapOut(http->storeEntry());
+-    http->storeEntry()->complete();
++    http->storeEntry()->completeSuccessfully("traceReply() stored the entire response");
+ }
+ 
+ #define SENDING_BODY 0
+diff --git a/src/errorpage.cc b/src/errorpage.cc
+index d7a588d099f..06046de9ebb 100644
+--- a/src/errorpage.cc
++++ b/src/errorpage.cc
+@@ -792,7 +792,6 @@ ErrorState::~ErrorState()
+ {
+     safe_free(redirect_url);
+     safe_free(url);
+-    safe_free(request_hdrs);
+     wordlistDestroy(&ftp.server_msg);
+     safe_free(ftp.request);
+     safe_free(ftp.reply);
+@@ -850,7 +849,7 @@ ErrorState::Dump(MemBuf * mb)
+                     SQUIDSBUFPRINT(request->url.path()),
+                     AnyP::ProtocolType_str[request->http_ver.protocol],
+                     request->http_ver.major, request->http_ver.minor);
+-        request->header.packInto(&str);
++        request->header.packInto(&str, true /* hide authorization data */);
+     }
+ 
+     str.append("\r\n", 2);
+@@ -1112,18 +1111,10 @@ ErrorState::compileLegacyCode(Build &build)
+                 p = "[no request]";
+             break;
+         }
+-        if (request) {
+-            mb.appendf(SQUIDSBUFPH " " SQUIDSBUFPH " %s/%d.%d\n",
+-                       SQUIDSBUFPRINT(request->method.image()),
+-                       SQUIDSBUFPRINT(request->url.path()),
+-                       AnyP::ProtocolType_str[request->http_ver.protocol],
+-                       request->http_ver.major, request->http_ver.minor);
+-            request->header.packInto(&mb, true); //hide authorization data
+-        } else if (request_hdrs) {
+-            p = request_hdrs;
+-        } else {
++        else if (request)
++            request->pack(&mb, true /* hide authorization data */);
++        else
+             p = "[no request]";
+-        }
+         break;
+ 
+     case 's':
+diff --git a/src/errorpage.h b/src/errorpage.h
+index abca4a17d7b..297b306978d 100644
+--- a/src/errorpage.h
++++ b/src/errorpage.h
+@@ -194,7 +194,6 @@ class ErrorState
+         MemBuf *listing = nullptr;
+     } ftp;
+ 
+-    char *request_hdrs = nullptr;
+     char *err_msg = nullptr; /* Preformatted error message from the cache */
+ 
+     AccessLogEntryPointer ale; ///< transaction details (or nil)
+diff --git a/src/tests/stub_HttpRequest.cc b/src/tests/stub_HttpRequest.cc
+index 495597d9a1b..48a0f1ce03e 100644
+--- a/src/tests/stub_HttpRequest.cc
++++ b/src/tests/stub_HttpRequest.cc
+@@ -45,7 +45,7 @@ bool HttpRequest::expectingBody(const HttpRequestMethod &, int64_t &) const STUB
+ bool HttpRequest::bodyNibbled() const STUB_RETVAL(false)
+ int HttpRequest::prefixLen() const STUB_RETVAL(0)
+ void HttpRequest::swapOut(StoreEntry *) STUB
+-void HttpRequest::pack(Packable *) const STUB
++void HttpRequest::pack(Packable *, bool) const STUB
+ void HttpRequest::httpRequestPack(void *, Packable *) STUB
+ HttpRequest * HttpRequest::FromUrl(const SBuf &, const MasterXaction::Pointer &, const HttpRequestMethod &) STUB_RETVAL(nullptr)
+ HttpRequest * HttpRequest::FromUrlXXX(const char *, const MasterXaction::Pointer &, const HttpRequestMethod &) STUB_RETVAL(nullptr)
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index d445f005b7..c031f1aa03 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -15,6 +15,9 @@ SQUID_SELINUX_MODULES = apache squid
 # 0001-Fix-ASN-1-encoding-of-long-SNMP-OIDs.patch
 SQUID_IGNORE_CVES += CVE-2025-59362
 
+# 0002-Proxy-auth-data-visible-to-scripts.patch
+SQUID_IGNORE_CVES += CVE-2025-62168
+
 SQUID_DEPENDENCIES = libcap host-libcap libtool libxml2 host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
 SQUID_CONF_ENV = \
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/squid: add patch for CVE-2025-62168
  2026-03-03 10:38 [Buildroot] [PATCH 1/1] package/squid: add patch for CVE-2025-62168 Thomas Perale via buildroot
@ 2026-03-03 17:25 ` Julien Olivain via buildroot
  2026-03-06 19:53 ` Thomas Perale via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Julien Olivain via buildroot @ 2026-03-03 17:25 UTC (permalink / raw)
  To: Thomas Perale; +Cc: buildroot

On 03/03/2026 11:38, Thomas Perale via buildroot wrote:
[...]
> Signed-off-by: Thomas Perale <thomas.perale@mind.be>

Applied to master, thanks.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/squid: add patch for CVE-2025-62168
  2026-03-03 10:38 [Buildroot] [PATCH 1/1] package/squid: add patch for CVE-2025-62168 Thomas Perale via buildroot
  2026-03-03 17:25 ` Julien Olivain via buildroot
@ 2026-03-06 19:53 ` Thomas Perale via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Perale via buildroot @ 2026-03-06 19:53 UTC (permalink / raw)
  To: Thomas Perale; +Cc: buildroot

In reply of:
> Fixes the following vulnerability:
> 
> - CVE-2025-62168:
>     Squid is a caching proxy for the Web. In Squid versions prior to 7.2,
>     a failure to redact HTTP authentication credentials in error handling
>     allows information disclosure. The vulnerability allows a script to
>     bypass browser security protections and learn the credentials a
>     trusted client uses to authenticate. This potentially allows a remote
>     client to identify security tokens or credentials used internally by a
>     web application using Squid for backend load balancing. These attacks
>     do not require Squid to be configured with HTTP authentication. The
>     vulnerability is fixed in version 7.2. As a workaround, disable debug
>     information in administrator mailto links generated by Squid by
>     configuring squid.conf with email_err_data off.
> 
> For more information, see:
>   - https://www.cve.org/CVERecord?id=CVE-2025-62168
>   - https://github.com/squid-cache/squid/commit/0951a0681011dfca3d78c84fd7f1e19c78a4443f
> 
> The backport has been compared against debian patch [1].
> 
> [1] https://sources.debian.org/src/squid/6.13-2%2Bdeb13u1/debian/patches/CVE-2025-62168.patch
> 
> Signed-off-by: Thomas Perale <thomas.perale@mind.be>

Applied to 2025.02.x & 2025.11.x. Thanks

> ---
>  ...2-Proxy-auth-data-visible-to-scripts.patch | 212 ++++++++++++++++++
>  package/squid/squid.mk                        |   3 +
>  2 files changed, 215 insertions(+)
>  create mode 100644 package/squid/0002-Proxy-auth-data-visible-to-scripts.patch
> 
> diff --git a/package/squid/0002-Proxy-auth-data-visible-to-scripts.patch b/package/squid/0002-Proxy-auth-data-visible-to-scripts.patch
> new file mode 100644
> index 0000000000..2e5c67c8c1
> --- /dev/null
> +++ b/package/squid/0002-Proxy-auth-data-visible-to-scripts.patch
> @@ -0,0 +1,212 @@
> +From 0951a0681011dfca3d78c84fd7f1e19c78a4443f Mon Sep 17 00:00:00 2001
> +From: Amos Jeffries <yadij@users.noreply.github.com>
> +Date: Sat, 11 Oct 2025 16:33:02 +1300
> +Subject: [PATCH] Bug 3390: Proxy auth data visible to scripts (#2249)
> +
> +Original changes to redact credentials from error page %R code
> +expansion output was incomplete. It missed the parse failure
> +case where ErrorState::request_hdrs raw buffer contained
> +sensitive information.
> +
> +Also missed was the %W case where full request message headers
> +were generated in a mailto link. This case is especially
> +problematic as it may be delivered over insecure SMTP even if
> +the error was secured with HTTPS.
> +
> +After this change:
> +* The HttpRequest message packing code for error pages is de-duplicated
> +  and elides authentication headers for both %R and %W code outputs.
> +* The %R code output includes the CRLF request message terminator.
> +* The email_err_data directive causing advanced details to be added to
> +  %W mailto links is disabled by default.
> +
> +Also redact credentials from generated TRACE responses.
> +
> +---------
> +
> +Co-authored-by: Alex Rousskov <rousskov@measurement-factory.com>
> +
> +CVE: CVE-2025-62168
> +Upstream: https://github.com/squid-cache/squid/commit/0951a0681011dfca3d78c84fd7f1e19c78a4443f
> +[thomas: remove release note, backport errorpage.cc]
> +Signed-off-by: Thomas Perale <thomas.perale@mind.be>
> +---
> + src/HttpRequest.cc                  |  6 +++---
> + src/HttpRequest.h                   |  2 +-
> + src/cf.data.pre                     |  8 +++++++-
> + src/client_side_reply.cc            | 14 +++++++-------
> + src/errorpage.cc                    | 17 ++++-------------
> + src/errorpage.h                     |  1 -
> + src/tests/stub_HttpRequest.cc       |  2 +-
> + 8 files changed, 26 insertions(+), 27 deletions(-)
> +
> +diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
> +index cd7ee71d4af..c6ed5bee45d 100644
> +--- a/src/HttpRequest.cc
> ++++ b/src/HttpRequest.cc
> +@@ -341,7 +341,7 @@ HttpRequest::swapOut(StoreEntry * e)
> + 
> + /* packs request-line and headers, appends <crlf> terminator */
> + void
> +-HttpRequest::pack(Packable * p) const
> ++HttpRequest::pack(Packable * const p, const bool maskSensitiveInfo) const
> + {
> +     assert(p);
> +     /* pack request-line */
> +@@ -349,8 +349,8 @@ HttpRequest::pack(Packable * p) const
> +                SQUIDSBUFPRINT(method.image()), SQUIDSBUFPRINT(url.path()),
> +                http_ver.major, http_ver.minor);
> +     /* headers */
> +-    header.packInto(p);
> +-    /* trailer */
> ++    header.packInto(p, maskSensitiveInfo);
> ++    /* indicate the end of the header section */
> +     p->append("\r\n", 2);
> + }
> + 
> +diff --git a/src/HttpRequest.h b/src/HttpRequest.h
> +index 6d369029322..28dc4daf99d 100644
> +--- a/src/HttpRequest.h
> ++++ b/src/HttpRequest.h
> +@@ -206,7 +206,7 @@ class HttpRequest: public Http::Message
> + 
> +     void swapOut(StoreEntry * e);
> + 
> +-    void pack(Packable * p) const;
> ++    void pack(Packable * p, bool maskSensitiveInfo = false) const;
> + 
> +     static void httpRequestPack(void *obj, Packable *p);
> + 
> +diff --git a/src/cf.data.pre b/src/cf.data.pre
> +index 0a73020e111..2dce65a4d0a 100644
> +--- a/src/cf.data.pre
> ++++ b/src/cf.data.pre
> +@@ -8941,12 +8941,18 @@ NAME: email_err_data
> + COMMENT: on|off
> + TYPE: onoff
> + LOC: Config.onoff.emailErrData
> +-DEFAULT: on
> ++DEFAULT: off
> + DOC_START
> + 	If enabled, information about the occurred error will be
> + 	included in the mailto links of the ERR pages (if %W is set)
> + 	so that the email body contains the data.
> + 	Syntax is <A HREF="mailto:%w%W">%w</A>
> ++
> ++	SECURITY WARNING:
> ++		Request headers and other included facts may contain
> ++		sensitive information about transaction history, the
> ++		Squid instance, and its environment which would be
> ++		unavailable to error recipients otherwise.
> + DOC_END
> + 
> + NAME: deny_info
> +diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
> +index d73bf3f99f6..fc2feccf802 100644
> +--- a/src/client_side_reply.cc
> ++++ b/src/client_side_reply.cc
> +@@ -94,7 +94,7 @@ clientReplyContext::clientReplyContext(ClientHttpRequest *clientContext) :
> + void
> + clientReplyContext::setReplyToError(
> +     err_type err, Http::StatusCode status, char const *uri,
> +-    const ConnStateData *conn, HttpRequest *failedrequest, const char *unparsedrequest,
> ++    const ConnStateData *conn, HttpRequest *failedrequest, const char *,
> + #if USE_AUTH
> +     Auth::UserRequest::Pointer auth_user_request
> + #else
> +@@ -104,9 +104,6 @@ clientReplyContext::setReplyToError(
> + {
> +     auto errstate = clientBuildError(err, status, uri, conn, failedrequest, http->al);
> + 
> +-    if (unparsedrequest)
> +-        errstate->request_hdrs = xstrdup(unparsedrequest);
> +-
> + #if USE_AUTH
> +     errstate->auth_user_request = auth_user_request;
> + #endif
> +@@ -995,11 +992,14 @@ clientReplyContext::traceReply()
> +     triggerInitialStoreRead();
> +     http->storeEntry()->releaseRequest();
> +     http->storeEntry()->buffer();
> ++    MemBuf content;
> ++    content.init();
> ++    http->request->pack(&content, true /* hide authorization data */);
> +     const HttpReplyPointer rep(new HttpReply);
> +-    rep->setHeaders(Http::scOkay, nullptr, "text/plain", http->request->prefixLen(), 0, squid_curtime);
> ++    rep->setHeaders(Http::scOkay, nullptr, "message/http", content.contentSize(), 0, squid_curtime);
> ++    rep->body.set(SBuf(content.buf, content.size));
> +     http->storeEntry()->replaceHttpReply(rep);
> +-    http->request->swapOut(http->storeEntry());
> +-    http->storeEntry()->complete();
> ++    http->storeEntry()->completeSuccessfully("traceReply() stored the entire response");
> + }
> + 
> + #define SENDING_BODY 0
> +diff --git a/src/errorpage.cc b/src/errorpage.cc
> +index d7a588d099f..06046de9ebb 100644
> +--- a/src/errorpage.cc
> ++++ b/src/errorpage.cc
> +@@ -792,7 +792,6 @@ ErrorState::~ErrorState()
> + {
> +     safe_free(redirect_url);
> +     safe_free(url);
> +-    safe_free(request_hdrs);
> +     wordlistDestroy(&ftp.server_msg);
> +     safe_free(ftp.request);
> +     safe_free(ftp.reply);
> +@@ -850,7 +849,7 @@ ErrorState::Dump(MemBuf * mb)
> +                     SQUIDSBUFPRINT(request->url.path()),
> +                     AnyP::ProtocolType_str[request->http_ver.protocol],
> +                     request->http_ver.major, request->http_ver.minor);
> +-        request->header.packInto(&str);
> ++        request->header.packInto(&str, true /* hide authorization data */);
> +     }
> + 
> +     str.append("\r\n", 2);
> +@@ -1112,18 +1111,10 @@ ErrorState::compileLegacyCode(Build &build)
> +                 p = "[no request]";
> +             break;
> +         }
> +-        if (request) {
> +-            mb.appendf(SQUIDSBUFPH " " SQUIDSBUFPH " %s/%d.%d\n",
> +-                       SQUIDSBUFPRINT(request->method.image()),
> +-                       SQUIDSBUFPRINT(request->url.path()),
> +-                       AnyP::ProtocolType_str[request->http_ver.protocol],
> +-                       request->http_ver.major, request->http_ver.minor);
> +-            request->header.packInto(&mb, true); //hide authorization data
> +-        } else if (request_hdrs) {
> +-            p = request_hdrs;
> +-        } else {
> ++        else if (request)
> ++            request->pack(&mb, true /* hide authorization data */);
> ++        else
> +             p = "[no request]";
> +-        }
> +         break;
> + 
> +     case 's':
> +diff --git a/src/errorpage.h b/src/errorpage.h
> +index abca4a17d7b..297b306978d 100644
> +--- a/src/errorpage.h
> ++++ b/src/errorpage.h
> +@@ -194,7 +194,6 @@ class ErrorState
> +         MemBuf *listing = nullptr;
> +     } ftp;
> + 
> +-    char *request_hdrs = nullptr;
> +     char *err_msg = nullptr; /* Preformatted error message from the cache */
> + 
> +     AccessLogEntryPointer ale; ///< transaction details (or nil)
> +diff --git a/src/tests/stub_HttpRequest.cc b/src/tests/stub_HttpRequest.cc
> +index 495597d9a1b..48a0f1ce03e 100644
> +--- a/src/tests/stub_HttpRequest.cc
> ++++ b/src/tests/stub_HttpRequest.cc
> +@@ -45,7 +45,7 @@ bool HttpRequest::expectingBody(const HttpRequestMethod &, int64_t &) const STUB
> + bool HttpRequest::bodyNibbled() const STUB_RETVAL(false)
> + int HttpRequest::prefixLen() const STUB_RETVAL(0)
> + void HttpRequest::swapOut(StoreEntry *) STUB
> +-void HttpRequest::pack(Packable *) const STUB
> ++void HttpRequest::pack(Packable *, bool) const STUB
> + void HttpRequest::httpRequestPack(void *, Packable *) STUB
> + HttpRequest * HttpRequest::FromUrl(const SBuf &, const MasterXaction::Pointer &, const HttpRequestMethod &) STUB_RETVAL(nullptr)
> + HttpRequest * HttpRequest::FromUrlXXX(const char *, const MasterXaction::Pointer &, const HttpRequestMethod &) STUB_RETVAL(nullptr)
> diff --git a/package/squid/squid.mk b/package/squid/squid.mk
> index d445f005b7..c031f1aa03 100644
> --- a/package/squid/squid.mk
> +++ b/package/squid/squid.mk
> @@ -15,6 +15,9 @@ SQUID_SELINUX_MODULES = apache squid
>  # 0001-Fix-ASN-1-encoding-of-long-SNMP-OIDs.patch
>  SQUID_IGNORE_CVES += CVE-2025-59362
>  
> +# 0002-Proxy-auth-data-visible-to-scripts.patch
> +SQUID_IGNORE_CVES += CVE-2025-62168
> +
>  SQUID_DEPENDENCIES = libcap host-libcap libtool libxml2 host-pkgconf \
>  	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
>  SQUID_CONF_ENV = \
> -- 
> 2.53.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-03-06 19:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-03 10:38 [Buildroot] [PATCH 1/1] package/squid: add patch for CVE-2025-62168 Thomas Perale via buildroot
2026-03-03 17:25 ` Julien Olivain via buildroot
2026-03-06 19:53 ` Thomas Perale via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox