Handle too long dates passed to DateTime.parse #1469
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rosa
commented
Jan 3, 2022
lib/mail/fields/common_date_field.rb
Outdated
| def with_invalid_date_time_error_handling(&block) | ||
| yield | ||
| rescue ArgumentError => e | ||
| raise unless e.message =~ /\A(invalid date|string length \(\d+\) exceeds the limit \d+)\z/ |
There was a problem hiding this comment.
Perhaps this should live in Mail::Utilities so it's used from here and from ReceivedElement.
There was a problem hiding this comment.
Yes, please move it into utilities.
mikel
requested changes
Dec 3, 2022
lib/mail/fields/common_date_field.rb
Outdated
| def with_invalid_date_time_error_handling(&block) | ||
| yield | ||
| rescue ArgumentError => e | ||
| raise unless e.message =~ /\A(invalid date|string length \(\d+\) exceeds the limit \d+)\z/ |
There was a problem hiding this comment.
Yes, please move it into utilities.
| @@ -27,7 +27,7 @@ def to_s(*args) | |||
| def datetime_for(received) | |||
| ::DateTime.parse("#{received.date} #{received.time}") | |||
| rescue ArgumentError => e | |||
| raise e unless e.message == 'invalid date' | |||
| raise unless e.message =~ /\A(invalid date|string length \(\d+\) exceeds the limit \d+)\z/ | |||
There was a problem hiding this comment.
Let's call the utility method you will create. One place to keep this up to date makes sense.
|
Thanks a lot for the review, @mikel! I'll get these changes implemented this week, I hope. |
Since Ruby 3.0.3, this method raises an ArgumentError with a different message from the invalid date message, as mitigation for CVE-2021-41817. https://www.ruby-lang.org/en/news/2021/11/15/date-parsing-method-regexp-dos-cve-2021-41817/ Example: ArgumentError: string length (150) exceeds the limit 128 In this case we should just return nil, like when the date itself is invalid.
|
Implemented the changes requested 😊 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since Ruby 3.0.3, this method raises an
ArgumentErrorwith a different message from the invalid date message, as mitigation for CVE-2021-41817.This PR handles this error to return
nil, just like when the date is invalid.