Replace origin_whitelist with permitted_origins #1625
Merged
+14
−7
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
rhymes
changed the title
|
@jkowens done :) |
|
Awesome, thanks! Hopefully we can fix the build in the near term, just to confirm this stays green. I don't think it should be too hard to remove Thin, but of course those are famous last words 😅 |
|
@jkowens rebased on top of master, tests pass! :D |
jkowens
reviewed
Jul 12, 2020
|
|
||
| if options.key? :origin_whitelist | ||
| warn "Rack::Protection origin_whitelist option is deprecated and will be removed, " \ | ||
| "use origin_whitelist instead.\n" |
There was a problem hiding this comment.
@rhymes just realized this warning message needs tweaked 😄
There was a problem hiding this comment.
ahahaha great catch!
|
@namusyaka can we go ahead and merge this in for the 2.1 release? |
namusyaka
approved these changes
Jul 12, 2020
| expect(send(method.downcase, '/', {}, 'HTTP_ORIGIN' => 'http://malicious.com')).not_to be_ok | ||
| end | ||
|
|
||
| it "accepts #{method} requests with whitelisted Origin" do | ||
| mock_app do | ||
| use Rack::Protection::HttpOrigin, :origin_whitelist => ['http://www.friend.com'] | ||
| use Rack::Protection::HttpOrigin, :permitted_origins => ['http://www.friend.com'] |
There was a problem hiding this comment.
perimitted_origins: ['http://www.friend.com'] ?
|
Thank you @namusyaka! |
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.
permitted_originin lieu oforigin_whitelistorigin_whitelistwith a warningCloses #1620