6125a07a63
Issue #5053
...
removed weak random from Masker.
2020-07-17 17:59:57 +02:00
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
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
860cba7877
Use Consumer<NativeWebSocketConfiguration> in ConnectFutureTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 07:45:16 +10:00
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
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
25a7da2635
add test for abort with CompletableFuture.completeExceptionally()
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 21:47:31 +10:00
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
9c910e9413
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 18:09:40 +10:00
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
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
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
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
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
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
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
fbe3803cd1
fix checkstyle issue
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-06 12:19:38 +10:00
6a8a6efd1c
Issue #5018 - add request timeout onto ClientUpgradeRequest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-04 11:37:45 +10:00
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
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
6df6fa33b8
Updating to version 9.4.31-SNAPSHOT
2020-06-11 08:24:34 -05:00
271836e4c1
Updating to version 9.4.30.v20200611
2020-06-11 07:21:18 -05:00
66ef0ebc03
Issue #4903 - do ServerEndpointConfig validation check before started
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-11 19:20:49 +10:00
f41f601e19
Issue #4903 - fix validation on custom Configurator annotated endpoint
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-11 09:58:49 +10:00
b22e306796
Issue #4903 - Improved behavior for Custom ServerEndpointConfig.Configurator
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-06-10 17:03:26 -05:00
9bfc168329
Issue #4903 - Improved behavior for Custom ServerEndpointConfig.Configurator
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-06-10 11:01:30 -05:00
0b8306976a
Merge pull request #4906 from eclipse/jetty-9.4.x-4903-WebSocketPublicModifier
...
Issue #4903 - give better errors for non public javax.websocket endpoints
2020-05-27 09:43:24 +10:00
a11c7f554c
Issue #4903 - cleanup catch statement from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-27 09:42:44 +10:00
5c63b0ef78
Issue #4903 - catch Throwable instead of RuntimeException
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-26 17:37:04 +10:00
c41560c7cd
Issue #4903 - add cause to Exception when creating endpoint instance
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-26 15:35:39 +10:00
470d948504
Issue #4903 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-26 09:35:17 +10:00
add00c9dd8
Issue #4903 - check endpoint class is default constructable
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-25 13:57:41 +10:00
28a588b8bd
Issue #4903 - Better errors for non public endpoints
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-25 12:36:09 +10:00
5d6f3e2ddc
Updating to version 9.4.30-SNAPSHOT
2020-05-21 13:42:25 -05:00
77c232aed8
Updating to version 9.4.29.v20200521
2020-05-21 12:04:14 -05:00
7d80c8fc39
Add constructor to better align with 10.0.x
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-05-13 17:38:43 +02:00
71df3b57ee
Issue #4824 - add configuration on RemoteEndpoint for maxOutgoingFrames
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-30 09:39:58 +10:00
5699b9ff3d
Updating to version 9.4.29-SNAPSHOT
2020-04-08 13:15:04 -05:00
ab228fde9e
Updating to version 9.4.28.v20200408
2020-04-08 12:33:56 -05:00
3d74148652
Issue #4650 - do not use ServiceLoader every time a WSSession is started
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-12 12:34:03 +11:00
3a77542303
upgrade shade plugin and align version ( #4639 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-05 09:10:12 +10:00
b014e2faca
Merge pull request #4597 from eclipse/jetty-9.4.x-847-WSasyncWriteTimeout
...
Issue #847 - deprecate asyncWriteTimeout in the jetty websocket API
2020-03-02 10:19:01 +11:00
8aabb52557
Updating to version 9.4.28-SNAPSHOT
2020-02-27 13:03:44 -06:00
a304fd9f35
Updating to version 9.4.27.v20200227
2020-02-27 12:21:57 -06:00
b138ce55bb
Issue #847 - deprecate asyncWriteTimeout in the jetty websocket api
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-21 14:58:19 +11:00
aaf6f17766
Merge pull request #4555 from eclipse/jetty-9.4.x-4537-WebSocketSpin
...
Issue #4537 - fix potential spin when discarding in WebSocketConnection
2020-02-13 09:14:06 +11:00
66f4bda2ea
comments
...
Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
2020-02-10 21:02:36 +11:00
d371c1498c
Improve performance of small websocket messages
...
Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
2020-02-10 20:07:33 +11:00
20621b76fb
Issue #4537 - fix potential spin when discarding in WebSocketConnection
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-10 18:29:55 +11:00
b64964113c
Merge pull request #4486 from eclipse/jetty-9.4.x-4475-WebSocketStreamMessageOrder
...
Issue #4475 - fix WebSocket streaming message ordering
2020-01-24 10:01:22 +11:00
56fc476d55
Updating to version 9.4.27-SNAPSHOT
2020-01-17 07:00:10 -06:00
7b38981d25
Updating to version 9.4.26.v20200117
2020-01-17 06:21:47 -06:00
08b1be6ea8
Issue #4475 - improve testing for MessageInputStream
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 18:37:47 +11:00
3d309a5797
Issue #4475 - use state machine for MessageInputStream
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 18:37:20 +11:00
3fd7094c01
Issue #4475 - suspend/resume to control reading frames while streaming
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 13:11:48 +11:00
8c65309963
Addressing Checkstyle violations in src/test/java
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 12:33:34 -06:00
c7b6ccca98
Issue #4475 - add tests not reading until EOF
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 19:14:48 +11:00
16c406b55c
Issue #4475 - add test for fragmented frames
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 15:15:56 +11:00
26d12b9c2d
Issue #4475 - proof of concept
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 14:52:50 +11:00
a7b9df96fd
cleanup WebSocket logging in EventSocket
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 10:33:19 +11:00
e1f19be353
Closes #2620 - guard against exceptions for WebSocket onClose and onError ( #4346 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 09:22:56 +11:00
923ec38adf
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2020-01-07 16:51:25 +01:00
e3c8546667
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2020-01-07 16:35:05 +01:00
de890bb1b7
Happy New Year 2020.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
f4e7e4c3db
Merge branch 'release-9.4.25' into jetty-9.4.x
2020-01-03 12:49:27 -06:00
e1371a1c13
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
8974176c4b
Updating to version 9.4.26-SNAPSHOT
2019-12-20 11:30:41 -06:00
a9729c7e7f
Updating to version 9.4.25.v20191220
2019-12-20 10:46:56 -06:00
c2c2c56a02
Issue #3730 - EventDriverFactory and SessionFactory setters
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-19 13:46:12 -06:00
26fde02c55
Issue #3730 - Updating invalid test assertion
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-19 12:43:49 -06:00
94988596a1
Issue #3730 - Further updates from PR Review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-19 12:33:43 -06:00
bb79f3e6e0
Issue #3730 - Collapsing now redundant private Constructor
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-18 15:33:23 -06:00
e02ef3efdd
Issue #3730 - Making new Constructor private
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-18 14:43:53 -06:00
9da1820f13
Issue #3730 - Removing HttpContainerScope
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-18 14:38:37 -06:00
7d65183e2c
Issue #3730 - Cleaning up Scopes in WebSocketClient
...
+ Introducing HttpContainerScope to track HttpClient specific
ByteBufferPool, SslContextFactory, and Executor.
+ New private WebSocketClient constructor that use HttpContainerScope
+ Deprecated many constructors as irrelevant now that HttpClient
is an option to create a WebSocketClient.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-13 13:44:57 -06:00
0f7a3b2d91
Updating to version 9.4.25-SNAPSHOT
2019-11-20 16:08:38 -06:00
363d5f2df3
Updating to version 9.4.24.v20191120
2019-11-20 15:25:01 -06:00
453d41940b
Updating to version 9.4.24-SNAPSHOT
2019-11-18 13:52:51 -06:00
abbccc65d6
Updating to version 9.4.23.v20191118
2019-11-18 13:09:44 -06:00
c44e7c5eb1
Merge pull request #4299 from eclipse/jetty-9.4.x-4248-websocketclient-success-flag
...
Fixes #4248 - WebSocketClient UpgradeResponse.isSuccess never set true
2019-11-14 09:42:45 -06:00
5479ed030f
Issue #4248 - Using ServletUpgradeResponse.setSuccess(true) for servlet side
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-13 15:33:00 -06:00
6a6206d8e4
Issue #4248 - Deprecating UpgradeResponse setSuccess / isSuccess
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-13 15:32:23 -06:00
2d50c92979
Fixes #4296 - WebSocketClient cannot connect with "%25" in query
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-12 10:22:19 -06:00
544ad0a28a
Fixes #4248 - WebSocketClient UpgradeResponse.isSuccess never set true
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-12 10:14:51 -06:00
5de1289ac0
Merge branch 'release-9.3.28' into jetty-9.3.x
2019-11-07 12:10:00 -06:00
0df21b6e86
Merge branch 'jetty-9.2.x' into jetty-9.3.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-cdi/pom.xml
# jetty-client/pom.xml
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-io/pom.xml
# jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jsp/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-monitor/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spdy/pom.xml
# jetty-spdy/spdy-client/pom.xml
# jetty-spdy/spdy-core/pom.xml
# jetty-spdy/spdy-example-webapp/pom.xml
# jetty-spdy/spdy-http-client-transport/pom.xml
# jetty-spdy/spdy-http-common/pom.xml
# jetty-spdy/spdy-http-server/pom.xml
# jetty-spdy/spdy-server/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-hash-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2019-11-07 12:09:39 -06:00
43d95cd984
Updating to version 9.3.29-SNAPSHOT
2019-11-05 13:02:10 -06:00
d7dd68d6e9
Updating to version 9.3.28.v20191105
2019-11-05 11:46:40 -06:00
b17439c731
Updating to version 9.2.30-SNAPSHOT
2019-11-05 11:23:21 -06:00
36c95fdd43
Updating to version 9.2.29.v20191105
2019-11-05 10:43:15 -06:00
c980e3dd34
Fixing compilation issue
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-30 17:18:03 -05:00
1ed13b6b30
Updating to version 9.4.23-SNAPSHOT
2019-10-22 09:19:41 -05:00
b1e6b55512
Updating to version 9.4.22.v20191022
2019-10-22 08:20:50 -05:00
2eb251a4b8
fix logging defaults to INFO
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-16 13:53:57 +11:00
00baa7147e
Merge pull request #4153 from eclipse/jetty-9.4.x-3558-websocket_onErrorAfterClose
...
Issue #3558 - only notify WS onError if onClose has not been called
2019-10-10 15:27:11 +11:00
d95c825c5c
Issue #3558 - only notify WS onError if onClose has not been called
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-04 11:13:38 +10:00
6fc42d8ba2
Merge branch 'release-9.4.21' into jetty-9.4.x
2019-10-01 13:35:43 -05:00
fef5975b86
Merge pull request #4108 from eclipse/jetty-9.4.x-4104-WSSession_SendAfterClose
...
Issue #4104 - WebSocketSession will reject outgoing frames if closed
2019-10-01 15:46:16 +10:00
7807eafad9
Updating to version 9.4.22-SNAPSHOT
2019-09-26 10:46:28 -05:00
72970db61a
Updating to version 9.4.21.v20190926
2019-09-26 09:59:15 -05:00
gregw
Lachlan Roberts
Simone Bordet
Joakim Erdfelt
Ludovic Orban
Olivier Lamy
Sergey Tselovalnikov