This repository has been archived by the owner on Jan 8, 2020. It is now read-only.
Hostname route should throw an exception if route definition contains disallowed character #6870
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
… disallowed character Fixes zendframework#5656
| @@ -116,6 +116,9 @@ protected function parseRouteDefinition($def) | |||
|
|
|||
| while ($currentPos < $length) { | |||
| preg_match('(\G(?P<literal>[a-z0-9-.]*)(?P<token>[:{\[\]]|$))', $def, $matches, 0, $currentPos); | |||
| if (empty($matches)) { | |||
There was a problem hiding this comment.
@adamlundrigan doesn't preg_match() return a bool?
There was a problem hiding this comment.
It returns a bool in case of an error. When there are not matches 0 is returned.
preg_match() returns 1 if the pattern matches given subject, 0 if it does not, or FALSE if an error occurred.
There was a problem hiding this comment.
An alternative:
if ( 1 !== preg_match('(\G(?P<literal>[a-z0-9-.]*)(?P<token>[:{\[\]]|$))', $def, $matches, 0, $currentPos) ) {
throw new Exception\RuntimeException('Matched hostname literal contains a disallowed character');
}
Functionally identical, just all on one line. @Ocramius I can update the PR if you'd prefer I check the result this way.
There was a problem hiding this comment.
Why so complicated?
// No matches found, or error occured - distinction not necessary, as both cases are actually faulty here
if (!preg_match(..., $matches, ...)) {
throw ...;
}
// else: We DO have $matches here
There was a problem hiding this comment.
Indeed, I think @Pittiplatsch's approach is good enuff.
Ocramius
added a commit
that referenced
this pull request
Nov 22, 2014
…in-route-definition' into develop Close #6870
|
@adamlundrigan merged into |
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.
If a hostname route is constructed with a route containing a disallowed character (one outside of
[a-z0-9-.]) a RuntimeException should be thrown, as the route is misconfigured.Fixes #5656