mirror of
https://git.yoctoproject.org/poky
synced 2026-02-23 18:09:40 +01:00
a54b91946c
Backport two patches [1] [2] to fix CVE-2023-36617 (From OE-Core rev: 7a40082e4e080eaf5f88bd24f7169b7731028529) Signed-off-by: Meenali Gupta <meenali.gupta@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From 9c2eb12776c1b5df2517a7e618e5fe818cc3395e Mon Sep 17 00:00:00 2001
|
|
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
|
|
Date: Thu, 27 Jul 2023 15:53:01 +0800
|
|
Subject: [PATCH] ruby: Fix quadratic backtracking on invalid relative URI
|
|
|
|
Upstream-Status: Backport [https://github.com/ruby/uri/commit/9010ee2536adda10a0555ae1ed6fe2f5808e6bf1]
|
|
CVE: CVE-2023-36617
|
|
|
|
Signed-off-by: Meenali Gupta <meenali.gupta@windriver.com>
|
|
---
|
|
lib/uri/rfc2396_parser.rb | 4 ++--
|
|
test/uri/test_parser.rb | 12 ++++++++++++
|
|
2 files changed, 14 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/lib/uri/rfc2396_parser.rb b/lib/uri/rfc2396_parser.rb
|
|
index 76a8f99..00c66cf 100644
|
|
--- a/lib/uri/rfc2396_parser.rb
|
|
+++ b/lib/uri/rfc2396_parser.rb
|
|
@@ -497,8 +497,8 @@ module URI
|
|
ret = {}
|
|
|
|
# for URI::split
|
|
- ret[:ABS_URI] = Regexp.new('\A\s*' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
|
|
- ret[:REL_URI] = Regexp.new('\A\s*' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
|
|
+ ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
|
|
+ ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
|
|
|
|
# for URI::extract
|
|
ret[:URI_REF] = Regexp.new(pattern[:URI_REF])
|
|
diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb
|
|
index 03de137..01ed32a 100644
|
|
--- a/test/uri/test_parser.rb
|
|
+++ b/test/uri/test_parser.rb
|
|
@@ -63,4 +63,16 @@ class URI::TestParser < Test::Unit::TestCase
|
|
assert_equal("\u3042", p1.unescape('%e3%81%82'.force_encoding(Encoding::US_ASCII)))
|
|
assert_equal("\xe3\x83\x90\xe3\x83\x90", p1.unescape("\xe3\x83\x90%e3%83%90"))
|
|
end
|
|
+
|
|
+ def test_rfc2822_parse_relative_uri
|
|
+ pre = ->(length) {
|
|
+ " " * length + "\0"
|
|
+ }
|
|
+ parser = URI::RFC2396_Parser.new
|
|
+ assert_linear_performance((1..5).map {|i| 10**i}, pre: pre) do |uri|
|
|
+ assert_raise(URI::InvalidURIError) do
|
|
+ parser.split(uri)
|
|
+ end
|
|
+ end
|
|
+ end
|
|
end
|
|
--
|
|
2.40.0
|