mirror of
https://git.yoctoproject.org/poky
synced 2026-03-11 17:59:39 +01:00
452cc7b484
Backport two patches [1] [2] to fix CVE-2023-36617 [3]. [1]9010ee2536[2]9d7bcef1e6[3] https://www.ruby-lang.org/en/news/2023/06/29/redos-in-uri-CVE-2023-36617/ (From OE-Core rev: 403a24f02600e2462e8ccfbb42651e15e002bd2e) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
From 2ebb50d2dc302917a6f57c1239dc9e700dfe0e34 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] Fix quadratic backtracking on invalid relative URI
|
|
|
|
https://hackerone.com/reports/1958260
|
|
|
|
CVE: CVE-2023-36617
|
|
|
|
Upstream-Status: Backport [https://github.com/ruby/uri/commit/9010ee2536adda10a0555ae1ed6fe2f5808e6bf1]
|
|
|
|
Signed-off-by: Mingli Yu <mingli.yu@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 72fb590..721e05e 100644
|
|
--- a/test/uri/test_parser.rb
|
|
+++ b/test/uri/test_parser.rb
|
|
@@ -79,4 +79,16 @@ class URI::TestParser < Test::Unit::TestCase
|
|
assert_equal([nil, nil, "example.com", nil, nil, "", nil, nil, nil], URI.split("//example.com"))
|
|
assert_equal([nil, nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("//[0::0]"))
|
|
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.25.1
|
|
|