Support URLencoding during normalization #396
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
raboof
force-pushed
the
urldecoded-normalization
branch
3 times, most recently
from
af17cb7 to
6c12c74
Compare
raboof
force-pushed
the
urldecoded-normalization
branch
4 times, most recently
from
6f73d37 to
e421bfd
Compare
garydgregory
reviewed
Jan 8, 2024
commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
Outdated
Show resolved
Hide resolved
garydgregory
reviewed
Jan 8, 2024
| private int cursor = 0; | ||
| private int lastSeparator; | ||
| private int end; | ||
| PathNormalizer(StringBuilder path) { |
garydgregory
requested changes
Jan 8, 2024
| boolean reading = true; | ||
| while (reading) { | ||
| reading = readNonSeparator(); | ||
| } |
There was a problem hiding this comment.
Simpler to say `while (readNonSeparator()); ?
There was a problem hiding this comment.
hmm, it seems PMD won't let me
| } | ||
| return false; | ||
| } | ||
| private boolean readDot() { |
There was a problem hiding this comment.
Nit: Add a blank line b/w methods.
commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/UriParser.java
Outdated
Show resolved
Hide resolved
raboof
force-pushed
the
urldecoded-normalization
branch
from
e421bfd to
8f33bb3
Compare
Earlier, the path would be URL-decoded after normalization. This meant some opportunities for normalization would be missed when dots or slashes were URL-encoded. One way to solve this would be to change the ordering of operations, but that seems risky as it would change the meaning of some of the abstractions. Because of that I opted for a more conservative approach, where normalization will take into account URL-encoded characters, but otherwise leave the input string intact.
raboof
force-pushed
the
urldecoded-normalization
branch
from
8f33bb3 to
f1611bf
Compare
|
@raboof |
|
Ah, rebase mistake... thx for the fix, not sure what's going on with |
Might need some more reviewing to make sure this logic is correct
raboof
force-pushed
the
urldecoded-normalization
branch
from
444ac4a to
31e0882
Compare
Run mvn before you push to catch build errors 😉 |
raboof
force-pushed
the
urldecoded-normalization
branch
from
31e0882 to
ec42e65
Compare
raboof
force-pushed
the
urldecoded-normalization
branch
from
01b8934 to
c95b48d
Compare
I know ;) - some of the tests are failing or very slow on my machine (even on the main branch), probably because I'm running in a sandbox, so I've been running individual targets - sorry about the noise ;) . Now getting 500's that are not our fault it looks like though, https://www.githubstatus.com/ Do you want me to squash the commits above? |
|
Don't worry about the noise 😉 |
|
Looks like we'll have to wait for GH to fix itself... |
|
Re-running builds now that GH is back up... |
garydgregory
added a commit
that referenced
this pull request
Jan 9, 2024
raboof
added a commit
to raboof/commons-vfs
that referenced
this pull request
Jun 26, 2024
The reverts apache#396 and related changes and implements the same in a simpler way by replacing the encoded characters already in `fixSeparators`. This approach has a slightly higher risk at breaking existing behaviour, but a lower risk of remaining problems in this part of the codebase. All testcases still succeed. This PR is intended to replace apache#543 and apache#555 This reverts commit cb45c94. This reverts commit 5399c76.
raboof
added a commit
to raboof/commons-vfs
that referenced
this pull request
Jun 26, 2024
The reverts apache#396 and related changes and implements the same in a simpler way by replacing the encoded characters already in `fixSeparators`. This approach has a slightly higher risk at breaking existing behaviour, but a lower risk of remaining problems in this part of the codebase. All testcases still succeed. This PR is intended to replace apache#543 and apache#555. It includes the testcases from apache#543, adapted to the behaviour before apache#396. This reverts commit cb45c94. This reverts commit 5399c76. Co-Authored-By: Anthony Goubard <[email protected]>
Merged
raboof
added a commit
to raboof/commons-vfs
that referenced
this pull request
Jun 26, 2024
The reverts apache#396 and related changes and implements the same in a simpler way by replacing the encoded characters already in `fixSeparators`. This approach has a slightly higher risk at breaking existing behaviour, but a lower risk of remaining problems in this part of the codebase. All testcases still succeed. This PR is intended to replace apache#543 and apache#555. It includes the testcases from apache#543, adapted to the behaviour before apache#396. This reverts commit cb45c94. This reverts commit 5399c76. Co-Authored-By: Anthony Goubard <[email protected]>
raboof
added a commit
to raboof/commons-vfs
that referenced
this pull request
Jul 25, 2024
The reverts apache#396 and related changes and implements the same in a simpler way by replacing the encoded characters already in `fixSeparators`. This approach has a slightly higher risk at breaking existing behaviour, but a lower risk of remaining problems in this part of the codebase. All testcases still succeed. This PR is intended to replace apache#543 and apache#555. It includes the testcases from apache#543, adapted to the behaviour before apache#396. This reverts commit cb45c94. This reverts commit 5399c76. Co-Authored-By: Anthony Goubard <[email protected]>
garydgregory
pushed a commit
that referenced
this pull request
Jul 27, 2024
* Simplify UriParser The reverts #396 and related changes and implements the same in a simpler way by replacing the encoded characters already in `fixSeparators`. This approach has a slightly higher risk at breaking existing behaviour, but a lower risk of remaining problems in this part of the codebase. All testcases still succeed. This PR is intended to replace #543 and #555. It includes the testcases from #543, adapted to the behaviour before #396. This reverts commit cb45c94. This reverts commit 5399c76. Co-Authored-By: Anthony Goubard <[email protected]> * Add benchmark for UriParser --------- Co-authored-by: Anthony Goubard <[email protected]>
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.
Earlier, the path would be URL-decoded after normalization. This meant some opportunities for normalization would be missed when dots or slashes were URL-encoded.
One way to solve this would be to change the ordering of operations, but that seems risky as it would change the meaning of some of the abstractions. Because of that I opted for a more conservative approach, where normalization will take into account URL-encoded characters, but otherwise leave the input string intact.