Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick of Improvements to PathSpec for Jetty 10.0.x #8136

Merged
merged 7 commits into from
Jun 8, 2022

Conversation

joakime
Copy link
Contributor

@joakime joakime commented Jun 7, 2022

From PR: #7947
From commit: 5b4d1dd

Signed-off-by: Joakim Erdfelt joakim.erdfelt@gmail.com

From commit: 5b4d1dd

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime joakime added Enhancement Sponsored This issue affects a user with a commercial support agreement labels Jun 7, 2022
@joakime joakime requested review from gregw and sbordet June 7, 2022 20:21
@joakime joakime self-assigned this Jun 7, 2022
@joakime joakime added this to In progress in Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶 via automation Jun 7, 2022
@joakime joakime moved this from In progress to Reviewer approved in Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶 Jun 7, 2022
@joakime joakime moved this from Reviewer approved to Review in progress in Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶 Jun 7, 2022
@joakime joakime linked an issue Jun 7, 2022 that may be closed by this pull request
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@gregw
Copy link
Contributor

gregw commented Jun 7, 2022

@joakime this looks to have broken a lot of tests... which don't look like flakes ?

@joakime
Copy link
Contributor Author

joakime commented Jun 7, 2022

Yes, some things I appear to have missed.
I'll take care of them.

@joakime joakime marked this pull request as draft June 8, 2022 03:16
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
sbordet
sbordet previously approved these changes Jun 8, 2022
Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶 automation moved this from Review in progress to Reviewer approved Jun 8, 2022
@sbordet
Copy link
Contributor

sbordet commented Jun 8, 2022

@joakime is this still a draft?

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶 automation moved this from Reviewer approved to Review in progress Jun 8, 2022
@joakime joakime marked this pull request as ready for review June 8, 2022 13:03
@joakime
Copy link
Contributor Author

joakime commented Jun 8, 2022

@sbordet I flagged it as draft as it wasn't ready yet.
There were still a few bugs to work out.

I believe I've fixed the final issues.
In the process I discovered a corner case with RegexPathSpec that needs a backport to Jetty 9.4.x (see commit 4e419d8)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime joakime requested a review from sbordet June 8, 2022 17:31
Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶 automation moved this from Review in progress to Reviewer approved Jun 8, 2022
@joakime joakime merged commit 8de5515 into jetty-10.0.x Jun 8, 2022
Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶 automation moved this from Reviewer approved to Done Jun 8, 2022
@joakime joakime deleted the fix/cherrypick-improved-pathspec branch June 8, 2022 17:36
joakime added a commit that referenced this pull request Oct 6, 2022
* Cherry-pick of Improvements to PathSpec.
* From commit: 5b4d1dd
* Fixing ConstraintSecurityHandler usage of PathMappings
* Fixing bad INCLUDE logic from cherry-pick in ServletHandler.doScope()
* Cleanup of non ServletPathSpec behaviors in ServletPathMapping class
* Skip optional group name/info lookup if regex fails.
* Prevent NPE on static servletPathMappings
* Update WebSocketMappings to use new PathMappings.getMatched(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement Sponsored This issue affects a user with a commercial support agreement
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Improve PathSpec handling with Regex
3 participants