18228 Commits

Author SHA1 Message Date
Joakim Erdfelt
a2233ce233
Issue #5247 - Introduce ForwardedRequestCustomizer.Priority enum
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-11 11:17:31 -05:00
Joakim Erdfelt
ac42cbd143
Issue #5247 - Improve testing of ForwardedRequestCustomizer
+ Merge ProxyPass tests from CheckReverseProxyHeadersTest into
  ForwardedRequestCustomizerTest
+ Deleted CheckReverseProxyHeadersTest.java
+ Add more tests for ForcedHost configuration
+ Updated ForwardedRequestCustomizer to conform to expectations

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-11 11:11:09 -05:00
Joakim Erdfelt
4280303046
Issue #5247 - Document ForwardedRequestCustomizer authority search order
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-09 15:20:21 -05:00
Joakim Erdfelt
f74cada660
Issue #5247 - Priority based ForwardedRequestCustomizer
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-09 14:56:33 -05:00
Joakim Erdfelt
165e59b3e2
Merge pull request #5226 from eclipse/jetty-9.4.x-5224-xforwarded-multiple-ports
Issue #5224 X-Forwarded-Host support for port
2020-09-09 11:37:33 -05:00
Joakim Erdfelt
e7d15afeb6
Merge pull request #5234 from eclipse/jetty-9.4.x-http-09-response-505
Issue #5233 - Bad/Unsupported HTTP version should return 505 not 400.
2020-09-09 09:23:01 -05:00
Simone Bordet
01135e1515
Fixes #5217 - Review RoundRobinConnectionPool (#5219)
* Fixes #5217 - Review RoundRobinConnectionPool

Introduced IndexedConnectionPool and RandomConnectionPool.
Clarified semantic of RoundRobinConnectionPool.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-09-09 15:31:28 +02:00
Joakim Erdfelt
2896ed31d6
Issue #5224 - Updating ForwardedRequestCustomizerTest expectations
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-08 12:34:53 -05:00
Joakim Erdfelt
56b1d17d79
Issue #5233 - correcting NCSARequestLogTest expectation on unsupported version
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-08 05:59:41 -05:00
Greg Wilkins
7ecf42e3f8
Issue #5162 CDI embedded integration improvements (#5177)
* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + made listener public
 + added utility class for SCIs

* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + moved EmbeddedWeldTest to jetty-embedded

* fix javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #5162 CDI embedded integration improvements

ventilated text

* fix test pom

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Fixed javadoc

* Fixed javadoc

* Issue #5162 CDI embedded integration improvements

Moved tests to jetty-cdi to avoid consequences to other tests in embedded

* trailing new line

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Feedback from review
2020-09-07 14:00:20 +02:00
Joakim Erdfelt
b2e0f69ea8
Issue #5233 - Bad/Unsupported HTTP version should return 505 not 400.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-04 12:23:11 -05:00
Lachlan
2826df2048
Merge pull request #5230 from eclipse/jetty-9.4.x-5201-QueuedThreadPoolDump
Issue #5201 - simplify the QueuedThreadPool dump
2020-09-04 17:16:43 +10:00
Lachlan Roberts
1d1bbc49f7 Issue #5201 - change format for QTP dump from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-04 13:55:26 +10:00
Joakim Erdfelt
be86e66e77
Merge pull request #5195 from eclipse/jetty-9.4.x-5185-dosfilter-listener
Issue #5185 - Add DoSFilter Listener to allow extensible behavior
2020-09-03 14:10:29 -05:00
Lachlan Roberts
516432b9cb Update server dump documentation after QueuedThreadPool dump changes
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-03 15:06:02 +10:00
Lachlan Roberts
26ae875d1c Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5201-QueuedThreadPoolDump 2020-09-03 15:00:47 +10:00
Lachlan
a676bddbf2
Merge pull request #5200 from eclipse/jetty-9.4.x-3132-DumpTool
Issue #3132 - Improve documentation for the jetty server dump
2020-09-03 13:16:26 +10:00
Lachlan
c10dc06568
Merge pull request #5184 from calvincodes/jetty-9.4.x-injecting-handler-documentation
Adding Injecting Handler section to documentation.
2020-09-03 13:16:05 +10:00
Lachlan Roberts
85c8c6510e Issue #5201 - Fix issues with test after changes to QTP dump
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-03 10:34:18 +10:00
Greg Wilkins
820f2b9195
Support Apache Commons Daemon methods in XmlConfiguration (#5199)
* Support Apache Commons Daemon methods in XmlConfiguration so it can substitute for start.Main after a --dry-run

* + added --dry-run=parts to printout partial dry run
+ added --no-exec

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* + updated for review feedback

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Feedback from review:

 + removed features other than --dry-run parts
 + added documentation
2020-09-02 23:40:05 +02:00
Joakim Erdfelt
a8ae3f9476
Issue #5185 - Add DoSFilter Listener to allow extensible behavior
+ Currently there's no way to respond to rejected/throttled/delayed
  requests that the DoSFilter impacts.
  A Listener has been added to allow for any behaviors needed
  by a user of the DoSFilter on requests that have been
  impacted by the DoSFilter.
+ Introducing OverLimit and RateType to DoSFilter internals

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-02 16:13:56 -05:00
Lachlan Roberts
0a59a2b090 Issue #5201 - simplify the QueuedThreadPool detailed dump
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-03 06:58:55 +10:00
Joakim Erdfelt
5fef14019a
Merge pull request #5215 from eclipse/jetty-9.4.x-5214-head-huge-static
Issue #5214 - Servlet HEAD doesn't support content-length over Integer.MAX_VALUE
2020-09-02 12:54:38 -05:00
Simone Bordet
e940e5c574
Merge pull request #5225 from eclipse/jetty-9.4.x-5103_proxy_wrong_http_version
Fixes #5103 - Proxy sets protocol version to 2.0 instead of 1.1 when …
2020-09-02 17:41:41 +02:00
Joakim Erdfelt
e2134b13d7
Issue #5224 - X-Forwarded-Host support for port
+ More test cases
+ Allowing X-Forwarded-Host to parse port (if present properly)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-02 10:27:33 -05:00
Simone Bordet
1e90d13127 Fixes #5103 - Proxy sets protocol version to 2.0 instead of 1.1 when accessed from H2 client.
Fixed by removing the explicit version copy.
Leaving it at default would make the client transport
decide the version based on the transport protocol it uses.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-09-02 16:39:02 +02:00
Joakim Erdfelt
e4ca153364
Issue #5224 - Test to replicate reported issue
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-02 09:34:16 -05:00
gregw
418093af28 Feedback from review:
+ check no content in HEAD response
2020-09-02 13:01:20 +02:00
Jan Bartel
e2d0e1fa34 Remove println 2020-09-02 12:21:30 +02:00
Jan Bartel
ef0c752476
Issue #4888 Ensure HttpSessionListener can access session via (#5220)
Issue #4888 Ensure HttpSessionListener can call Request.getSession

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-09-02 11:53:23 +02:00
Simone Bordet
4e8bf3723c
Merge pull request #5216 from eclipse/jetty-9.4.x-3974-flaky-asyncmiddlemanservlet-test-overflow
Issue #3974 flaky AsyncMiddleManServletTest overflow to filesystem tests
2020-09-02 10:00:57 +02:00
Simone Bordet
5a87469b8a
Merge pull request #5205 from eclipse/jetty-9.4.x-5204-sni_with_pkix
Fixes #5204 - SNI does not work with PKIX.
2020-09-02 09:49:40 +02:00
Lachlan Roberts
5822e5bdfd Fixes to jetty-server-dump documentation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-02 16:55:07 +10:00
Lachlan
f813b382d8
Merge pull request #5208 from eclipse/jetty-9.4.x-5193-NullMessage
Issue #5193 - fix lost websocket messages when only one OnWebSocketMessage annotation used
2020-09-02 15:42:54 +10:00
Joakim Erdfelt
acc6e3aac2
Issue #3974 - Reworking AsyncMiddleManServletTest for test failures.
+ be more detailed when unexpected exceptions occur
+ dump client and server when timeout occurs
+ increasing client timeout on overflow/disk test methods

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-01 17:21:48 -05:00
Greg Wilkins
a6b7f73019 Merge branch 'jetty-9.4.x-5214-head-huge-static' of https://github.com/eclipse/jetty.project into jetty-9.4.x-5214-head-huge-static 2020-08-31 18:22:10 +02:00
Greg Wilkins
9e326fe520 + improved sentinels values for content-length
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-08-31 18:19:11 +02:00
Joakim Erdfelt
9128fc48e4
Cleanup dead code in ResourceService
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-31 11:16:22 -05:00
Joakim Erdfelt
dcb06d3c35
Issue #5214 - Use known content_length when in HEAD mode
+ Adding DefaultServlet.doHead() to avoid servlet wrapping
+ Making ResourceService HEAD aware

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-31 11:03:49 -05:00
Joakim Erdfelt
eba360f662
Issue #5214 - Use known content_length when in bypass write
+ In the case of HEAD, the servlet-api response is a wrapper
  of javax.servlet.http.HttpServlet$NoBodyResponse
  We know the content_length, use it.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-31 09:43:04 -05:00
Joakim Erdfelt
116871362b
Issue #5214 - Replicating HEAD Content-Length failure for huge files
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-31 09:25:07 -05:00
Lachlan Roberts
cd1edb33f4 Merge remote-tracking branch 'origin/jetty-9.4.x-5193-better-websocket-event-logging' into jetty-9.4.x-5193-NullMessage
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-31 10:53:26 +10:00
Joakim Erdfelt
46402bc382
Issue #5193 - Updating logging per review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-28 05:46:07 -05:00
Lachlan
001def4905
Merge pull request #5175 from eclipse/jetty-9.4.x-5105-StatisticsHandler
Issue #5105 - StatisticsHandler Graceful Shutdown of Async Requests
2020-08-28 11:54:45 +10:00
Simone Bordet
bec2cdbee7 Fixes #5204 - SNI does not work with PKIX.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-27 18:06:12 +02:00
Lachlan Roberts
92e5abb1bd add missing licence header in SingleOnMessageTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-27 18:05:56 +10:00
Lachlan Roberts
478bcdc868 Issue #5193 - fix lost message bug when using single onMessage annotation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-27 17:18:48 +10:00
Lachlan Roberts
eebb47cbc5 add test to reproduce issue #5193
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-27 17:14:01 +10:00
Lachlan Roberts
a9c90d3309 Issue #5105 - change asyncGraceful to gracefulShutdownWaitsForRequests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-27 08:59:13 +10:00
Simone Bordet
f084f3c09b Fixes #5204 - SNI does not work with PKIX.
Introduced SslContextFactory.Server.aliasMapper, a function
that transforms the alias.
This function is invoked by the SNI logic to unmangle the
alias leaked by the TLS implementation due to bug
https://bugs.openjdk.java.net/browse/JDK-8246262.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-26 22:25:27 +02:00