bugfix: dot segment handling #2835
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
added 2 commits
November 22, 2023 13:31
SamRemis
requested changes
Nov 22, 2023
| && strpos($relative, '//') === 0 | ||
| //Append path to endpoint when leading '//...' or | ||
| // '../' present as uri cannot be properly resolved | ||
| if (($this->api->isModifiedModel() |
There was a problem hiding this comment.
these parentheses look like they were added by mistake
| ){ | ||
| return new Uri( | ||
| $this->endpoint | ||
| . (strpos($relative, '/') !== 0 ? '/' : '') |
There was a problem hiding this comment.
So this is just making relative start with a slash if it doesn't? I might refactor this to say
if ($relative && $relative[0] != '/') {
$relative = '/' . $relative;
}
return new Uri($this->endpoint . $relative);
if you think that looks better.
There was a problem hiding this comment.
Also, could we just move this up to the if statement above and short-circuit this around line 244?
SamRemis
approved these changes
Nov 22, 2023
SamRemis
approved these changes
Nov 22, 2023
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.
Description of changes:
Bypasses Guzzle's UriResolver for request paths that contain
../parent path references. Previously, the UriResolver would strip dot segments, leading to a situation where objects other than the intended target could be created or accessed.By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.