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

Jump to bottom

Allow overriding of url-pattern mapping in ServletContextHandler to allow for regex or uri-template matching #7748

Closed
joakime opened this issue Mar 16, 2022 · 3 comments · Fixed by #7614 or #7834
Closed

Allow overriding of url-pattern mapping in ServletContextHandler to allow for regex or uri-template matching #7748

joakime opened this issue Mar 16, 2022 · 3 comments · Fixed by #7614 or #7834
Assignees
@joakime
Labels
Enhancement Sponsored This issue affects a user with a commercial support agreement
Projects
Jetty 10.0.9/11.0.9 (FROZEN) Jetty 12.0.ALPHA1 Jetty 9.4.47 - 🧊 FROZEN 🥶 Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶

Comments

@joakime
Copy link
Contributor

joakime commented Mar 16, 2022 •
edited

Target Jetty version(s)
10.0.9

Enhancement Description

The current ServletContextHandler does it's job nicely with regards to Servlet "url-pattern" based lookups of mapped servlets and filters.
But internally our Path Mapping layer (at org.eclipse.jetty.http.pathmap) supports Regex and UriTemplate as well as the original Servlet url-pattern.

Rework ServletContextHandler to allow more sophisticated embedded use of the regex and uri-template options for mapping as well.
@joakime joakime added Enhancement Sponsored This issue affects a user with a commercial support agreement labels Mar 16, 2022
@joakime joakime self-assigned this Mar 16, 2022
@joakime joakime added this to To do in Jetty 10.0.9/11.0.9 (FROZEN) via automation Mar 16, 2022
@joakime joakime linked a pull request Mar 16, 2022 that will close this issue
Added test for Regex mapping for Servlet #7614
Merged
joakime pushed a commit that referenced this issue Mar 16, 2022
@gregw @joakime
Issue #7748 - allow override of path mapping behavior in ServletConte…
1dc3b93 
…xtHandler

+ needed to open up ServletHandler to allow regex mappings

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime joakime moved this from To do to In progress in Jetty 10.0.9/11.0.9 (FROZEN) Mar 16, 2022
Jetty 10.0.9/11.0.9 (FROZEN) automation moved this from In progress to Done Mar 22, 2022
gregw added a commit that referenced this issue Mar 22, 2022
@gregw
Issue #7748 - allow override of path mapping behavior in ServletConte…
cab9945 
…xtHandler (#7614)

Added protected method to ServletHandler to allow other servlet mappings (eg regex) in embedded/extended usage

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@gregw
Copy link
Contributor

gregw commented Mar 22, 2022

Needs merging to 12.

@gregw gregw reopened this Mar 22, 2022
Jetty 10.0.9/11.0.9 (FROZEN) automation moved this from Done to In progress Mar 22, 2022
@gregw gregw added this to To do in Jetty 12.0.ALPHA1 via automation Mar 22, 2022
@gregw gregw moved this from In progress to Done in Jetty 10.0.9/11.0.9 (FROZEN) Mar 22, 2022
@gregw
Copy link
Contributor

gregw commented Apr 4, 2022

We may also need this in a 9.4 release

gregw added a commit that referenced this issue Apr 4, 2022
@gregw
Issue #7748 - allow override of path mapping behavior in ServletConte…
690d294 
…xtHandler

+ needed to open up ServletHandler to allow regex mappings

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
gregw added a commit that referenced this issue Apr 4, 2022
@gregw
Fixes to backport of #7748
1b9a3ea 
+ Fix RegexPathSpec pathInfo
+ Test regression option to 93 behaviour

Signed-off-by: Greg Wilkins <gregw@webtide.com>
@gregw gregw mentioned this issue Apr 4, 2022
Merged
@joakime joakime linked a pull request Apr 4, 2022 that will close this issue
Issue #7748 - Backport of allow override of path mapping behavior in ServletContextHandler #7834
Merged
gregw added a commit that referenced this issue Apr 4, 2022
@gregw
Fixes to backport of #7748
bede25a 
+ fixed cpyright headers

Signed-off-by: Greg Wilkins <gregw@webtide.com>
gregw added a commit that referenced this issue Apr 5, 2022
@gregw
Fixes to backport of #7748
95b2e41 
+ Updated UriTemplatePathSpec.java

Signed-off-by: Greg Wilkins <gregw@webtide.com>
gregw added a commit that referenced this issue Apr 5, 2022
@gregw
Fixes to backport of #7748
63baa1a 
+ Backport of #7748
+ Fix RegexPathSpec pathInfo
+ Fix UriTemplatePathSpec pathInfo
+ Test regression option to 93 behaviour

Signed-off-by: Greg Wilkins <gregw@webtide.com>
gregw added a commit that referenced this issue Apr 5, 2022
@gregw
Fixes to backport of #7748
2a859c0 
+ Backport of #7748
+ Fix RegexPathSpec pathInfo
+ Fix UriTemplatePathSpec pathInfo
+ Test regression option to 93 behaviour

Signed-off-by: Greg Wilkins <gregw@webtide.com>
@gregw gregw mentioned this issue Apr 5, 2022
Merged
@joakime joakime added this to To do in Jetty 9.4.47 - 🧊 FROZEN 🥶 via automation Apr 5, 2022
@joakime joakime added this to To do in Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶 via automation Apr 5, 2022
@joakime joakime moved this from To do to In progress in Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶 Apr 5, 2022
@joakime joakime moved this from To do to In progress in Jetty 9.4.47 - 🧊 FROZEN 🥶 Apr 5, 2022
gregw added a commit that referenced this issue Apr 6, 2022
@gregw
Fixes to backport of #7748 (#7834)
41ba531 
+ Backport of #7748
+ Fix RegexPathSpec pathInfo
+ Fix UriTemplatePathSpec pathInfo
+ Test regression option to 93 behaviour

Signed-off-by: Greg Wilkins <gregw@webtide.com>
gregw added a commit that referenced this issue Apr 6, 2022
@gregw
Issue #7748 - Merge PathSpec improvements made in 9.4.x (#7845)
5fc63bf 
* Fixes to backport of #7748

+ Backport of #7748
+ Fix RegexPathSpec pathInfo
+ Fix UriTemplatePathSpec pathInfo
+ Test regression option to 93 behaviour

* small optimization

Signed-off-by: Greg Wilkins <gregw@webtide.com>
gregw added a commit that referenced this issue Apr 6, 2022
@gregw
Issue #7748 - Merge PathSpec improvements made in 9.4.x (#7845)
a278d75 
* Fixes to backport of #7748

+ Backport of #7748
+ Fix RegexPathSpec pathInfo
+ Fix UriTemplatePathSpec pathInfo
+ Test regression option to 93 behaviour

* small optimization

Signed-off-by: Greg Wilkins <gregw@webtide.com>
gregw added a commit that referenced this issue Apr 6, 2022
@gregw
Applied fix from #7748 missed by cherry-pick
3fb8d52
@gregw
Copy link
Contributor

gregw commented Apr 6, 2022

Closing as:

  • cherry picked 10 to 9
  • improved in 9
  • cherry picked 9 to 10
  • merged to 11
  • cherry picked to 12
  • manually fixed when cherry-pick to 12 missed the renamed files!

whew!

This was referenced Apr 7, 2022
Closed
Closed
@joakime joakime closed this as completed Apr 7, 2022
Jetty 12.0.ALPHA1 automation moved this from To do to Done Apr 7, 2022
Jetty 9.4.47 - 🧊 FROZEN 🥶 automation moved this from In progress to Done Apr 7, 2022
Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶 automation moved this from In progress to Done Apr 7, 2022
joakime pushed a commit that referenced this issue Oct 6, 2022
@gregw @joakime
Issue #7748 - allow override of path mapping behavior in ServletConte…
024a053 
…xtHandler (#7614)

Added protected method to ServletHandler to allow other servlet mappings (eg regex) in embedded/extended usage

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@olamy olamy mentioned this issue Dec 26, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@joakime joakime

Labels
Enhancement Sponsored This issue affects a user with a commercial support agreement
Projects
No open projects
Jetty 10.0.10/11.0.10 - 🧊 FROZEN 🥶
  
Done
Jetty 10.0.9/11.0.9 (FROZEN)
  
Done
Jetty 12.0.ALPHA1
  
Done
Jetty 9.4.47 - 🧊 FROZEN 🥶
  
Done
Milestone
No milestone
2 participants
@gregw @joakime