From 7021d038b7cc664c1d6c88e641deecffd3f1adbd Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 3 Sep 2024 10:27:02 +0000
Subject: [PATCH] import UBI wget-1.21.1-8.el9_4

---
 SOURCES/wget-1.21-CVE-2024-38428.patch | 74 ++++++++++++++++++++++++++
 SPECS/wget.spec                        |  6 ++-
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/wget-1.21-CVE-2024-38428.patch

diff --git a/SOURCES/wget-1.21-CVE-2024-38428.patch b/SOURCES/wget-1.21-CVE-2024-38428.patch
new file mode 100644
index 0000000..383c5f6
--- /dev/null
+++ b/SOURCES/wget-1.21-CVE-2024-38428.patch
@@ -0,0 +1,74 @@
+From ed0c7c7e0e8f7298352646b2fd6e06a11e242ace Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Sun, 2 Jun 2024 12:40:16 +0200
+Subject: Properly re-implement userinfo parsing (rfc2396)
+
+* src/url.c (url_skip_credentials): Properly re-implement userinfo parsing (rfc2396)
+
+The reason why the implementation is based on RFC 2396, an outdated standard,
+is that the whole file is based on that RFC, and mixing standard here might be
+dangerous.
+---
+ src/url.c | 40 ++++++++++++++++++++++++++++++++++------
+ 1 file changed, 34 insertions(+), 6 deletions(-)
+
+diff --git a/src/url.c b/src/url.c
+index 69e948b..07c3bc8 100644
+--- a/src/url.c
++++ b/src/url.c
+@@ -41,6 +41,7 @@ as that of the covered work.  */
+ #include "url.h"
+ #include "host.h"  /* for is_valid_ipv6_address */
+ #include "c-strcase.h"
++#include "c-ctype.h"
+ 
+ #ifdef HAVE_ICONV
+ # include <iconv.h>
+@@ -526,12 +527,39 @@ scheme_leading_string (enum url_scheme scheme)
+ static const char *
+ url_skip_credentials (const char *url)
+ {
+-  /* Look for '@' that comes before terminators, such as '/', '?',
+-     '#', or ';'.  */
+-  const char *p = (const char *)strpbrk (url, "@/?#;");
+-  if (!p || *p != '@')
+-    return url;
+-  return p + 1;
++  /*
++   * This whole file implements https://www.rfc-editor.org/rfc/rfc2396 .
++   * RFC 2396 is outdated since 2005 and needs a rewrite or a thorough re-visit.
++   *
++   * The RFC says
++   * server        = [ [ userinfo "@" ] hostport ]
++   * userinfo      = *( unreserved | escaped | ";" | ":" | "&" | "=" | "+" | "$" | "," )
++   * unreserved    = alphanum | mark
++   * mark          = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
++   */
++  static const char *allowed = "-_.!~*'();:&=+$,";
++
++  for (const char *p = url; *p; p++)
++    {
++      if (c_isalnum(*p))
++        continue;
++
++      if (strchr(allowed, *p))
++        continue;
++
++      if (*p == '%' && c_isxdigit(p[1]) && c_isxdigit(p[2]))
++        {
++          p += 2;
++          continue;
++        }
++
++      if (*p == '@')
++        return p + 1;
++
++      break;
++    }
++
++  return url;
+ }
+ 
+ /* Parse credentials contained in [BEG, END).  The region is expected
+-- 
+cgit v1.1
diff --git a/SPECS/wget.spec b/SPECS/wget.spec
index 5d1c77e..d285103 100644
--- a/SPECS/wget.spec
+++ b/SPECS/wget.spec
@@ -1,7 +1,7 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols
 Name: wget
 Version: 1.21.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Url: http://www.gnu.org/software/wget/
 Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.gz
@@ -10,6 +10,7 @@ Patch1: wget-1.17-path.patch
 Patch2: wget-1.21-strtol.patch
 Patch3: wget-1.21-metalink-man.patch
 Patch4: wget-1.21-segfault.patch
+Patch5: wget-1.21-CVE-2024-38428.patch
 
 Provides: webclient
 Provides: bundled(gnulib) 
@@ -69,6 +70,9 @@ make check
 %{_infodir}/*
 
 %changelog
+* Mon Jul 15 2024 Michal Ruprich <mruprich@redhat.com> - 1.21.1-8
+- Resolves: RHEL-43226 - Misinterpretation of input may lead to improper behavior
+
 * Tue Nov 02 2021 Michal Ruprich <mruprich@redhat.com> - 1.21.1-7
 - Resolves: #2017842 - Two different segfaults when downloading multiple files
 - Removing metalink from manpage