gh-69589, gh-84774: Fix path normalization in urllib.parse.urljoin()#126679
Open
serhiy-storchaka wants to merge 2 commits intopython:mainfrom
Open
gh-69589, gh-84774: Fix path normalization in urllib.parse.urljoin()#126679serhiy-storchaka wants to merge 2 commits intopython:mainfrom
serhiy-storchaka wants to merge 2 commits intopython:mainfrom
Conversation
…e.urljoin() * Preserve double slashes in path. * Fix the case when the base path is relative and the relative reference path starts with '..'.
serhiy-storchaka
force-pushed
the
urllib-urljoin-remove-dot-segments
branch
from
659a910 to
26f0b9e
Compare
serhiy-storchaka
changed the title
serhiy-storchaka
changed the title
serhiy-storchaka
changed the title
andersk
reviewed
Nov 11, 2024
| self.checkJoin('http://a', scheme + './//', 'http://a//') | ||
|
|
||
| self.checkJoin('b/c', '', 'b/c') | ||
| self.checkJoin('b/c', '//', 'b/c') |
Contributor
There was a problem hiding this comment.
RFC 3986 carefully distinguishes between undefined and empty, and // has an empty authority, not undefined, so we should hit the if defined(R.authority) branch in §5.2.2. The result should be //.
(This is independent of the discussion of #96015, I think.)
Member
Author
There was a problem hiding this comment.
Yes, I know. I left them non-distinguished for compatibility. We will likely change this in a separate issue.
| self.checkJoin('b/c', '//v', '//v') | ||
| self.checkJoin('b/c', '//v/w', '//v/w') | ||
| self.checkJoin('b/c', '/w', '/w') | ||
| self.checkJoin('b/c', '///w', '/w') |
Contributor
There was a problem hiding this comment.
Same; the result should be ///w.
Comment on lines
+760
to
+768
| self.checkJoin('b/c', '../../w', 'w') | ||
| self.checkJoin('b/c', '../../../w', 'w') | ||
| self.checkJoin('b/c', 'w/.', 'b/w/') | ||
| self.checkJoin('b/c', '../w/.', 'w/') | ||
| self.checkJoin('b/c', '../../w/.', 'w/') | ||
| self.checkJoin('b/c', '../../../w/.', 'w/') | ||
| self.checkJoin('b/c', '..', '') | ||
| self.checkJoin('b/c', '../..', '') | ||
| self.checkJoin('b/c', '../../..', '') |
Contributor
There was a problem hiding this comment.
Although these fall outside the direct scope of the pseudocode defined in RFC 3986 because b/c is not an absolute base URI, they violate the obvious expectation that urljoin should be associative. See
Given non–RFC 3986 input where the base URI is path-relative (undefined scheme, undefined authority, and path not beginning with /), we should preserve extra initial .. components in the output:
Suggested change
| self.checkJoin('b/c', '../../w', 'w') | |
| self.checkJoin('b/c', '../../../w', 'w') | |
| self.checkJoin('b/c', 'w/.', 'b/w/') | |
| self.checkJoin('b/c', '../w/.', 'w/') | |
| self.checkJoin('b/c', '../../w/.', 'w/') | |
| self.checkJoin('b/c', '../../../w/.', 'w/') | |
| self.checkJoin('b/c', '..', '') | |
| self.checkJoin('b/c', '../..', '') | |
| self.checkJoin('b/c', '../../..', '') | |
| self.checkJoin('b/c', '../../w', '../w') | |
| self.checkJoin('b/c', '../../../w', '../../w') | |
| self.checkJoin('b/c', 'w/.', 'b/w/') | |
| self.checkJoin('b/c', '../w/.', 'w/') | |
| self.checkJoin('b/c', '../../w/.', '../w/') | |
| self.checkJoin('b/c', '../../../w/.', '../../w/') | |
| self.checkJoin('b/c', '..', '') | |
| self.checkJoin('b/c', '../..', '..') | |
| self.checkJoin('b/c', '../../..', '../..') |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Uh oh!
There was an error while loading. Please reload this page.