Commit Graph

4553 Commits

Author SHA1 Message Date
Olivier Lamy b286497d0a
Issue #3514 backport of mod files filtering (#6897)
* Issue #3514 backport of mod files filtering

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* ignore keystore file

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* fix directory name

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* fix directory name

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

* fix inclusion of keystore file

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-09-24 11:59:30 +10:00
Greg Wilkins 34c7344522
Fix #6883 relative welcome redirect (#6886)
Fix #6883 relative welcome redirect
 + make all redirects able to be relative
 + added test for relative redirection in ResourceService

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-09-23 08:16:38 +10:00
Greg Wilkins 9b3fb19dc3
Fix #6860 IPv6 Format (#6861)
Fix #6860 IPv6 format by adding an extensible HttpChannel method

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
2021-09-22 08:21:17 +10:00
Greg Wilkins 873f93db15
Fix #6869 HTML Error page charset (#6873)
Fix #6869 HTML Error page charset passed as request attribute

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-09-21 12:22:29 +10:00
Simone Bordet 9897c1b06e Fixes #6646 - SmallThreadPoolLoadTest on windows flaky.
Fixed occurrences of Callbacks that did not override getInvocationType() to properly declare whether they block or not.

Added test case for blocking writes for both client and server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-08-25 10:45:16 +02:00
Greg Wilkins a3f7747b35
Fix flaky test from #6562/#6563 (#6628)
Fix flaky test from #6562
Disable ipv6 test for #6624
2021-08-17 14:06:25 +10:00
Ludovic Orban cbc814e763 #6605 rename test
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-13 14:59:19 +02:00
Ludovic Orban 4857372245 #6605 testEmptyBufferKnown: make sure the assertion does not happen before the committed flag is read
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-08-13 14:59:19 +02:00
Greg Wilkins fc0a4dc141
Fixed racy test (#6584)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-08-04 14:25:07 +10:00
Joakim Erdfelt 51e6335c7a
Merge pull request #6572 from eclipse/jetty-9.4.x-windows-test-overhaul
Issue #5684 - windows test overhaul
2021-08-03 07:45:27 -05:00
Greg Wilkins 5c013a5a0b
Fix #6562 last written bytebuffer (#6563)
Fixes #6562 the last written bytebuffer calculation.
Also fixed an associated issue with unnecessary flush of an empty when last calculation already signalled last.
2021-08-03 12:30:09 +10:00
Joakim Erdfelt 60bfc75ce4 Issue #5684 - Disabled TLSv1.3 tests on windows
If we restrict to TLSv1.2 this passes.

But on TLSv1.3 is a behavior differences between Linux and Windows.

On Linux TLSv.13 on client side will always return a
javax.net.ssl.SSLHandshakeException in those test cases that expect it.

However, on Windows, Only the TLSv1.2 implementation will return a javax.net.ssl.SSLHandshakeException,

All other TLS versions will result in a
javax.net.ssl.SSLException: Software caused connection abort: recv failed

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-08-02 06:54:49 -07:00
Joakim Erdfelt fb1c85496c Issue #5684 - Restrict behaviors to TLSv1.2
+ Windows TLS behaviors between
  OpenJDK 8 and OpendJDK 11
  and even between TLS versions
  make the test unreliable.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-07-30 15:03:03 -07:00
Joakim Erdfelt 87912d8852 Issue #5684 - Window's test overhaul
+ Cleanup FileBufferedResponseHandlerTest expectations on Windows.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-07-30 11:04:13 -07:00
Joakim Erdfelt 7741ecc1e5 Issue #5684 - Window's test overhaul
+ Migrate from @DisabledOnOs(WINDOWS) to assumptions on capabilities instead.
+ Fix other outstanding windows testing issues.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-07-27 15:02:45 -07:00
Ludovic Orban 64a7dda668 #6491 introduce HttpParser.isTerminated()
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-07-27 11:51:08 +02:00
Ludovic Orban 54763edf33 #6491 add defensive check
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-07-27 11:51:08 +02:00
Joakim Erdfelt cd20770548
Merge pull request #6419 from eclipse/jetty-9.4.x-remove-disabled-tls-tests
Issue #5684 - Client and HttpServerTestBase disabled test cleanup
2021-07-23 13:01:19 -05:00
Joakim Erdfelt 22c4855aaa
Issue #6520 - Fixing ErrorHandler output of text/html
+ Updating tests to ensure that output is xml verified
+ Updating output to use `<hr>` element properly.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-07-16 14:01:03 -05:00
Joakim Erdfelt e37a708c40 Updating to version 9.4.44-SNAPSHOT 2021-06-30 06:30:31 -05:00
Joakim Erdfelt 526006ecfa Updating to version 9.4.43.v20210629 2021-06-30 05:57:49 -05:00
Simone Bordet f045b5a3ba
Issue #6473 - Improve alias checking in PathResource. (#6477)
* Issue #6473 - Improve alias checking in PathResource.

* Reverted %-escape handling for URI query parts.
* Performing canonicalization in ServletContext.getResource(),
  and improving alias checking in ContextHandler.getResource().
* Performing canonicalization checks in Resource.addPath() to avoid
  navigation above of the root.
* Test added and fixed.
* Various cleanups.
* Improved javadoc and comments

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
2021-06-29 15:40:45 +02:00
Greg Wilkins 122a78aafc
Issue #6473 - canonicalPath refactor & fix alias check in PathResource (#6474)
Reduce multiple canonicalPath calls with single alias check in PathResource
Revert to decoding and the normalizing URLs so that subsequent canonicalPath calls are noops. 
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-28 17:10:11 +10:00
Lachlan a02ade7709
Merge pull request #6456 from eclipse/jetty-9.4.x-6383-FileBufferedResponseHandler
Merge fix to BufferedResponseHandlerTest to 9.4.x
2021-06-28 10:52:46 +10:00
Lachlan a3effb19c4
Issue #6447 - Deprecate support for UTF16 encoding in URIs (#6467)
- Merge from PR #6457.
- Also brought some other ComplianceModes back to disable ambiguous empty segments, and ambiguous encodings.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-24 17:16:56 +10:00
Lachlan Roberts e14047839d Issue #6383 - Make FileBufferedInterceptor package private
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-22 10:03:57 +10:00
Lachlan Roberts c490a10621 Issue #6383 - Fix flaky test FileBufferedResponseHandlerTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-22 10:03:08 +10:00
Joakim Erdfelt 704abc6271
Issue #5684 - more disabled test cleanup
+ Assumption based on existence of
  possible DNS Hijacking
+ Alternate logic for client side
  protocol and cipher suite mismatch
  behavior on server side based
  on client side protocol existence
  of TLSv1.3

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-06-18 16:23:03 -05:00
Joakim Erdfelt 5c130e400a Updating to version 9.4.43-SNAPSHOT 2021-06-04 12:49:12 -05:00
Joakim Erdfelt 5cd5e6d237 Updating to version 9.4.42.v20210604 2021-06-04 12:24:37 -05:00
Simone Bordet 9b6b95601d
Fixes #6330 - CustomRequestLog is missing HTTP version format option. (#6361)
Improved javadocs for %H.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-04 16:12:10 +02:00
Jan Bartel 6f148bb057
Issue #6268 Log max form size exceeded msg. (#6301)
* Issue #6268 Log max form size exceeded msg.

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-05-25 10:00:34 +10:00
olivier lamy 97a2a9993f bump to next version 9.4.42-SNAPSHOT
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-18 13:06:42 +02:00
Jan Bartel 087f486b44
Issue #6277 Better handling of exceptions thrown in sessionDestroyed (#6278) (#6279)
* Issue #6277 Better handling of exceptions thrown in sessionDestroyed

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-05-16 17:32:49 +10:00
Lachlan 1c05b0bcb1
Fixes #6263 - Review URI encoding in ConcatServlet & WelcomeFilter.
Review URI encoding in ConcatServlet & WelcomeFilter and improve testing.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-12 17:13:30 +02:00
Simone Bordet 68296911b7 Fixes #6099 - Cipher preference may break SNI if certificates have different key types.
Updated the logic in SslContextFactory.Server.sniSelect(...) to check if there is
any certificate that matches, and if so return a null alias in the hope to be called
again and pick the right alias for the SNI.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-10 10:38:42 +02:00
Greg Wilkins ad6d23fc68
Fix #6227 Async timeout dispatch race (#6228)
Fix #6227 Async timeout dispatch race
Only allow the thread calling onTimeout to call dispatch and complete once timeout has expired.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-05-04 14:18:48 +10:00
Joakim Erdfelt cc7975206c
Improving logging for failure in onTimeout listener
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-04-26 15:01:14 -05:00
Lachlan eca8edcea5 Create FileBufferedResponseHandler to buffer responses into a file. (#6010)
FileBufferedResponseHandler adds an HttpOutput.Interceptor to buffer all responses into a file until the output is closed. This allows the commit to be delayed until the response is complete and thus headers and response status can be changed while writing the body.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-19 15:02:43 +10:00
Joakim Erdfelt 241ca2c2a0 Updating to version 9.4.41-SNAPSHOT 2021-04-13 16:24:42 -05:00
Joakim Erdfelt b881a57266 Updating to version 9.4.40.v20210413 2021-04-13 15:32:28 -05:00
Simone Bordet fe359ac117
Fixes #6168 - Improve handling of unconsumed content
Added or expanded the scope of catch blocks to properly handle exceptions thrown by `HttpInput.Interceptor`.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-13 16:54:53 +02:00
Simone Bordet aed20abcbe
Fixes #6105 - HttpConnection.getBytesIn() incorrect for requests with… (#6108)
* Fixes #6105 - HttpConnection.getBytesIn() incorrect for requests with chunked content

Moved recording of bytes to fillRequestBuffer(),
so they are accounted also for async reads.
Added test case.
Fixed test that was too strictly comparing HttpConnection.bytesIn,
that now report a correct, but larger value.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-08 12:19:17 +02:00
Jesse McConnell d23925809d
Updating to version 9.4.40-SNAPSHOT 2021-03-25 10:06:56 -05:00
Jesse McConnell ee95f92d70
Updating to version 9.4.39.v20210325 2021-03-25 09:33:14 -05:00
Jesse McConnell 7dacf1503f
reset release to 9.4.39-SNAPSHOT 2021-03-25 09:03:35 -05:00
Jesse McConnell be786489a8
reset release to 9.4.39-SNAPSHOT 2021-03-25 08:52:25 -05:00
Simone Bordet 64006c61c6 Issue #6085 Fix duplicate valid session cookies to pick first valid.
Cosmetic changes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 13:09:32 +01:00
Jan Bartel af042ba297 Issue #6085 Fix duplicate valid session cookies to pick first valid.
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-25 13:09:32 +01:00
Olivier Lamy e0111e581a Updating to version 9.4.40-SNAPSHOT 2021-03-25 03:39:19 +00:00