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

3661 Commits

Author SHA1 Message Date
gregw
6125a07a63 Issue #5053 
removed weak random from Masker.
 2020-07-17 17:59:57 +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
Lachlan Roberts
c94e82470d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4919-WebSocketContainerStop 2020-07-17 15:32:10 +10: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
Lachlan Roberts
0a30525653 Issue #5043 - allow WebSocketListener / Endpoint anonymous classes to be used 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 12:44:54 +10:00
Lachlan Roberts
00777fe05a Issue #5043 - add testing for WebSocketListener / Endpoint as anonymous classes 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 12:21:03 +10:00
Lachlan
fc473f3368
Merge pull request #5031 from eclipse/jetty-10.0.x-5018-WebSocketClientRequestTimeout 
Issue #5018 - add WebSocketClient UpgradeRequest timeout to jetty 10
 2020-07-16 09:19:47 +10:00
Lachlan Roberts
c09e4d6f86 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 08:46:29 +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
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
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
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
Lachlan Roberts
9c910e9413 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 18:09:40 +10:00
Lachlan Roberts
145dcf502c cleanups after merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 16:52:50 +10:00
Lachlan Roberts
df34a6269b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5018-WebSocketClientRequestTimeout 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 16:39:23 +10:00
Simone Bordet
7b05567b52 Issue #4808 - Review HttpClient Request header APIs. 
For some reason, Request.getHeaders() returned HttpFields,
but HttpRequest.getHeaders() returned HttpFields.Mutable,
and it was obviously wrong.

Fixed WebSocket code that was relying on this API error.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-13 16:44:07 +02:00
Lachlan Roberts
fc0f4b28f9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 15:06: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
olivier lamy
eefe3d202b revert fail release 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 15:04:22 +10:00
olivier lamy
9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy
aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy
23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +10:00
Lachlan Roberts
25d7b99ba1 Issue #5018 - add WebSocketClient UpgradeRequest timeout to jetty 10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-09 08:11:05 +10:00
Lachlan Roberts
a179535db3 Issue #5018 - add WebSocketClient UpgradeRequest timeout to jetty 10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-08 18:04:36 +10:00
Lachlan Roberts
c716edd7a2 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-08 17:35:13 +10: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
Lachlan Roberts
702a48c2d1 Issue #5018 - rename ClientUpgradeRequest timeout to setTimeout 
and increase timeouts used for testing

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-07 22:05:01 +10:00
Lachlan Roberts
74916c2fc9 Issue #5018 - add test case for ClientUpgradeRequest timeout 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-07 16:38:51 +10:00
Simone Bordet
ba6a6ea67d Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-06 23:10:19 +02:00
Simone Bordet
f2c6b67827
Fixes #4971 - Simplify Connection.upgradeFrom()/upgradeTo(). (#5008) 
Fixes #4971 - Simplify Connection.upgradeFrom()/upgradeTo().

Now the upgrade-from connection produces a "floating" buffer 
(not belonging to a pool), so that it can release the original buffer.

The upgrade-to connection is free to copy or store this "floating" buffer.

Strengthened ByteBufferPool behavior when releasing non-pooled
ByteBuffers: the buffer is now discarded.

Updated javadocs and all implementations.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-06 22:45:03 +02:00
Lachlan
33852f5137
Merge pull request #4912 from eclipse/jetty-10.0.x-4907-suspendAfterCloseRace 
Issue #4907 - close websocket suspendState if close frame is received
 2020-07-06 12:54:39 +10:00
Lachlan Roberts
fbe3803cd1 fix checkstyle issue 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-06 12:19:38 +10:00
Lachlan Roberts
6a8a6efd1c Issue #5018 - add request timeout onto ClientUpgradeRequest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-04 11:37:45 +10:00
Lachlan Roberts
32b29a3ced fix DecoderListsTest and cleanup code 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-30 11:18:36 +10:00
Lachlan Roberts
4fdf52bd55 Issue #3428 - changes to AbstractDecodedMessageSink signature from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-29 20:34:18 +10:00
Lachlan Roberts
acf47624a3 Issue #3428 - make AvailableDecoders only allow registration through EndpointConfig 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-29 19:01:00 +10:00
Lachlan Roberts
eb01603abb Issue #3428 - improve testing and ensure decoders are registered in correct order 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-29 18:41:54 +10:00
Lachlan Roberts
5da4d7e460 Issue #3428 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-29 15:37:47 +10:00
Lachlan Roberts
35e82c85ff Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3428-decoderLists 2020-06-29 11:33:03 +10:00
Lachlan Roberts
22d5321628 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-23 10:04:58 +10:00
Lachlan Roberts
0db20886d0 Issue #1100 - ensure init and destroy are always called on JSR356 Encoders 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-22 11:51:06 +10:00
Lachlan Roberts
a03a352d79 Issue #1100 - replicate issue where Encoder init and destroy never called 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-22 11:21:46 +10:00
Lachlan Roberts
ed9c60fc90 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4919-WebSocketContainerStop 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-16 18:57:40 +10:00
Lachlan Roberts
50b62c3771 Issue #4907 - merge synchronized blocks for suspendState 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-16 18:09:29 +10:00
olivier lamy
25c54668f4 fix license header 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-06-13 20:43:21 +10:00
Joakim Erdfelt
6795f3915f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-12 12:04:50 -05:00
Joakim Erdfelt
6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00