From 957bb7cb81995f26c671afce0ee50a5c660e540e Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 29 Mar 2023 13:28:25 +0900 Subject: [PATCH] CVE-2023-28756 CVE: CVE-2023-28756 Upstream-Status: Backport [https://github.com/ruby/ruby/commit/957bb7cb81995f26c671afce0ee50a5c660e540e] Signed-off-by: Hitendra Prajapati --- lib/time.rb | 6 +++--- test/test_time.rb | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/time.rb b/lib/time.rb index f27bacd..4a86e8e 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -501,8 +501,8 @@ class Time (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+ (\d{2,})\s+ (\d{2})\s* - :\s*(\d{2})\s* - (?::\s*(\d{2}))?\s+ + :\s*(\d{2}) + (?:\s*:\s*(\d\d))?\s+ ([+-]\d{4}| UT|GMT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|[A-IK-Z])/ix =~ date # Since RFC 2822 permit comments, the regexp has no right anchor. @@ -717,7 +717,7 @@ class Time # # If self is a UTC time, Z is used as TZD. [+-]hh:mm is used otherwise. # - # +fractional_digits+ specifies a number of digits to use for fractional + # +fraction_digits+ specifies a number of digits to use for fractional # seconds. Its default value is 0. # # require 'time' diff --git a/test/test_time.rb b/test/test_time.rb index ca20788..4f11048 100644 --- a/test/test_time.rb +++ b/test/test_time.rb @@ -62,6 +62,15 @@ class TestTimeExtension < Test::Unit::TestCase # :nodoc: assert_equal(true, t.utc?) end + def test_rfc2822_nonlinear + pre = ->(n) {"0 Feb 00 00 :00" + " " * n} + assert_linear_performance([100, 500, 5000, 50_000], pre: pre) do |s| + assert_raise(ArgumentError) do + Time.rfc2822(s) + end + end + end + def test_encode_rfc2822 t = Time.utc(1) assert_equal("Mon, 01 Jan 0001 00:00:00 -0000", t.rfc2822) -- 2.25.1