Skip to contentSkip to conversation

squid: security bump to version 3.5.28

PATCH New Peter Korsgaard 1 participant 4 messages Nov 25, 2018 – Nov 26, 2018

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH v2 1/3 squid: security bump to version 3.5.28

Fixes SQUID-2018:3 / CVE-2018-1172: Crash in ESI Response processing

For more details, see the advisory:

http://www.squid-cache.org/Advisories/SQUID-2018_3.txt

Drop patch 0003 / 0004 as these (security) fixes are now upstream.

Signed-off-by Peter Korsgaard <[email protected]>
---
 ...e-sure-endofName-never-exceeds-tagEnd-130.patch | 35 ----------------------
 ...t-IP-logging-for-transactions-without-a-c.patch | 31 -------------------
 package/squid/squid.hash                           |  6 ++--
 package/squid/squid.mk                             |  2 +-
 4 files changed, 4 insertions(+), 70 deletions(-)
 delete mode 100644 package/squid/0003-ESI-make-sure-endofName-never-exceeds-tagEnd-130.patch
 delete mode 100644 package/squid/0004-Fix-indirect-IP-logging-for-transactions-without-a-c.patch
package/squid/0003-ESI-make-sure-endofName-never-exceeds-tagEnd-130.patch deleted +0 -35
deleted file mode 100644
index 6e71677a19..0000000000
@@ -1,35 +0,0 @@
-From eb2db98a676321b814fc4a51c4fb7928a8bb45d9 Mon Sep 17 00:00:00 2001
-From: Amos Jeffries <[email protected]>
-Date: Fri, 19 Jan 2018 13:54:14 +1300
-Subject: [PATCH] ESI: make sure endofName never exceeds tagEnd (#130)
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- src/esi/CustomParser.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc
-index d86d2d309..db634d921 100644
---- a/src/esi/CustomParser.cc
-+++ b/src/esi/CustomParser.cc
-@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
- 
-             char * endofName = strpbrk(const_cast<char *>(tag), w_space);
- 
--            if (endofName > tagEnd)
-+            if (!endofName || endofName > tagEnd)
-                 endofName = const_cast<char *>(tagEnd);
- 
-             *endofName = '\0';
-@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
- 
-             char * endofName = strpbrk(const_cast<char *>(tag), w_space);
- 
--            if (endofName > tagEnd)
-+            if (!endofName || endofName > tagEnd)
-                 endofName = const_cast<char *>(tagEnd);
- 
-             *endofName = '\0';
--- 
-2.11.0
-
package/squid/0004-Fix-indirect-IP-logging-for-transactions-without-a-c.patch deleted +0 -31
deleted file mode 100644
index 51fff30034..0000000000
@@ -1,31 +0,0 @@
-From 8232b83d3fa47a1399f155cb829db829369fbae9 Mon Sep 17 00:00:00 2001
-From: squidadm <[email protected]>
-Date: Sun, 21 Jan 2018 08:07:08 +1300
-Subject: [PATCH] Fix indirect IP logging for transactions without a client
- connection (#129) (#136)
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- src/client_side_request.cc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/client_side_request.cc b/src/client_side_request.cc
-index be124f355..203f89d46 100644
---- a/src/client_side_request.cc
-+++ b/src/client_side_request.cc
-@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *data)
-         * Ensure that the access log shows the indirect client
-         * instead of the direct client.
-         */
--        ConnStateData *conn = http->getConn();
--        conn->log_addr = request->indirect_client_addr;
--        http->al->cache.caddr = conn->log_addr;
-+        http->al->cache.caddr = request->indirect_client_addr;
-+        if (ConnStateData *conn = http->getConn())
-+            conn->log_addr = request->indirect_client_addr;
-     }
-     request->x_forwarded_for_iterator.clean();
-     request->flags.done_follow_x_forwarded_for = true;
--- 
-2.11.0
-
package/squid/squid.hash +3 -3
index 8787cb25ef..3c0a2734e5 100644
@@ -1,5 +1,5 @@
-# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.27.tar.xz.asc
-md5 39ef8199675d48a314b540f92c00c545 squid-3.5.27.tar.xz
-sha1 1e69c96d13cd49844da3bcf33a0b428fbe7b6f77 squid-3.5.27.tar.xz
+# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.28.tar.xz.asc
+md5 9367e0375ea53ba0e99f77054d4402c5 squid-3.5.28.tar.xz
+sha1 721241a270ec27d629d65ae17a50be56510e8441 squid-3.5.28.tar.xz
 # Locally calculated
 sha256 58f5d05257af1fb964fde20e134d660fac9afa86b6fd8c70d63ead63068378fa COPYING
package/squid/squid.mk +1 -1
index 8ade55ee37..a921c634bd 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 SQUID_VERSION_MAJOR = 3.5
-SQUID_VERSION = $(SQUID_VERSION_MAJOR).27
+SQUID_VERSION = $(SQUID_VERSION_MAJOR).28
 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR)
 SQUID_LICENSE = GPL-2.0+
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH v2 1/3 squid: security bump to version 3.5.28

Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Fixes SQUID-2018:3 / CVE-2018-1172: Crash in ESI Response processing For more details, see the advisory:

http://www.squid-cache.org/Advisories/SQUID-2018_3.txt

Drop patch 0003 / 0004 as these (security) fixes are now upstream.

Signed-off-by Peter Korsgaard <[email protected]>

Committed all 3 to 2018.02.x and 2018.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#2 lore raw

PATCH v2 2/3 squid: add upstream security fix for SQUID-2018_4 / CVE-2018-19131

In reply to Peter Korsgaard

From the advisory:

Due to incorrect input handling, Squid is vulnerable to a Cross-Site Scripting vulnerability when generating HTTPS response messages about TLS errors.

http://www.squid-cache.org/Advisories/SQUID-2018_4.txt

Add the patch from the 3.5 branch fixing this issue.

Signed-off-by Peter Korsgaard <[email protected]>
---
 package/squid/squid.hash | 1 +
 package/squid/squid.mk   | 2 ++
 2 files changed, 3 insertions(+)
package/squid/squid.hash +1 -0
index 3c0a2734e5..6fd29b0dcc 100644
@@ -2,4 +2,5 @@
 md5 9367e0375ea53ba0e99f77054d4402c5 squid-3.5.28.tar.xz
 sha1 721241a270ec27d629d65ae17a50be56510e8441 squid-3.5.28.tar.xz
 # Locally calculated
+sha256 de5ea6fa5711aaa6d209de9e9e715c2702ff3597f009562ee1e571cc101670c7 squid-3.5-f1657a9decc820f748fa3aff68168d3145258031.patch
 sha256 58f5d05257af1fb964fde20e134d660fac9afa86b6fd8c70d63ead63068378fa COPYING
package/squid/squid.mk +2 -0
index a921c634bd..f49b3604cf 100644
@@ -8,6 +8,8 @@ SQUID_VERSION_MAJOR = 3.5
 SQUID_VERSION = $(SQUID_VERSION_MAJOR).28
 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR)
+SQUID_PATCH = \
+	http://www.squid-cache.org/Versions/v3/3.5/changesets/squid-3.5-f1657a9decc820f748fa3aff68168d3145258031.patch
 SQUID_LICENSE = GPL-2.0+
 SQUID_LICENSE_FILES = COPYING
 # For 0001-assume-get-certificate-ok.patch
Signature · 1 line
2.11.0
author
#3 lore raw

PATCH v2 3/3 squid: add upstream security fix for SQUID-2018_5 / CVE-2018-19132

In reply to Peter Korsgaard

From the advisory:

Due to a memory leak in SNMP query rejection code, Squid is vulnerable to a denial of service attack.

http://www.squid-cache.org/Advisories/SQUID-2018_5.txt

Add the patch from the 3.5 branch fixing this issue.

Signed-off-by Peter Korsgaard <[email protected]>
---
 package/squid/squid.hash | 1 +
 package/squid/squid.mk   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
package/squid/squid.hash +1 -0
index 6fd29b0dcc..74637ca063 100644
@@ -3,4 +3,5 @@ md5 9367e0375ea53ba0e99f77054d4402c5 squid-3.5.28.tar.xz
 sha1 721241a270ec27d629d65ae17a50be56510e8441 squid-3.5.28.tar.xz
 # Locally calculated
 sha256 de5ea6fa5711aaa6d209de9e9e715c2702ff3597f009562ee1e571cc101670c7 squid-3.5-f1657a9decc820f748fa3aff68168d3145258031.patch
+sha256 8f2518b5e9840e119c493f6ed793e773675e2f768de2bf1bd637fced27e4d527 squid-3.5-bc9786119f058a76ddf0625424bc33d36460b9a2.patch
 sha256 58f5d05257af1fb964fde20e134d660fac9afa86b6fd8c70d63ead63068378fa COPYING
package/squid/squid.mk +2 -1
index f49b3604cf..8be4135719 100644
@@ -9,7 +9,8 @@ SQUID_VERSION = $(SQUID_VERSION_MAJOR).28
 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR)
 SQUID_PATCH = \
-	http://www.squid-cache.org/Versions/v3/3.5/changesets/squid-3.5-f1657a9decc820f748fa3aff68168d3145258031.patch
+	http://www.squid-cache.org/Versions/v3/3.5/changesets/squid-3.5-f1657a9decc820f748fa3aff68168d3145258031.patch \
+	http://www.squid-cache.org/Versions/v3/3.5/changesets/squid-3.5-bc9786119f058a76ddf0625424bc33d36460b9a2.patch
 SQUID_LICENSE = GPL-2.0+
 SQUID_LICENSE_FILES = COPYING
 # For 0001-assume-get-certificate-ok.patch
Signature · 1 line
2.11.0