Commit Graph

18306 Commits

Author SHA1 Message Date
Simone Bordet dd4c1dbac0 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-5079-ipv6_brackets'. 2020-08-08 23:21:14 +02:00
Joakim Erdfelt dcf867cd2b
Issue #3916 - Improve multi range response Content-Length calc
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-08 11:34:25 -05:00
Joakim Erdfelt 2206b3edae
Issue #3916 - Fixing broken Content-Length evaluation
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-08 07:18:02 -05:00
Joakim Erdfelt a1a0afaf59 Remove long dead jetty-overlay-deployer module 2020-08-07 11:30:18 -05:00
Simone Bordet d53d9d8a1d Fixes #5079 - :authority header for IPv6 address not having square brackets.
On the client:
* Origin.Address.host is passed through HostPort.normalizeHost(),
so that if it is IPv6 is bracketed.
Now the ipv6 address passed to an `HttClient` request is bracketed.
* HttpRequest was de-bracketing the host, but now it does not anymore.

On the server:
* Request.getLocalAddr(), getLocalName(), getRemoteAddr(),
getRemoteHost(), getServerName(), when dealing with an IPv6 address,
return it bracketed.
The reason to return bracketed IPv6 also from *Addr() methods is that
if it is used with InetAddress/InetSocketAddress it still works, but
often it is interpreted as a URI host so brackets are necessary.
* DoSFilter was blindly bracketing - now it does not.

Added a number of test cases, and fixed those that expected
non-bracketed IPv6.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-07 15:53:19 +02:00
Lachlan Roberts 8a3ff775d5 Issue #5122 - make number of active WS Sessions a managed attribute on SessionTracker
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-06 20:45:06 +10:00
Lachlan Roberts be429f0910 Issue #5122 - add specialized Connection.Listener for WebSocket ConnectionStatistics
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-06 20:38:02 +10:00
Simone Bordet 1f14dfa427 Code cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-06 11:23:48 +02:00
Jan Bartel 4f57810217
Issue #5081 - HouseKeeper synchronization (#5099)
* Issue #5081 HouseKeeper synchronization

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-08-05 15:33:27 +02:00
Lachlan Roberts f416d87e8d Merge remote-tracking branch 'origin/jetty-9.4.x-3974-AsyncMiddleManServletTest' into jetty-9.4.x 2020-08-05 09:28:11 +10:00
Lachlan Roberts 8f545998a8 Issue #3974 - re-enable AsyncMiddleManServletTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-04 23:08:24 +10:00
Lachlan 8af767f3a6
Merge pull request #5109 from eclipse/jetty-9.4.x-5108-SessionTrackerScalability
Issue #5108 - improve scalability of WebSocket SessionTrackers
2020-08-04 20:28:28 +10:00
Lachlan Roberts 85c4fc5335 Issue #5108 - use set based on ConcurrentHashMap and remove synchronized blocks
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-03 18:26:14 +10:00
Lachlan Roberts d37501dce0 Issue #5108 - use HashSet for SessionTrackers to improve scalability
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-03 10:40:12 +10:00
Simone Bordet 344cdf514f
Merge pull request #4975 from lorban/http-connection-pools
Improve client http connection pools
2020-07-31 16:02:32 +02:00
Ludovic Orban e9dad975e6 Re-implement HTTP connection pooling with a non-queuing algorithm
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-07-31 10:36:43 +02:00
Greg Wilkins 66ec16006e
Issue #5088 Review ContextHandler locking (#5094)
* Issue #5088 Review ContextHandler locking

The locking was primarily as a memory guard for the availability status, which was already volatile.
Have instead using an AtomicReference with a simple state machine layered on top of start/stop lifecycle.
There was also protection for AttributesMap, which is no longer needed as AttributesMap is now concurrent.

* Issue #5088

updates from review

* Issue #5088

updates from review (better this time)
2020-07-30 17:58:34 +02:00
Joakim Erdfelt 8b52d7dfcb
Merge pull request #5102 from eclipse/jetty-9.4.x-3916-multipart-output-boundary
Issue #3916 - Fix whitespace between boundary and part headers
2020-07-30 10:54:00 -05:00
Joakim Erdfelt 784fabf2ae
Issue #3916 - Fix whitespace between boundary and part headers
+ Updating existing testcase

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-30 09:26:09 -05:00
Joakim Erdfelt 36b42ca65d
Issue #3916 - Fix whitespace between boundary and part headers
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-30 09:13:01 -05:00
Joakim Erdfelt f37f82828f
Merge remote-tracking branch 'origin/release-9.4.31' into jetty-9.4.x 2020-07-30 09:02:35 -05:00
Olivier Lamy df85afbc63
Delete maven.yml 2020-07-28 20:32:30 +10:00
Lachlan c307c95887
Merge pull request #5080 from eclipse/jetty-9.4.x-OpenID
use OpenID id_token expiry time for the initial authentication only
2020-07-28 13:39:21 +10:00
Lachlan Roberts 5f2c96dc58 use the OpenID Token expiry time for the initial authentication only, and not for expiry of the session.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-27 10:02:38 +10:00
olivier lamy 27e9ff89ce wrong commit
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-26 21:45:04 +10:00
olivier lamy f5550a780a release drafter test
Signed-off-by: olivier lamy <olamy@apache.org>
2020-07-26 21:42:56 +10:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
Lachlan 6b37983c89
Merge pull request #5065 from eclipse/jetty-9.4.x-5062-testKeystoreRemoval
Issue #5062 - fix flaky test KeyStoreScannerTest.testKeystoreRemoval()
2020-07-23 17:28:52 +10:00
Lachlan 76e821e774
Merge pull request #5071 from eclipse/jetty-9.4.x-setuidDocumentation
fix links links to jetty.toolchain in jetty setuid documentation
2020-07-23 17:28:36 +10:00
Lachlan 81f6ec6e3d
Merge pull request #5066 from eclipse/jetty-9.4.x-5064-openIdSerializable
Issue #5064 - the OpenIdCredentials should be serializable
2020-07-23 17:16:36 +10:00
Lachlan d8b775c0fb
Merge pull request #5030 from eclipse/jetty-9.4.x-5018-WebSocketClientConnectFuture
Issue #5018 - cancellation of WebSocketClient.connect Future should fail upgrade
2020-07-23 08:36:12 +10:00
Joakim Erdfelt 980ad4c666
Reverting accidental upgrade to surefire
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-22 14:38:33 -05:00
Lachlan Roberts d9f930fcaa fix links links to jetty.toolchain in jetty setuid documentation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-22 18:57:20 +10:00
Joakim Erdfelt 1b5268b511
Issue #5069 - Fixing assumeConnectTimeout test condition
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-21 16:04:27 -05:00
Lachlan Roberts 38a94879f9 Issue #5062 - KeyStoreScannerTest should use manual scanning to avoid timing issues
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-21 11:31:40 +10:00
Lachlan Roberts e03c740ee8 Issue #5064 - the OpenIdCredentials should be serializable
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-21 09:48:30 +10:00
Greg Wilkins 65de149f84
Issue #5057 - Included root context path (#5058)
* Fixes #5057 Included root context path

Root context path in include should be empty string.

* Issue #5057

merged context path methods as result of review.
ServletContent.getContextPath now returns the encoded contextPath (if anybody is silly enough to have one).
2020-07-20 17:35:48 +02:00
Jan Bartel 89045959ac
Issue #5013 Classloader.getResources resolves preferentially from osgi bundle loader (#5034)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-20 11:05:18 +02:00
gregw 6125a07a63 Issue #5053
removed weak random from Masker.
2020-07-17 17:59:57 +02:00
gregw 88ec429b9c Issue #5053
removed weak random from digest.
2020-07-17 13:02:46 +02:00
gregw f6d39849e8 Improves #5053 by giving option of secure or pseudo random
Allow random to be passed in and can default to a weak pseudo random.
2020-07-17 12:19:22 +02:00
Joakim Erdfelt 8e7bfa0ee5
Some jetty-servlet test cleanup
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-16 14:28:08 -05:00
Greg Wilkins beca81c990
Fixes #5053 CWE-331 (#5056)
Replace uses of Random with SecureRandom.
We do not believe any of these uses of Random represent any security vulnerability, but we are making this
change for an abundance of caution and to avoid warnings from 3rd party scanning tools.
2020-07-16 15:31:19 +02:00
Jan Bartel 668174d91d Issue #5025 - wrong welcome file handling with dispatcher.include() and non-default mapping (#5026)
Signed-off-by: Grzegorz Grzybek <gr.grzybek@gmail.com>
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-16 12:26:39 +02:00
beango1 ce62664fb4 Update startup-unix-service.adoc
JETTY_USER variable need to be set for the init script to run as 'jetty' instead of root
Signed-off-by: Binh Trinh <beango@gmail.com>
2020-07-16 10:08:22 +10:00
Lachlan bbb0f6617c
Merge pull request #5042 from eclipse/jetty-9.4.x-5019-SslReload
Issue #5019 - hot-reload SSL certificates if keystore file changed
2020-07-16 09:09:03 +10:00
Lachlan 42ea202858
Merge pull request #5047 from eclipse/jetty-9.4.x-moduleCommentDoNotEdit
the "DO NOT EDIT" comment in .mod files should start with '#'
2020-07-16 08:43:00 +10:00
Lachlan Roberts 860cba7877 Use Consumer<NativeWebSocketConfiguration> in ConnectFutureTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 07:45:16 +10:00
Greg Wilkins 5c1dda3f7c
Issue #5029 Relative Redirection (#5038)
* Issue #5029 Relative Redirection

Provide option to allow relative redirection

* Issue #5029 Relative Redirection

Fixed checkstyle

* rename from review
2020-07-15 23:14:26 +02:00