mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 16:39:40 +01:00
d0e754f058
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: 959b2e5deae18969ffe1e9d90c901928bc47e332) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
From eea5868120509c245216c4b5c2d4b5db1c593d0e Mon Sep 17 00:00:00 2001
|
|
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
|
|
Date: Thu, 27 Jul 2023 16:16:30 +0800
|
|
Subject: [PATCH] Fix quadratic backtracking on invalid port number
|
|
|
|
https://hackerone.com/reports/1958260
|
|
|
|
CVE: CVE-2023-36617
|
|
|
|
Upstream-Status: Backport [https://github.com/ruby/uri/commit/9d7bcef1e6ad23c9c6e4932f297fb737888144c8]
|
|
|
|
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
|
---
|
|
lib/uri/rfc3986_parser.rb | 2 +-
|
|
test/uri/test_parser.rb | 10 ++++++++++
|
|
2 files changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/uri/rfc3986_parser.rb b/lib/uri/rfc3986_parser.rb
|
|
index dd24a40..9b1663d 100644
|
|
--- a/lib/uri/rfc3986_parser.rb
|
|
+++ b/lib/uri/rfc3986_parser.rb
|
|
@@ -100,7 +100,7 @@ module URI
|
|
QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
|
|
FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
|
|
OPAQUE: /\A(?:[^\/].*)?\z/,
|
|
- PORT: /\A[\x09\x0a\x0c\x0d ]*\d*[\x09\x0a\x0c\x0d ]*\z/,
|
|
+ PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/,
|
|
}
|
|
end
|
|
|
|
diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb
|
|
index 721e05e..cee0acb 100644
|
|
--- a/test/uri/test_parser.rb
|
|
+++ b/test/uri/test_parser.rb
|
|
@@ -91,4 +91,14 @@ class URI::TestParser < Test::Unit::TestCase
|
|
end
|
|
end
|
|
end
|
|
+
|
|
+ def test_rfc3986_port_check
|
|
+ pre = ->(length) {"\t" * length + "a"}
|
|
+ uri = URI.parse("http://my.example.com")
|
|
+ assert_linear_performance((1..5).map {|i| 10**i}, pre: pre) do |port|
|
|
+ assert_raise(URI::InvalidComponentError) do
|
|
+ uri.port = port
|
|
+ end
|
|
+ end
|
|
+ end
|
|
end
|
|
--
|
|
2.25.1
|
|
|