This repository has been archived by the owner on Nov 1, 2017. It is now read-only.
Allow regexp for a allowed_request_origins array #130
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
adamliesko
changed the title
| @@ -180,6 +180,11 @@ def allow_request_origin? | |||
| end | |||
| end | |||
|
|
|||
| def allowed_origins_match? origin | |||
| allowed_origins = Array(server.config.allowed_request_origins) | |||
| allowed_origins.any? { |allowed_origin| allowed_origin.is_a?(Regexp) ? allowed_origin =~ origin : allowed_origin == origin } | |||
There was a problem hiding this comment.
You could use the === operator to match both strings and regexes, so the class check wouldn't be required.
allowed_origins.any? { |allowed_origin| allowed_origin === origin }
There was a problem hiding this comment.
Actually, given this, we don't need the extra method. We can just inline this === check like we had the original include call.
There was a problem hiding this comment.
Sure, that makes sense. Thanks.
There was a problem hiding this comment.
@adamliesko I don't think this method is used anymore and can be removed.
adamliesko
force-pushed
the
allow_regexps_allowed_origins
branch
from
4687f06
to
0bbeba3
Compare
|
@adamliesko Do you want to wrap up these changes? Then we can merge. |
adamliesko
force-pushed
the
allow_regexps_allowed_origins
branch
from
54b8dcf
to
09e10ef
Compare
|
@dhh I have updated the |
dhh
added a commit
that referenced
this pull request
Dec 13, 2015
Allow regexp for a allowed_request_origins array
|
👏 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Adding the feature of additional regexp check for
allowed_origin_requestsinstead of only strict equal comparation.Fixes #130