Fixing #9517 - bad url-pattern prefix match behavior #9518
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
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
joakime
added
Bug
joakime
commented
Mar 17, 2023
| @@ -223,13 +230,13 @@ public MatchedResource<E> getMatched(String path) | |||
| // Loop 3: "foo" | |||
| while ((i = path.indexOf('.', i + 1)) > 0) | |||
| { | |||
| prefix = _suffixMap.get(path, i + 1, path.length() - i - 1); | |||
| if (prefix == null) | |||
| MappedResource<E> suffix = _suffixMap.get(path, i + 1, path.length() - i - 1); | |||
There was a problem hiding this comment.
Just renamed "prefix" here to "suffix" to be more clear about usage.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
More efficient loop. Also optimized mapping Signed-off-by: gregw <gregw@webtide.com>
|
@joakime I pushed an update to the loop that uses the length of the last match to improve the search for a shorter match. Much better than searching on every string length. However, I don't like the magic number 3 (which is the "/*" minus 1 more), but I think it works. Could perhaps have more testing of 1 char patterns? Also there was another optimized prefix match that needs same fix. |
improved test Signed-off-by: gregw <gregw@webtide.com>
gregw
previously approved these changes
Mar 19, 2023
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
sbordet
requested changes
Mar 20, 2023
jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java
Outdated
Show resolved
Hide resolved
jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java
Outdated
Show resolved
Hide resolved
jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java
Outdated
Show resolved
Hide resolved
jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathMappings.java
Outdated
Show resolved
Hide resolved
jetty-http/src/test/java/org/eclipse/jetty/http/pathmap/PathMappingsTest.java
Show resolved
Hide resolved
jetty-http/src/test/java/org/eclipse/jetty/http/pathmap/PathMappingsTest.java
Show resolved
Hide resolved
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
sbordet
approved these changes
Mar 20, 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.
New testcase to ensure we don't have a regression on this behavior.
Restore a prefix matching loop that we previously had in Jetty 10.0.13