Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,118 Commits 61 Branches 460 Tags 355 MiB
Commit Graph

504 Commits

Author SHA1 Message Date
Joakim Erdfelt ad406ac44c
Cleaning up test cases with eye on work/temp file management 2022-10-18 07:50:44 -05:00
Lachlan Roberts cccc16c03e Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-10-18 22:28:13 +11:00
Joakim Erdfelt 00c06738f0
Use MavenPaths where appropriate (ee9 -> ee8 conversion helper) 2022-10-17 15:23:24 -05:00
Joakim Erdfelt 28c34d402e
Use WebAppContext.getResourceFactory() 2022-10-17 15:23:03 -05:00
Joakim Erdfelt 2badb454b3
Fixed war file unpacking 2022-10-17 15:22:32 -05:00
Joakim Erdfelt 62db79b791
Improved addClassPath and addJars behavior 
+ Less code
+ Corrected javadoc
 2022-10-17 15:22:16 -05:00
Joakim Erdfelt bb887c9c81
Don't add bad URIs, and log if they don't point to anything 2022-10-17 15:22:00 -05:00
Joakim Erdfelt b1c00223aa
Protect on bad container resources 2022-10-17 15:21:33 -05:00
Joakim Erdfelt 02142c2e30
Improved warning on bad descriptor 2022-10-17 15:21:19 -05:00
Joakim Erdfelt 6ab8aa8d30
Skip welcomeServlet logic if requestTarget 
does not resolve.
 2022-10-17 15:21:04 -05:00
Joakim Erdfelt feadf3f56e
Improved setup of TestMetaData 2022-10-17 15:18:02 -05:00
Joakim Erdfelt d84de5d847
Improved reliability of test 2022-10-17 15:17:27 -05:00
Joakim Erdfelt 6b2425a23f
Improved ClassMatcher/Location behavior. 
+ Reduces need for Resource / ResourceFactory.
+ Corrected path equals logic
 2022-10-17 15:16:50 -05:00
Joakim Erdfelt f27e4e7273
Improved ClassMatcher/Location behavior. 
+ Reduces need for Resource / ResourceFactory.
+ Corrected path equals logic
 2022-10-17 15:16:39 -05:00
Joakim Erdfelt 564275280b
Failing on bad Runner inputs 2022-10-17 15:15:30 -05:00
Joakim Erdfelt 81b1a6688d
Better use of WebAppContext.getResourceFactory() 2022-10-17 15:15:05 -05:00
Jan Bartel d47c25d7c5 Reenable ee10 WebAppDefaultServletTest 2022-10-17 14:05:22 +11:00
Simone Bordet a6f5e1fe8f
Merge pull request #8705 from eclipse/jetty-12.0.x-reenable-customrequestlog 
Jetty 12 - Re-enabled RequestLog tests.
 2022-10-14 10:30:12 +02:00
Joakim Erdfelt 45e706cb67
Move Resource.combine() methods to ResourceFactory 2022-10-13 14:08:21 -05:00
Joakim Erdfelt 28d448aef6
Fixing directory location name for additional classpath elements 2022-10-13 09:59:07 -05:00
Joakim Erdfelt a8e81ebb39
Using WorkDir properly 2022-10-13 09:57:12 -05:00
Joakim Erdfelt 06d82d30e5
Making tokenPath creating reliable 2022-10-13 09:56:33 -05:00
Joakim Erdfelt 39f77f7e26
Increasing reliability of test on ee9/ee8 2022-10-13 09:55:57 -05:00
Joakim Erdfelt c9910cec13
ServerListener uses Path as it has to Write a file reliably 2022-10-13 09:53:39 -05:00
Joakim Erdfelt caf69690ca
Adding TODO about copyTo() with IncludeExcludeSet 2022-10-13 09:53:18 -05:00
Joakim Erdfelt 58b416952c
Cleanup AttributeNormalizerTest 2022-10-13 09:49:03 -05:00
Lachlan Roberts 57f71ce77e extract the generation of getCompressedContentFormats to separate contentFactory 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-13 18:08:50 +11:00
Olivier Lamy 573f27fd88
cherry-pick of #7803 (#8708) 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-10-13 15:53:38 +10:00
Simone Bordet 557696653d
Re-enable RequestLog tests. 
Re-implemented features that were commented out.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-12 17:46:49 +02:00
Lachlan Roberts 6771db40bf replace use of CachedContentFactory with CachingContentFactory 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-12 19:20:35 +11:00
Lachlan Roberts 9f8621269c remove usage of HttpContent.getPreCompressedContentFormats for jetty-core & ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-12 16:16:15 +11:00
Jan Bartel 756cf2102e
Fix jaas demos (#8689) 
* Fix jaas demos add distro test
 2022-10-12 09:33:14 +11:00
Lachlan Roberts a7383ea4de only check file modified time once per second for cached files 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-11 18:41:56 +11:00
Lachlan Roberts 1353f16d57 Refactor for CachingContentFactory and ResourceService 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-11 11:08:42 +11:00
Simone Bordet 2cbb0e19e0
Forward port of PR #7778 to `jetty-12.0.x`. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-10 16:22:26 +02:00
Olivier Lamy b1f8019860
simplify poms, add back missing changes from #7850 and #7687 (#8697) 
* simplify poms, add back missing changes from #7850
* remove non used plugin, missing from #7687


Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-10-10 12:52:40 +10:00
Olivier Lamy b2d050948d fix javadoc 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-10-09 07:59:24 +10:00
Joakim Erdfelt 1ae87e03bb
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12-servlet-pathmapping-regex 2022-10-07 08:43:49 -05:00
Joakim Erdfelt 04d8c3f451
Updates for test failures 2022-10-07 08:26:39 -05:00
Simone Bordet c785f08b17
[Jetty 12] Made WebSocket over HTTP/2 work. (#8685) 
* Made WebSocket over HTTP/2 work.

Re-enabled tests, and restored HTTP2StreamEndPoint,
as well as implemented getTunnelSupport() for HTTP/2.

Removed from HttpStream methods for upgrade that are
not necessary anymore.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-07 12:50:42 +02:00
Joakim Erdfelt dd3e3cf6e8
Aligning changes between ee9 & ee10 2022-10-07 05:36:20 -05:00
Joakim Erdfelt 25dd6d0ef7
Cherry-pick of Improvements to PathSpec for Jetty 10.0.x (#8136) 
* Cherry-pick of Improvements to PathSpec.
* From commit: 5b4d1dd1c6
* 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>
 2022-10-06 15:50:18 -05:00
Greg Wilkins 351fe53c9a
Fix #7891 regex pathInfo (#7892) 
Fix 7891 regex pathInfo

+ Use the pathSpec methods to set servletPath and pathInfo when possible

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-10-06 15:44:01 -05:00
Greg Wilkins 024a053455
Issue #7748 - allow override of path mapping behavior in ServletContextHandler (#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>
 2022-10-06 15:42:12 -05:00
Joakim Erdfelt d7288cbcd2
Remove deprecated methods from QoSFilter 2022-10-06 11:36:32 -05:00
Joakim Erdfelt 281f0dc495
Fix bad test cases from merge 2022-10-06 09:17:48 -05:00
Jan Bartel f1e39433e8 Fix context paths for some ee10 and ee8 demos 2022-10-06 14:59:07 +11:00
Olivier Lamy eb9d07378a
move flatten mojo configuration in top pom, fix boms and remove non needed content (#8686) 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-10-06 06:50:45 +10:00
Jan Bartel b85f904520
Re-enable and fix loginservice tests ee10 (#8683) 2022-10-06 07:33:51 +11:00
Joakim Erdfelt 4c74dac122
Fixing left-over ee10 replace -> replaceAll javascript usages 2022-10-05 15:31:55 -05:00
Joakim Erdfelt 9a7ce7a1f1
Fixing jackson-databind use in maven-plugins 2022-10-05 15:24:49 -05:00
Simone Bordet 7ed59f46c8
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-05 12:16:02 +02:00
Lachlan 05a4b96632
Merge pull request #8621 from eclipse/jetty-12.0.x-CachedContentFactory 
Fix Caching ContentFactories in Jetty-12
 2022-10-04 18:57:29 +11:00
Jan Bartel f76df2c1bc Reenable test 2022-10-04 11:01:11 +11:00
Simone Bordet a3f2268766
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-03 18:28:36 +02:00
Lachlan Roberts 44cb84f3bb update AsyncIOServletTest after refactor of ServletContextRequest.getServletContextRequest() 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-01 19:20:14 +10:00
Lachlan 04e1df9373
Merge pull request #8619 from eclipse/jetty-12.0.x-8606-scopeListeners 
Issue #8606 - Fix to ContextScopeListener for AsyncIOServletTest
 2022-09-30 13:41:44 +10:00
Joakim Erdfelt 597a6af31d
Jetty 12 : `Descriptor` cleanup (#8611) 
+ Sanity check Resource being provided
+ Descriptor toString changed to include full URI to descriptor
  so that it can be used consistently in Logging and Exception messages.
+ New Descriptor.toURI() for use in Servlet Source and other logging messages
+ Servlet Source value is now the URI of the Descriptor
+ More cleanup around `Source` location/name
   .getResource() must be a Resource
   as it's used in the AnnotationIntrospector
   all others use new .getName()
   Not all location/name usages can be loaded as
   a Resource.
 2022-09-28 09:09:16 -05:00
Simone Bordet 1a51e07a9f
Renamed `ServletContextRequest.getBaseRequest()` to `getServletContextRequest()` (#8626) 
* Renamed ServletContextRequest.getBaseRequest() to getServletContextRequest().
Code cleanups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-28 08:54:25 +02:00
Lachlan Roberts b893186f5e Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8606-scopeListeners 2022-09-28 14:43:24 +10:00
Lachlan Roberts 1508eb61e7 keep the ETag header in ServletContextResponse.resetContent if Response is 304 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-28 10:50:03 +10:00
Joakim Erdfelt 97eedaf9a6
Jetty 12 - Delay Resource Alias calculation until it's requested/needed (#8573) 
* Delay Resource alias calculation until it's requested.
* Rename .getAlias() to .getTargetURI()
* PathResource resolveTargetAliasPath to resolveTargetPath
 2022-09-27 13:03:47 -05:00
Lachlan Roberts b503d93360 fix some more tests in DefaultServletTest for EE10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-27 13:40:16 +10:00
Lachlan Roberts c5b4ddee87 Fix ETag header in 304 responses for ResourceService, provide precompressedFormats to DefaultServlet 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-27 12:40:23 +10:00
Simone Bordet 06be091089
Introduced [Callback|Promise]Completable.with(Consumer) to simplify usage of CompletableFuture APIs. 
Updated code to use the new APIs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-26 22:15:17 +02:00
Simone Bordet f8f60822a7
Restored interim responses functionality (100 Continue, 102 Processing, 103 Early Hints) (#8615) 
* Restored interim responses functionality (100 Continue, 102 Processing, 103 Early Hints) for core, ee9 and ee10.

Added ProcessingProtocolHandler and EarlyHintsProtocolHandler for the client.

Re-enabled all tests for interim responses for all protocols.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-26 16:48:11 +02:00
Joakim Erdfelt 144c78fe39
Jetty 12 : QuickStart generation based on Path, usage based on Resource (#8614) 
* QuickStart generation based on Path, usage based on Resource
* QuickStart usage in jetty-maven-plugin uses Path
* Cleanup MavenWebAppContext constructor exceptions
* Improving quickStart stream filtering and array conversion
* Creating WEB-INF, if missing, now more reliable
 2022-09-23 12:50:52 -05:00
Joakim Erdfelt 3eca6901cc
Jetty 12 : ResourceFactory.of(WebAppContext) to WebAppContext.getResourceFactory() (#8610) 
* ResourceFactory.of(WebAppContext) to WebAppContext.getResourceFactory()
 2022-09-23 05:38:21 -05:00
Lachlan Roberts bd1edb4736 Issue #8606 - Fixes for AsyncIOServletTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-23 17:48:22 +10:00
Lachlan Roberts 138219d7da fix import ordering 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-23 15:16:12 +10:00
Lachlan Roberts 9536ef8ce5 Merge of changes from #8599 to EE10 WebSocket 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-23 15:16:12 +10:00
Joakim Erdfelt 2c335eb7dd
Jetty 12 : Correct appassembler error during `jetty-ee10-test-quickstart` (#8616) 
* appassembler-maven-plugin is not needed anymore
 2022-09-23 15:07:11 +10:00
Joakim Erdfelt b75896c2f5
Jetty 12 : XmlAppendable use Charset, not String (#8609) 
* XmlAppendable use charset, not string
* Collapse Constructors into one
 2022-09-22 15:06:02 -05:00
Simone Bordet d3e16fcff9 Updates from reviews. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-21 20:03:49 +02:00
Simone Bordet 910bb41702 Removed duplicate client transport tests already present in core. 
Properly implemented request and response trailers for all the transports, both client and server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-21 20:03:49 +02:00
Simone Bordet 0a267fa8d5 Renamed ee10 client transport tests package. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-21 20:03:49 +02:00
Simone Bordet d12b46b269 Renamed ee10 client transport tests module. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-21 20:03:49 +02:00
Joakim Erdfelt 4fe414a762
Jetty 12 : precompressed content support for `ResourceService` (#8595) 
* Remove Resource.getWeakETag in favor of new EtagUtils
* Protect bad usages of CachingContentFactory
* Working precompressed content for ResourceService
* Fixing DefaultServlet handling of ResourceService.writeHttpError() overrides
* Protect NPE in CachingContentFactory.isValid()
* Complete callback in DefaultServlet.writeHttpError
* Addressing review comments
* Testing for whole content
* Improve MemoryResource handling of name/filename
* EtagUtils handling of Resource
* Better protection of bad Resource impls in EtagUtils
* Update CachingContentFactory
+ Using Resource.lastModified were possible
+ CachingHttpContent has better Resource
  protection, and uses Etag from delegate
+ CachingHttpContent uses delegate where
  possible.
+ Store Etag HttpField in CachingHttpContent
  and allow override in constructor
* Simpler CachingHttpContent.isValid()
* Better handling of PrecompressedHttpContent

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-09-21 09:39:21 -05:00
Lachlan 050b4a988b
Merge pull request #8598 from eclipse/jetty-12.0.x-RemoteEndpointApiFix 
Complete TODO to fix WebSocket RemoteEndpoint API in Jetty 12
 2022-09-21 18:15:12 +10:00
Lachlan 97dd7b30d2
Merge pull request #8413 from eclipse/jetty-12.0.x-websocket-upgrade-contract 
Jetty 12 : Strengthen WebSocket upgrade contract and other improvements
 2022-09-21 18:14:27 +10:00
Joakim Erdfelt 95bf791b71
Jetty 12 - Improve FileID and use where appropriate (#8589) 
* Use FileID where appropriate
* Adding FileID.matchesExtension
* Fixing demo modules start test
 2022-09-20 09:35:50 -05:00
Lachlan Roberts e43346b042 fix error in AnnotatedPartialListenerTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-20 12:32:12 +10:00
Lachlan Roberts 53c0d7b9b4 Complete todo to fix WebSocket RemoteEndpoint API 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-19 19:10:33 +10:00
Lachlan Roberts 5296424e0a Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-websocket-upgrade-contract 2022-09-19 18:34:49 +10:00
Joakim Erdfelt 9668d614d9
Issue #8474 - Jetty 12 - `Resource.list()` API change + `Resource.getFileName()` addition (#8582) 
* Issue #8474 - Resource.list and Resource.getFileName work
* Correcting signature of Resource.list and use it
* Introduce Resource.getFileName and use it
* Adding URIUtil.addPath() test to show file+str behavior

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-09-14 15:48:01 -05:00
Joakim Erdfelt 9ebaf3cf53
Adding ee10 RequestTest 2022-09-13 11:35:06 -05:00
Joakim Erdfelt 3d1150fd60
Issue #8462 - Adding testcase to prove out behavior 2022-09-08 13:32:48 -05:00
Lachlan Roberts 5d0f781cb7 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-websocket-upgrade-contract 2022-09-08 10:43:26 +10:00
Lachlan 860554b71b
Merge pull request #8547 from eclipse/jetty-12.0.x-disabledTestFixes 
re-enabling and fixing some tests for Jetty-12
 2022-09-08 10:27:10 +10:00
Lachlan 5ccd0d7fc4
Merge pull request #8548 from eclipse/jetty-12.0.x-ee10-statisticsServlet 
Fix the StatisticsServlet for Jetty-12 EE10
 2022-09-08 10:24:44 +10:00
Joakim Erdfelt 84c6f30dfd
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12-pathresource-alias-detection-in-jarfile 2022-09-07 05:52:41 -05:00
Joakim Erdfelt ff35c0e5ef
Updating from review comments. 2022-09-06 19:44:41 -05:00
Joakim Erdfelt 54cc1a3ff9
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12-pathresource-alias-detection-in-jarfile 2022-09-06 19:36:53 -05:00
Joakim Erdfelt 678b9dada5
Overlay.unpackTo() needs to work if dir doesn't exist yet 2022-09-06 16:59:30 -05:00
Joakim Erdfelt 1cd0ac4959
Changes from review 2022-09-06 15:12:32 -05:00
Joakim Erdfelt 7f88878df9
Change signature of Resource.lastModified() 
+ Now returns Instant
 2022-09-06 13:21:25 -05:00
Lachlan Roberts 6eb96b70a5 fully decode pathInfo in ResponseHeadersTest.MultilineResponseValueServlet 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-06 23:44:31 +10:00
Simone Bordet 8953873e67
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-06 12:31:54 +02:00
Lachlan Roberts 13032a2cd2 fix checkstyle issues 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-06 18:50:41 +10:00
Lachlan Roberts 2d63071e73 Fix the StatisticsServlet for Jetty-12 EE10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-06 18:28:04 +10:00
Lachlan Roberts 22bec1976c Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-disabledTestFixes 2022-09-06 17:56:43 +10:00
Lachlan Roberts a4b7619906 re-enable SessionHandlerTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-06 17:49:22 +10:00
Lachlan Roberts 89bb2a9593 re-enable and fix ResponseHeadersTest.testMultilineResponseHeaderValue 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-06 17:48:18 +10:00
Olivier Lamy 0acd7df84b
jetty 12.0.x error unwrap servlet exception (#8491) 
* unwrap servlet exception per default as expected by TCK

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-09-03 13:54:53 +10:00
Lachlan Roberts 984f50bd22 Fix failures in FormTest by fixing bugs in FormFields 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-01 15:51:12 +10:00
Lachlan Roberts 81d695c501 uncomment IncludedServletTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-01 15:24:03 +10:00
Lachlan Roberts ec7c1137ff uncomment testWelcomeExactServlet test 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-01 10:13:09 +10:00
Olivier Lamy d533040ea7
fix ee8 jstl module and demo (#8484) 
* add distribution test for demo jstl
* fix default pattern, not more need of taglib

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-25 07:06:30 +10:00
Olivier Lamy 0e526d9b3f fix deployment of some demo modules 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-23 12:15:38 +10:00
Olivier Lamy c8c6ae5fcf
skip deployment of test jars and remove some not needed bom dependencies (#8481) 
* skip deployment of test jars and remove some not needed bom dependencies

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-20 19:54:29 +10:00
Olivier Lamy 8e732ccf72
using bom within the reactor is really a bad idea and it sources from ee10 in ee9 as well (#8479) 
* using bom with the reactor is really a bad idea and it sources from ee10 in ee9 as well

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-19 21:24:09 +10:00
Olivier Lamy 8fdbf50222
Restore jetty-ee8-maven-plugin mvove back ITs to jetty-eeX-maven-plugin modules (#8472) 
add back jetty-ee8-maven-plugin
- add back jetty-ee8-jspc-maven-plugin
- remove not used site plugin and simplify code
- moving back ee9 maven plugin ITs to the module
- back of ee10 maven ITs test to the plugin module


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-19 17:50:58 +10:00
Simone Bordet a3ba86266a
Implemented ProxyHandler in new module jetty-core/jetty-proxy. (#8475) 
Moved ConnectHandler to org.eclipse.jetty.server.handler, where it should have been from the start.

Cleaned up and corrected behavior of SecureRequestCustomizer.
Now the response is wrapped with isSecure=true if it arrived over a secure transport.
The request URI scheme indicates whether the request is secure towards the origin server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-19 09:38:34 +02:00
Lachlan Roberts f6c923db10 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-08-17 19:24:20 +10:00
Lachlan Roberts ac18a0aec2 Issue #8448 - remove blocker usage from websocket 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-17 17:28:38 +10:00
Lachlan Roberts 82618073d5 PR #8413 - move wrapped req/resp attributes into WebSocketConstants 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-17 16:41:23 +10:00
Lachlan Roberts 9f92b6b7be PR #8413 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-17 16:34:48 +10:00
Lachlan Roberts 87f2393467 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-websocket-upgrade-contract 2022-08-17 16:00:39 +10:00
Lachlan Roberts bf83e55999 keep CreatorNegotiator internal 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-17 15:54:09 +10:00
Joakim Erdfelt 180d68f585
Updating WebAppDefaultServletTest 2022-08-16 19:25:27 -05:00
Joakim Erdfelt 6191377504
Proper "?" vs "%3F" handling 2022-08-16 16:31:42 -05:00
Simone Bordet b5332c38a9 Implemented ranged requests and responses. 
Refactored MultiPart so that the different behavior between
multipart/form-data and multipart/byteranges is captured in the code.

Renamed MultiParts to MultiPartFormData, and ServletMultiParts to ServletMultiPartFormData.

Introduced MultiPartByteRanges and used it to implement ranges in ResourceService.
Re-enabled multipart tests for ranges that were disabled, and added more.

Modernized and simplified implementation of ByteRange.
Updated ByteRangeTest.

Removed RangeWriter and its subclasses and their tests, as they are not used anymore.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-15 17:32:02 +02:00
Greg Wilkins 6cc10d611d Added tests for ServletContext resources from collections 2022-08-15 19:58:01 +10:00
Lachlan Roberts f19577c197 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8426-aliaschecker-review 2022-08-15 17:05:58 +10:00
Lachlan Roberts 2c42c0de83 Issue #8456 - serve jetty-dir.css as resource in ee10 ResourceService 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-15 15:33:28 +10:00
Greg Wilkins edba0c36c7 Work around for #8462 ee10 handling of %2F 
This is a provisional workaround for #8462 that fixes the bugs in URIUtil that were preventing encoded %2F being seen as an alias.

However, the better ultimate fix would be to see an encoded request as a request for a path segment that includes %2F.
 2022-08-15 13:58:29 +10:00
Lachlan Roberts ffc14a80b9 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8426-aliaschecker-review 2022-08-15 13:16:51 +10:00
Greg Wilkins db359ff8a5 Reenable ee10 protected target exceptions 2022-08-15 13:05:44 +10:00
Greg Wilkins af5fecd18d
Jetty 12 : Rename resourceBase to baseResource (#8310) 
* rename to baseResource
 2022-08-15 12:24:13 +10:00
Lachlan Roberts 51d61d4c82 fix compile issues after removal of AllowSymLinkAliasChecker 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-15 11:14:11 +10:00
Lachlan Roberts a6b88cfead fix failures in ResourceHandlerTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-15 11:00:25 +10:00
Lachlan Roberts 8e172f311e Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8426-aliaschecker-review 2022-08-15 10:40:59 +10:00
Lachlan Roberts 9e745f7fdb Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-08-15 10:32:03 +10:00
Simone Bordet 601cba0b18
Fixed javadocs. 
Javadoc generation for the jetty-quic-quiche-* modules may need
to use a <profile> since the APIs used depend on the Java version.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-13 17:45:26 +02:00
Olivier Lamy c011126e63
fix hardcoding versions in mod files (#8459) 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-13 19:43:07 +10:00
Ludovic Orban 01cdfb19d4
restore mount leak detection (#8457) 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-08-13 08:25:39 +10:00
Simone Bordet 6f0f8854de
Merged branch 'jetty-12.0.x' into 'jetty-12.0.x-module-renaming'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 17:31:01 +02:00
Simone Bordet 0915492a7b
Jetty 12 module renaming - demos. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 10:12:39 +02:00
Olivier Lamy 44a37746e6
Jetty 12 : reactivate `jetty-ee9-demo-embedded` and `jetty-ee9-demo-proxy-webapp` and add more (#8419) 
* ee8 demos to use ee9 demos resources
* add jetty-ee8-demo-jaas-webapp
* add jetty-ee8-demo-jndi-webapp jetty-ee8-demo-mock-resources
* uhm jetty-ee8-demo-jetty-webapp have some issues
* fix jetty-ee8-demo-jetty-webapp
* fix some jetty-ee9-demo-embedded and add back jetty-ee8-demo-proxy-webapp
* demo-embedded need to have jetty-ee9-demo-jsp-webapp built first
* fixing more demos modules. Activate dist test for demo modules and all env


Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-08-12 17:52:53 +10:00
Simone Bordet 1eea480764
Jetty 12 module renaming - jetty-websocket. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Simone Bordet 122b095260
Jetty 12 module renaming - jetty-http3. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Simone Bordet 7d264e6024
Jetty 12 module renaming - jetty-http2. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Simone Bordet 11c3642892
Jetty 12 module renaming - jetty-fcgi. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-08-12 09:33:31 +02:00
Greg Wilkins 7d2f9fa3c0 Fixed build 2022-08-12 08:48:11 +10:00
Jan Bartel 8c4474d614 Squashed commit of the following: 
commit dfe4640d8de7bf815f06ab56eea0c40a1ae34fbb
Merge: dfe0f76e5f fac047905a
Author: Jan Bartel <janb@webtide.com>
Date:   Fri Aug 12 08:36:00 2022 +1000

    Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8430-implement-declareroles

commit dfe0f76e5f9dfaf62a7e3a31eeba3a9ef8b9e5c2
Merge: 0e099459ac 21944ab95c
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Aug 10 16:48:13 2022 +1000

    Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8430-implement-declareroles

commit 0e099459acbf97e00b85a4d36a390f2c459f24d3
Author: Jan Bartel <janb@webtide.com>
Date:   Tue Aug 9 13:38:43 2022 +1000

    Issue #8430 implement declareRoles for ee10
 2022-08-12 08:38:02 +10:00
Jan Bartel 52f1c91cca Merge remote-tracking branch 'origin/jetty-12.0.x-8447-remove-ELContextCleaner-ee10' into jetty-12.0.x 2022-08-12 08:23:09 +10:00
Jan Bartel 95af780d17 Implement special extension to allow headers to be set in include 2022-08-12 08:17:56 +10:00
Jan Bartel 4475537339 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-8447-remove-ELContextCleaner-ee10 2022-08-12 07:09:34 +10:00
Jan Bartel d35892c0c2 Issue #8447 Remove ELContextCleaner for ee10 2022-08-11 17:55:37 +10:00
Greg Wilkins 20bab8a471 Fix build 2022-08-11 16:34:10 +10:00