Validate types assigned to LookupContext#formats= #35661
Merged
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
This also removes the mutation we were performing on the values being passed in.
Having a format listed twice had no effect. This is mostly helpful to avoid an extra format when assigning [:html, "*/*"]
This is a developer quality of life improvement, to ensure that unknown formats aren't assigned (which it would previously accept, but wouldn't work 100% correctly due to caching).
tijmenb
added a commit
to tijmenb/mail-notify
that referenced
this pull request
Oct 21, 2019
Rails 6.0.0 introduced a check on the `formats` that you can render: rails/rails#35661 Since that commit, you can only specify the `formats` as symbols, not strings. The render statement in the actionmailer controller was updated in the PR as well: https://github.com/rails/rails/pull/35661/files#diff-32907ca93d739460000 a3f554515caa4 This commit introduces the fix to our controller too. Without this, the preview page will raise an error: ``` ArgumentError: Invalid formats: "html" # ./lib/mail/notify/mailers_controller.rb:28:in `render_preview_wrapper' ```
tijmenb
added a commit
to tijmenb/mail-notify
that referenced
this pull request
Oct 21, 2019
Rails 6.0.0 introduced a check on the `formats` that you can render: rails/rails#35661 Since that commit, you can only specify the `formats` as symbols, not strings. The render statement in the actionmailer controller was updated in the PR as well: https://github.com/rails/rails/pull/35661/files#diff-32907ca93d739460000 a3f554515caa4 This commit introduces the fix to our controller too. Without this, the preview page will raise an error: ``` ArgumentError: Invalid formats: "html" # ./lib/mail/notify/mailers_controller.rb:28:in `render_preview_wrapper' ```
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.
This was developed when looking into CVE-2019-5418, but wasn't required to fix the vulnerability.
This is a developer quality of life improvement, to ensure that unknown formats aren't assigned to the LookupContext (which it would previously accept, but wouldn't work 100% correctly due to caching).
This also now avoids mutating the values passed in, removes
nils, and makes the formats uniq.cc @tenderlove @kaspth