Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 08:28:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,227 Commits 55 Branches 466 Tags
Commit Graph

18227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lachlan Roberts
f9750c9632 Test aborting with exception before WS upgrade completes. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 19:21:01 +10:00
Lachlan Roberts
0f7d99c3bf add documentation for ssl-reload, change exception message in SslContextFactory 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 19:01:15 +10:00
Sergey Tselovalnikov
6b57654b03
Avoid large allocations of temporary buffers in BuferUtil (#5045) 
* Avoid large allocations of tmp buffers in buferutil

Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>

* review feedback

Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
 2020-07-15 10:07:27 +02:00
Lachlan Roberts
de1b6745c5 the DO NOT EDIT comment in .mod files should start with '#' 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 16:47:22 +10:00
Lachlan Roberts
c40ba69222 add null checks in SslContextFactory for _factory, which could be null if reload failed 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 15:35:22 +10:00
Lachlan Roberts
2541f1f648 add javadoc for KeyStoreScanner class 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 11:20:57 +10:00
Jan Bartel
6d88f966e1
Issue #4736 Use variables for osgi import ranges (#4963) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-07-14 14:22:38 +02:00
Lachlan Roberts
25a7da2635 add test for abort with CompletableFuture.completeExceptionally() 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 21:47:31 +10:00
Lachlan Roberts
664cf5fb52 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5018-WebSocketClientConnectFuture 2020-07-14 21:21:08 +10:00
Jan Bartel
b1e08ba4e0
Issue #5020 Make servlets,filters,listeners beans again (#5028) 
* Issue #5020 Make servlets,filters,listeners beans again

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-07-14 11:20:20 +02:00
Lachlan Roberts
9c910e9413 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 18:09:40 +10:00
Lachlan Roberts
a83844df32 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 16:10:07 +10:00
Lachlan Roberts
b03643961d add tests in KeystoreScannerTest for changes with symlinks 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 00:22:21 +10:00
Lachlan Roberts
62ee077b79 move code of ssl-reload module to jetty-util, move module files to jetty-server 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 23:11:09 +10:00
Lachlan Roberts
ca404f157f clean up and rename fields in EventSocket WebSocket test utility class 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 14:53:55 +10:00
Lachlan Roberts
0705d8ea77 generalize the exception type tested in KeystoreReloadTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 13:35:47 +10:00
Lachlan Roberts
dc91f690be use WorkDirExtension in KeystoreReloadTest to fix failing tests on jenkins 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 11:33:51 +10:00
Lachlan Roberts
80f09e1f71 fix issues with the ssl-reload module 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-10 18:44:44 +10:00
Lachlan Roberts
f34873419e Issue #5019 - add jetty module files and xml to use ssl-reload with start.jar 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-10 18:44:35 +10:00
Lachlan Roberts
13e034fc5f Issue #5019 - add testing for the SslKeyStoreScanner 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-10 18:44:24 +10:00
Lachlan Roberts
24d0e50a0c Issue #5019 - add class to do SSL keystore hot-reload in new module 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-10 18:44:08 +10:00
Simone Bordet
94956d6e8b Issue #4904 - WebsocketClient creates more connections than needed. 
Fixed MaxConcurrentStreamsTest - it was always broken.
The problem was that the call to super.onSettings(...) was done
_after_ sending the request, so the connection pool was still
configured with the default maxMultiplex=1024.

Also fixed AbstractConnectionPool to avoid a second call to
activate() if we are not trying to create a new connection.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-09 16:18:15 +02:00
Simone Bordet
6844c9362d Issue #4904 - WebsocketClient creates more connections than needed. 
Fixed MultiplexConnectionPool.acquire() to use the new boolean
parameter to decide whether or not create a new connection.

This fixes ConnectionPoolTest instability.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-09 13:27:44 +02:00
olivier lamy
7bcbc21ca9 no need of system property for this 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-09 07:52:47 +10:00
Jan Bartel
6c161ca5c0 Fix checkstyle violation. 2020-07-08 09:04:53 +02:00
Lachlan Roberts
d7c47f42d6 Issue #5018 - add testing for WebSocketClient Future cancellations 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-08 16:48:43 +10:00
Lachlan
794d67c4d6
Merge pull request #5024 from eclipse/jetty-9.4.x-5018-ClientUpgradeRequestTimeout 
Issue #5018 - add request timeout onto ClientUpgradeRequest
 2020-07-08 16:36:07 +10:00
Lachlan Roberts
13297d5bd7 Issue #5018 - cancellation of WebSocketClient.connect Future should fail upgrade 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-08 16:20:27 +10:00