Commit Graph

22953 Commits

Author SHA1 Message Date
Greg Wilkins 54023f5a5b
Improve WebAppProvider scanning (#6090)
* Cherry pick from jetty-9

Ensure that WebAppProvider Filter always canonicalises the file passed in from the Scanner. Thus, both the monitored directory is canonical as well as the file it is being compared against.
2021-03-24 08:19:07 +01:00
olivier lamy c6752b3522 do not use hardcoded port
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-24 16:38:22 +10:00
olivier lamy e8c7aacb08 run this test using testcontainers only if docker is available
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-24 16:34:40 +10:00
Lachlan Roberts b0a953a9fc Do not store WebSocketComponents in Server scope.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-24 17:15:09 +11:00
Greg Wilkins d80c622b00
Merge pull request from GHSA-v7ff-8wcx-gmc5 (#6089)
Always normalize ambiguous URIs

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-24 05:54:06 +01:00
Olivier Lamy d9db52f1d7
add an easy way to configure useInputDirectByteBuffers/useOutputDirectByteBuffers for HttpConfiguration (#6055)
* add an easy way to configure useInputDirectByteBuffers/useOutputDirectByteBuffers for HttpConfiguration

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-24 14:17:04 +10:00
Lachlan Roberts df87b6e21e Issue #6084 - Add warnings for deprecated GzipHandler methods for CompressionPool capacity.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-24 14:07:58 +11:00
Lachlan Roberts df13b33bfb Issue #6084 - CompressionPools should not be configured through the GzipHandler.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-24 13:56:07 +11:00
Joakim Erdfelt cba4864fef
Issue #5996 - Remove logback-access.mod (#6002)
* Issue #5996 - Removing logback-access.mod

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-24 03:21:45 +01:00
Greg Wilkins 0d91f33b79
Fix #6076 Protect from null local certificates (#6078)
Fix #6076 Protect from null local certificates
cache resulting X509 in session

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-23 22:17:40 +01:00
Greg Wilkins 96f707f74b
Fix #6082 Reduce SSL buffer compaction (#6083)
Fix #6082 Reduce SSL buffer compaction
Only compact when buffer is underflown.  Note that BufferUtil will also do a cheap "compact" when flipping empty buffers.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-23 22:04:27 +01:00
Simone Bordet 039c7386d0 Fixes #6072 - jetty server high CPU when client send data length > 17408.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-22 23:24:57 +01:00
Joakim Erdfelt be22761a20 Fixes #6072 - jetty server high CPU when client send data length > 17408.
Avoid spinning if the input buffer is full.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-22 23:24:57 +01:00
Greg Wilkins c59de808f1
Fix #5835 Durable filters and servlets (#6027)
Fix #5835 Durable filters and servlets with a general ServletHandler cleanup
update indexes after updating mapping
update mappings/indexes before destroyed listeners

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-22 11:28:25 +01:00
Lachlan cc81b309f3
Merge pull request #6069 from eclipse/jetty-10.0.x-6050-WebSocket-NotUft8Exception
Issue #6050 - Bring PermessageDeflateBufferTest to Jetty 10.
2021-03-19 17:15:22 +11:00
Lachlan Roberts 05e1283f4f Fix licence header.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:52:09 +11:00
Lachlan Roberts 41ca662155 Issue #6050 - Use 'decompressed' instead of 'read' as variable name.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:45:19 +11:00
Lachlan Roberts 4e0a42cceb Issue #6050 - Bring PermessageDeflateBufferTest to Jetty 10.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:35:06 +11:00
Joakim Erdfelt 42cb89c680
Merge pull request #6062 from eclipse/jetty-10.0.x-update-versiontxt
Adding 9.4.38 release to VERSION.txt
2021-03-15 12:02:55 -05:00
Joakim Erdfelt 315f45d623
Adding 9.4.38 release to VERSION.txt
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-15 12:02:05 -05:00
Lachlan c664d673e0
Merge pull request #6033 from eclipse/jetty-10.0.x-6008-RequestLogFix
Issue #6008 - fix RequestLog usage with filePath.
2021-03-11 15:28:20 +11:00
Joakim Erdfelt 1df86522d8
Merge pull request #6030 from eclipse/jetty-10.0.x-6028-root-getcontextpath
Issue #6028 - Request.getContextPath() for root context should be empty string (Jetty 10)
2021-03-10 06:23:04 -06:00
Lachlan Roberts 671a76c613 Issue #6008 - add default ini line for jetty.requestlog.dir
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-10 21:37:30 +11:00
Olivier Lamy 06ea681032 fix some mod files: some url using http to https, use maven central if possible, upgrade log4j2 to 2.14.0 (#6048)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-10 19:17:21 +10:00
Jan Bartel 56864bd43d
Issue #6020 Fix redeploy error jetty-maven-plugin (#6023)
* Issue #6020 Fix redeploy error jetty-maven-plugin

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-10 10:11:34 +01:00
Joakim Erdfelt 54dfa26a07
Merge pull request #6029 from eclipse/jetty-10.0.x-6026-cleanup-uncovered-path-warning
Issue #6026 - Cleaning up warning for paths with uncovered HTTP methods
2021-03-09 15:32:26 -06:00
Simone Bordet c2181ec566 Improvements to the Jetty documentation.
Added sections on server logging.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-09 19:19:50 +01:00
Joakim Erdfelt 74ecf3675b
Issue #6026 - Limiting scope of PR
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-09 10:25:39 -06:00
Joakim Erdfelt da83f05c40
Issue #6026 - tweaking output
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-09 10:22:48 -06:00
Lachlan Roberts c1215e46c2 Issue #6008 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-09 18:35:34 +11:00
Simone Bordet 8de7b83966 Fixes #6034 - SslContextFactory may select a wildcard certificate during SNI selection when a more specific SSL certificate is present.
Now matching certificates are sorted, non-wildcard first, so that a more specific alias is returned.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-08 19:40:24 +01:00
Simone Bordet 217a97b952 Fixes #6037 - Review logging modules for j.u.l.
Fixed mistakes in logging-jul-capture.mod.
Introduced java-util-logging-bridge.properties for the bridge module configuration.
Added [exec] sections to specify the jul config file.
Removed logging-jul-capture.xml, not necessary.
Added tests to verify that the fixed modules work fine.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-05 19:18:19 +01:00
Lachlan Roberts 08c4ce14ab Issue #6008 - fix RequestLog usage with filePath.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-04 11:19:14 +11:00
Joakim Erdfelt 2710f22e53
Issue #6028 - Adding test of Request.getContextPath() for root context
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 15:04:41 -06:00
Joakim Erdfelt 82a50727d8
Issue #6026 - Cleaning up uncovered HTTP methods warning
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 14:40:46 -06:00
Joakim Erdfelt 1cb0a4978f
Merge pull request #6022 from eclipse/jetty-10.0.x-better-xml-path-resolution
Issue #6021 - PoC for resolvePath within XmlConfiguration
2021-03-03 12:24:25 -08:00
Joakim Erdfelt 6d2ea3d5da
Issue #6021 - Addressing defaults
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 09:41:41 -06:00
Joakim Erdfelt 40e9cd08e1
Issue #6021 - Addressing naming
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 08:39:15 -06:00
Joakim Erdfelt 48d296ac0c
Issue #6021 - Addressing naming
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 08:38:15 -06:00
Joakim Erdfelt 9de2c2096b
Issue #6021 - Simpler resolvePath
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 08:29:18 -06:00
Joakim Erdfelt e34c1cc312
Issue #6021 - Tabs vs Spaces
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 08:28:04 -06:00
Joakim Erdfelt 3a457a15d1
Issue #6021 - More windows specific test cases
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 07:22:24 -06:00
Joakim Erdfelt 87f7530834 Issue #6021 - Addressing expectations on Windows
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 04:23:33 -08:00
Joakim Erdfelt 021451cba9
Issue #6021 - Adding windows specific testcases
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 06:15:30 -06:00
Lachlan 23c1ef3ae9
Merge pull request #6025 from eclipse/jetty-10.0.x-6024-JavaxShutdownContainerError
Issue #6024 - protect and expose the JavaxWebSocketShutdownContainer.
2021-03-03 22:36:57 +11:00
Jan Bartel 9d40a754aa Use EXTERNAL mode for jetty-maven-plugin test.
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-03 11:35:52 +01:00
Jan Bartel 76580d537a
Fix move from DISTRO to HOME for jetty-maven-plugin mode (#5991)
* Use mode EXTERNAL rather than HOME or DISTRO

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-03 11:28:53 +01:00
Jan Bartel 599b4762b9
Issue #6011 Fix configurations in jetty.xml baked into org.eclipse.jetty.osgi.boot (#6012)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-03 11:16:22 +01:00
Lachlan Roberts 7a453b44d0 Issue #6024 - protect and expose the JavaxWebSocketShutdownContainer.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-03 17:38:27 +11:00
Joakim Erdfelt 927dc60983
Issue #6021 - Fixing test case
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-02 14:53:58 -06:00