curl: Security fixes for CVE-2020-{8169/8177}
PATCH 1/1 curl: Security fixes for CVE-2020-{8169/8177}
From: Armin Kuster <[email protected]>
Source: https://curl.haxx.se/
MR: 104472, 104458
Type: Security Fix
Disposition: Backport from https://github.com/curl/curl/commit/{600a8cded447cd/8236aba58542c5f}
ChangeID: 1300924f7a64b22375b4326daeef0b686481e30c
Description:
- Affected versions: curl 7.20.0 to and including 7.70.0
- Not affected versions: curl < 7.20.0 and curl >= 7.71.0
Fixes both CVE-2020-8169 and CVE-2020-8177
Signed-off-by Armin Kuster <[email protected]>
--- .../curl/curl/CVE-2020-8169.patch | 140 ++++++++++++++++++ .../curl/curl/CVE-2020-8177.patch | 67 +++++++++ meta/recipes-support/curl/curl_7.69.1.bb | 2 + 3 files changed, 209 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2020-8169.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2020-8177.patch
meta/recipes-support/curl/curl/CVE-2020-8169.patch new file +140 -0
@@ -0,0 +1,140 @@ +From 600a8cded447cd7118ed50142c576567c0cf5158 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <[email protected]> +Date: Thu, 14 May 2020 14:37:12 +0200 +Subject: [PATCH] url: make the updated credentials URL-encoded in the URL + +Found-by: Gregory Jefferis +Reported-by: Jeroen Ooms +Added test 1168 to verify. Bug spotted when doing a redirect. +Bug: https://github.com/jeroen/curl/issues/224 +Closes #5400 + +Upstream-Status: Backport +https://github.com/curl/curl/commit/600a8cded447cd + +CVE: CVE-2020-8169 +Signed-off-by: Armin Kuster <[email protected]> + +--- + lib/url.c | 6 ++-- + tests/data/Makefile.inc | 1 + + tests/data/test1168 | 78 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 83 insertions(+), 2 deletions(-) + create mode 100644 tests/data/test1168 + +Index: curl-7.69.1/lib/url.c +=================================================================== +--- curl-7.69.1.orig/lib/url.c ++++ curl-7.69.1/lib/url.c +@@ -2776,12 +2776,14 @@ static CURLcode override_login(struct Cu + + /* for updated strings, we update them in the URL */ + if(user_changed) { +- uc = curl_url_set(data->state.uh, CURLUPART_USER, *userp, 0); ++ uc = curl_url_set(data->state.uh, CURLUPART_USER, *userp, ++ CURLU_URLENCODE); + if(uc) + return Curl_uc_to_curlcode(uc); + } + if(passwd_changed) { +- uc = curl_url_set(data->state.uh, CURLUPART_PASSWORD, *passwdp, 0); ++ uc = curl_url_set(data->state.uh, CURLUPART_PASSWORD, *passwdp, ++ CURLU_URLENCODE); + if(uc) + return Curl_uc_to_curlcode(uc); + } +Index: curl-7.69.1/tests/data/Makefile.inc +=================================================================== +--- curl-7.69.1.orig/tests/data/Makefile.inc ++++ curl-7.69.1/tests/data/Makefile.inc +@@ -133,6 +133,7 @@ test1136 test1137 test1138 test1139 test + test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \ + test1152 test1153 test1154 test1155 test1156 test1157 test1158 test1159 \ + test1160 test1161 test1162 test1163 test1164 test1165 test1166 test1167 \ ++test1168 \ + \ + test1170 test1171 test1172 test1173 test1174 test1175 test1176 \ + \ +Index: curl-7.69.1/tests/data/test1168 +=================================================================== +--- /dev/null ++++ curl-7.69.1/tests/data/test1168 +@@ -0,0 +1,78 @@ ++<testcase> ++<info> ++<keywords> ++HTTP ++HTTP GET ++followlocation ++</keywords> ++</info> ++# Server-side ++<reply> ++<data> ++HTTP/1.1 301 This is a weirdo text message swsclose ++Date: Thu, 09 Nov 2010 14:49:00 GMT ++Server: test-server/fake ++Location: /data/11680002.txt ++Connection: close ++ ++This server reply is for testing a simple Location: following ++ ++</data> ++<data2> ++HTTP/1.1 200 Followed here fine swsclose ++Date: Thu, 09 Nov 2010 14:49:00 GMT ++Server: test-server/fake ++Content-Length: 52 ++ ++If this is received, the location following worked ++ ++</data2> ++<datacheck> ++HTTP/1.1 301 This is a weirdo text message swsclose ++Date: Thu, 09 Nov 2010 14:49:00 GMT ++Server: test-server/fake ++Location: /data/11680002.txt ++Connection: close ++ ++HTTP/1.1 200 Followed here fine swsclose ++Date: Thu, 09 Nov 2010 14:49:00 GMT ++Server: test-server/fake ++Content-Length: 52 ++ ++If this is received, the location following worked ++ ++</datacheck> ++</reply> ++ ++# Client-side ++<client> ++<server> ++http ++</server> ++ <name> ++HTTP redirect with credentials using # in user and password ++ </name> ++ <command> ++http://%HOSTIP:%HTTPPORT/want/1168 -L -u "catmai#d:#DZaRJYrixKE*gFY" ++</command> ++</client> ++ ++# Verify data after the test has been "shot" ++<verify> ++<strip> ++^User-Agent:.* ++</strip> ++<protocol> ++GET /want/1168 HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ== ++Accept: */* ++ ++GET /data/11680002.txt HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ== ++Accept: */* ++ ++</protocol> ++</verify> ++</testcase>
meta/recipes-support/curl/curl/CVE-2020-8177.patch new file +67 -0
67 lines not on this page · raw message
meta/recipes-support/curl/curl_7.69.1.bb +2 -0
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2e9fb35867314fe31c6a4977ef7dd531" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ + file://CVE-2020-8169.patch \ + file://CVE-2020-8177.patch \ " SRC_URI[md5sum] = "ec5fc263f898a3dfef08e805f1ecca42"
Signature · 1 line
2.17.1