b0a953a9fc
Do not store WebSocketComponents in Server scope.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-24 17:15:09 +11:00
05e1283f4f
Fix licence header.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:52:09 +11:00
41ca662155
Issue #6050 - Use 'decompressed' instead of 'read' as variable name.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:45:19 +11:00
4e0a42cceb
Issue #6050 - Bring PermessageDeflateBufferTest to Jetty 10.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:35:06 +11:00
7a453b44d0
Issue #6024 - protect and expose the JavaxWebSocketShutdownContainer.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-03 17:38:27 +11:00
d9eefc9231
Merge pull request #5840 from eclipse/jetty-10.0.x-5832-WebSocketShutdownThread
...
Issue #5832 - shutdown Javax WSClientContainer with webapp if possible.
2021-03-01 16:00:15 +11:00
9effce7558
Merge remote-tracking branch 'origin/release-10.0.1' into jetty-10.0.x
2021-02-22 11:17:22 -06:00
47f24db0be
Issue #5832 - Improve testing for WebSocket client shutdown.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-22 21:12:57 +11:00
ed86361581
Revert changes to ServletContainerInitializer
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-22 10:03:43 +11:00
7760d04a87
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5832-WebSocketShutdownThread
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-22 09:53:31 +11:00
4d67b30785
Merge pull request #5952 from eclipse/jetty-10.0.x-5828-JavaxWebSocketHttpClient
...
Issue #5828 - allow HttpClient to be used with JavaxWebSocketClientContainerProvider
2021-02-22 09:41:34 +11:00
8ed8dc62e3
Updating to version 10.0.2-SNAPSHOT
2021-02-19 13:06:42 -06:00
d0bfd9145d
Updating to version 10.0.1
2021-02-19 12:43:50 -06:00
cee44ff642
JavaxWebSocketClientContainerProvider getContainer should remain protected.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-19 19:56:36 +11:00
d6ec96fe1b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2021-02-15 14:18:08 -06:00
5dd987779c
Adding `WhitespaceAfter` checkstyle rule.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 12:48:24 -06:00
b69f470304
Issue #5828 - only use the HttpClient constructor for JavaxWebSocketClientContainer
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-15 15:32:18 +11:00
0e4ed5c7b1
Issue #5828 - cleanups from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-15 15:13:02 +11:00
2549df99ce
Merge pull request #5935 from eclipse/jetty-10.0.x-5868-WSUpgradeRequestResponse
...
Issue #5868 - allow request attributes to be set in websocket upgrade
2021-02-10 10:56:18 +11:00
1dc98b611e
Issue #5868 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-09 10:56:31 +11:00
805d6efedd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5828-JavaxWebSocketHttpClient
2021-02-08 17:54:49 +11:00
8bc84d3119
Issue #4515 - ValidationExtension should not downcast CoreSession
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-08 16:14:38 +11:00
2ac50130d6
Issue #5868 - allow request attributes to be set during websocket handshake
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-02 17:48:11 +11:00
e81c847998
Happy New Year 2021 (Jetty 10 edition)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
176e29e408
Happy New Year 2021
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 12:31:00 -06:00
c6c1ccfdd0
Rename JavaxWebSocketClientContainer.initialize to setShutdownContainer.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-20 17:00:33 +11:00
f2cde85390
Merge pull request #5874 from eclipse/jetty-10.0.x-5866-WebSocketProgrammaticUpgrade
...
Issue #5866 - allow WebSocket programmatic upgrades
2021-01-20 16:07:07 +11:00
759805580b
Merge pull request #5860 from eclipse/jetty-9.4.x-5851-WebSocketServletCleanup
...
Issue #5851 - remove WebSocketServletFactory as ServletContext attribute on destroy
2021-01-20 15:50:48 +11:00
99aef1a2c0
Issue #5832 - fix bugs when stopping the JavaxWebSocketClientContainer
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-18 23:50:20 +11:00
a60ecfa4cc
Issue #5832 - fix bugs when stopping the JavaxWebSocketClientContainer
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-18 23:23:35 +11:00
29f185931e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5832-WebSocketShutdownThread
2021-01-18 16:01:18 +11:00
2e53ec5384
Updating to version 9.4.37-SNAPSHOT
2021-01-14 11:27:24 -06:00
238ec6997c
Updating to version 9.4.36.v20210114
2021-01-14 10:29:28 -06:00
2f6176661a
improve testing for JavaxWebSocketClientContainer shutdown
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-14 14:38:12 +11:00
35051dfde5
Issue #5832 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 17:54:30 +11:00
16acdcf7e9
Merge pull request #5852 from eclipse/jetty-10.0.x-5850-UpgradeRequestNPE
...
Fix NPE from WebSocketSession.getUserPrincipal() in Jetty10
2021-01-13 12:01:24 +11:00
0d48b8b991
Issue #5866 - add Programmatic WebSocket Upgrade to Jetty API
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 10:45:45 +11:00
78707fffde
CreatorNegotiator should remain private, use from on WebSocketNegotiator
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 09:55:19 +11:00
9e19e875f5
Issue #5832 - deprecate and remove usage of the ContainerInitializer utility
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-12 17:08:53 +11:00
2d43661fe3
Set the javax ws upgrade request in constructor.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-12 11:47:35 +11:00
774dac66a2
Allow shutdown of Javax WS Client Container though a SCI
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 22:56:44 +11:00
0a944ac0a9
Issue #5866 - allow programmatic upgrades with websocket-core
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 22:47:55 +11:00
6e6f83c7f2
Fix bad refactor of getMappings method.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 14:55:44 +11:00
f738493504
Issue #5851 - remove WebSocketServletFactory as ServletContext attribute on destroy
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-05 15:05:31 +11:00
02963baae3
disable part of tests due to bug with ServerUpgradeResponse
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-05 08:48:55 +11:00
65d8131144
fix incorrect test expectation
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 17:14:58 +11:00
69facceec3
Issue #5850 - set the UpgradeRequest in the Javax FrameHandlerFactory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 16:11:28 +11:00
af3cce85a7
The WebSocket Upgrade Header value should be all lower case.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 15:57:23 +11:00
281f6d13ed
Issue #5850 - add tests for the UpgradeRequests in the FrameHandlers
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 15:55:47 +11:00
480767a03b
Improvements to the Jetty documentation.
...
Updated the WebSocket documentation in the operations guide.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-30 20:16:20 +01:00
3286f9a454
Issue #5832 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-24 13:59:45 +11:00
7a72a6ac64
Issue #5828 - allow HttpClient to be used with JavaxWebSocketClientContainerProvider
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-23 17:14:12 +11:00
dd1d4bc1ca
Issue #5832 - use lifeCycleStopping as lifeCycleStopped is never called
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-23 11:45:09 +11:00
25f8c65539
Issue #5832 - shutdown WSClientContainer with ContextHandler if possible
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-23 11:36:18 +11:00
374e02cbc3
register ShutdownThread in doStart
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-22 15:53:10 +11:00
97bbec7ac0
Issue #5832 - deregister ShutdownThread for WebSocketClientContainer
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-22 11:25:37 +11:00
06df421b56
Remove javax.* dependencies ( #5776 )
...
remove non needed enforcer rule in websocket poms
force search transitive
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-22 08:17:16 +10:00
5611c2daa2
Merge pull request #5790 from eclipse/jetty-9.4.x-5785-WebSocketWarning
...
remove warning log message on CompressExtension failure
2020-12-18 18:11:47 +11:00
c16674bae7
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5706-ServerUpgradeResponse
2020-12-15 16:51:47 +11:00
41cffa0bc4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator
2020-12-15 16:49:23 +11:00
2662be0a05
Merge pull request #5795 from eclipse/jetty-10.0.x-5784-fix-dual-license-text
...
Issue #5784 - fix dual license text
2020-12-11 11:37:58 -06:00
9b100a5bfb
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-12-11 12:10:35 +10:00
639cad63fe
Jetty 9.4.x optimize parser warning from logs and add spotbug ( #5735 )
...
* enable spotbugs in CI
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
record issues
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
use warning new generation
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
activate errorprone
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
fix Jenkinsfile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
junit should allow empty results
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
maven console can be use only once...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
one liner
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
recordissues only once
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
force id
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
aggregate results
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
configure a name for aggregated reports
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
mo more -T3 no need anymore of remote session test profile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
I want to see what failing tests look like with new report.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
skip spotbugs for jetty-jmh
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
get rid of findbugs as we now have spotbugs
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Revert "I want to see what failing tests look like with new report."
This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9.
activate errorProne parser
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
make pmd quiet for CI
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
remove -fae flag and do not display transfer progress
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
try junitParser() to see what it does
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
junit parser is a bad idea...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
increase timeout
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
no -T2 for javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
fix skip spotbugs and pmd verbose
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* remove -T options
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 11:47:26 +10:00
f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 16:04:50 -06:00
9d2e350b04
Issue #5785 - remove warning on CompressExtension failure
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-10 23:22:03 +11:00
1753dec720
Issue #5774 - make fields and classes in Client/Server ConfigTest static ( #5777 )
...
* Issue #5774 - make fields and classes in Client/Server ConfigTest static
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-10 15:17:02 +11:00
c9409befd8
Issue #5706 - fix potential NPE from websocket-core ServerUpgradeResponse
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-08 16:54:13 +11:00
8b3cffb49f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator
2020-12-08 14:34:55 +11:00
9319f10425
Updating to version 10.0.1-SNAPSHOT
2020-12-02 15:30:13 -06:00
b9645a1737
Updating to version 10.0.0
2020-12-02 15:04:53 -06:00
121d898517
Move websocket-util classes into websocket-core ( #5705 )
...
- Merge websocket-util classes into websocket-core
- rename websocket-util-server to websocket-servlet
- remove websocket-util
* merge websocket-util into websocket-core-common
* move websocket-util-server implementation to websocket-core-server
* rename websocket-util-server to websocket-servlet
* Negotiator should not need the WebSocketComponents, give this to handshaker instead
* fix tests and WebSocketConfigurations
* move exception classes in websocket-core-common
* move MessageSinks and util to internal package
* create internal package for websocket-core-client
* fix JPMS warnings for websocket common modules
* Fixed exports declarations to make MethodHandles.publicLookup() working properly.
* fix broken tests with wrong WebSocketUpgradeFilter package name
* remove -T3 option to not have parallel build
* no need of jacoco here
* do no reuse forks
* remove logback dependency and disable debug log level
* make this test dynamic instead of hardcoded version...
* use -fae
* change websocket-servlet bundle symbolic name
* cleanup changes
* restore bugs....
* Updates after review.
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-02 11:10:15 +11:00
b4fc70430c
do not used fixed port in core WebSocketProxyTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-02 00:12:16 +11:00
38aec0b081
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-01 13:24:26 +01:00
51d96eced8
Removed hardcoded port.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-01 13:23:13 +01:00
6dce1cbffd
Make ByteBufferAccumulator direct configurable
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-01 10:07:18 +11:00
a51b5db209
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator
2020-12-01 09:45:45 +11:00
20f6dc1ace
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-30 17:33:21 +01:00
4022be8091
remove anchient README
...
Signed-off-by: gregw <gregw@webtide.com>
2020-11-30 15:25:40 +01:00
aa8bd5d820
replace Trie interface and impls usage with new *Index interfaces and Builders
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-11-26 14:14:16 +01:00
4ec2c3eca2
fix websocket proxy for jetty10 websocket api
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 21:05:06 +11:00
cb626e72bc
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-26 20:49:49 +11:00
fb408611e2
fix bug with WebSocketProxy ping pong counting
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 20:49:02 +11:00
741ad918e4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 17:20:05 +11:00
5941235725
Merge pull request #5726 from eclipse/jetty-9.4.x-websocketProxy
...
Implement and test a WebSocket Proxy with the 9.4 Jetty API
2020-11-26 16:55:36 +11:00
e4502865b7
use WebSocketClient instead of NetworkFuzzer in the primitive echo tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 15:37:36 +11:00
629e2d69a4
Merge pull request #5597 from eclipse/jetty-10.0.x-CloseStatus
...
Cleanups to WebSocket CloseStatus
2020-11-26 12:26:42 +11:00
104beb9824
add IdleTimeout test, use volatile sessions
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 11:22:24 +11:00
6a9acaaa9d
do not block for websocket PING and PONG messages
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-25 11:48:33 +11:00
a812ff8db0
Fixed packages of hidden classes.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-24 15:13:34 +01:00
b89adb8dae
Improve WebSocketProxy, and write tests for it
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-24 18:55:09 +11:00
d7598f3ff2
basic WebSocketProxy implementation
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-24 13:40:48 +11:00
e8683cba9f
Updating to version 9.4.36-SNAPSHOT
2020-11-20 16:05:27 -06:00
bdc54f03a5
Updating to version 9.4.35.v20201120
2020-11-20 15:05:50 -06:00
7bc4ee6509
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketUpgradeFilter
2020-11-19 07:48:16 +11:00
6a83a261e1
Always add the default WebSocketUpgradeFilter as the first filter.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-18 21:27:25 +11:00
aba2c93eae
Add tests for the ordering of the default WebSocketUpgradeFilter.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-18 15:10:14 +11:00
2629845f17
update ByteAccumulator length on copies
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 22:16:35 +11:00
f63a741b0f
use local length field for ByteAccumulator.getLength()
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 21:16:38 +11:00
f52e61156d
add test for a subclassed WebSocketUpgradeFilter
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 20:57:21 +11:00
2c94cf0cd2
fix javadoc
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-17 16:18:04 +10:00
7c46d96fce
Issue #5499 - add tests for ByteBufferAccumulator
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 17:11:47 +11:00
5788fe609d
Fix ByteBufferAccumulator minSize
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-16 18:43:22 +11:00
a1aa5dcd14
Issue #5499 - use ByteBufferAccumulator for websocket compression
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-16 18:33:38 +11:00
b2bd86701c
Merge pull request #5638 from eclipse/jetty-10.0.x-AutobahnDocker
...
Run websocket autobahn-testsuite with docker in junit test
2020-11-16 16:10:24 +11:00
3b22c6bc66
fix broken test: AltFilterTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-16 15:57:28 +11:00
3e09b86903
should exclude autobahn test per default
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-14 13:04:19 +10:00
6dad0b1b7e
rename WebSocketMapping to WebSocketMappings
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-14 10:46:09 +11:00
165beff3f3
add test for multiple WebSocketUpgradeFilters
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-14 10:43:14 +11:00
0493a11106
Use Filter name to identify the WebSocketUpgradeFilter.
...
Don't allow configuration of WebSocketMapping attribute.
The WebSocketUpgradeFilter is identified by it's name, which must be set as the fully qualified class name.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-13 22:06:20 +11:00
26f1e0b723
use autobahn to not run it per default
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-13 15:24:27 +10:00
a4160c4b5e
Fix javadoc on websocket configuration classes.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-12 09:47:38 +11:00
595d4bfcc4
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-11 22:18:26 +11:00
b1b5cc3cd3
not needed anymore
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-11 19:32:13 +10:00
bf01cf280e
exclude autobahn via surefire property
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-11 18:59:56 +10:00
c46920dafd
activate autobahn tests only for ci profile
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-11 17:48:35 +10:00
b2979173c5
fail the junit test if there were any failed test cases
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-10 14:54:36 +11:00
5b9db15018
use the custom jettyproject/autobahn-testsuite image
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-10 14:42:22 +11:00
ab8b4c3427
cleanups of AutobahnTests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-10 11:23:13 +11:00
42ebdc1bc3
Issue #5320 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-10 01:44:12 +11:00
b6688c0267
Issue #5320 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 23:17:30 +11:00
d62831fd6d
Cleanups to WebSocket CloseStatus
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 19:46:08 +11:00
6ba1ac55b7
exclude incorrect test case 7.9.6
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 19:43:16 +11:00
53454e70cd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-AutobahnDocker
2020-11-09 18:16:33 +11:00
32433b10ad
revert change to the classloader used in isAvailable
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 18:12:50 +11:00
80a824854b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5320-WebSocketHttpClient2
2020-11-09 15:17:22 +11:00
fa1914a5b1
Update Jetty WebSocketConfiguration classes
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-06 19:03:52 +11:00
3c44df0724
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-06 14:09:13 +11:00
6e9572215b
ByteAccumulator transferTo expects buffer in fill mode.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-05 19:11:34 +11:00
7bcae9968b
allow writing directly into the ByteAccumulator
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-05 17:19:05 +11:00
a3c3e24cab
Use the ByteBufferPool in the ByteAccumulator
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-05 14:38:19 +11:00
145bcff649
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator
2020-11-05 13:43:00 +11:00
05dafb89ab
Move work on ByteAccumulator to jetty-util
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-05 13:42:47 +11:00
fc4e263f93
Add module and configuration for websocket-client provided to webapp.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-04 22:22:13 +11:00
f857ac9756
fix failures from incorrectly configured WebSocketUpgradeFilters
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-04 15:13:59 +11:00
9c78e20314
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketUpgradeFilter
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-04 10:53:45 +11:00
88b7035474
do not report unimplemented tests as failures
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-04 10:27:12 +11:00
acff507200
increase the overall startup timeout to 2hours
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-04 10:09:15 +11:00
07c3131517
use different name for test case result name
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-03 16:28:42 +10:00
8d21bb7b63
Issue #5320 - fix the XmlHttpClientProvider for jetty 10, re-enable tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-03 17:17:27 +11:00
64655f7b7e
Issue #5320 - allow websocket client jars to be provided by server
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-03 17:16:27 +11:00
edaadff55b
Updating to version 9.4.35-SNAPSHOT
2020-11-02 09:04:51 -06:00
e46af88704
Updating to version 9.4.34.v20201102
2020-11-02 08:03:51 -06:00
60c56d8856
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-02 23:43:42 +11:00
b327992f75
Don't enforce the default WebSocketMapping.
...
If a user wants to use the WebSocketUpgradeFilter with a different WebSocketMapping,
they can add the ServerContainer manually and put their own WebSocketMapping in.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-02 16:14:27 +11:00
5d9c81a511
revert to using init parameter to identify the WebSocketUpgradeFilter
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-02 15:44:14 +11:00
137c1e8b3a
localhost cannot work on kubernetes
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-02 13:06:04 +10:00
1b8f3aa07a
copy fuzzing config at start of the container
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-01 10:31:17 +10:00
1ccbe7289c
turn json reports to surefire reports
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-10-31 15:48:25 +10:00
1f5b446462
Fix issue #5499
...
this PR let the ByteAccumulator recyclable. after invoke ByteAccumulator.transferTo method
we can invoke ByteAccumulator.recycle method to reuse byte[] via ByteAccumulator.newByteBuffer method
Signed-off-by: Baoyi Chen <chen.bao.yi@qq.com>
2020-10-31 00:08:30 +08:00
3c3fcc311e
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-30 12:43:31 +11:00
377d0a8dc0
fix checkstyle issues
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-29 16:17:01 +11:00
d5222df896
copy all .json and .html reports from docker container
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-29 16:09:44 +11:00
7ced55d18b
start working on getting json result and transform then into junit results
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-10-29 07:54:06 +10:00
e3b79d5c86
use userdir only
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-10-28 20:14:24 +10:00
32fc73d641
use try resource for container
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-10-28 20:14:24 +10:00
e8db752f0b
wip
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-28 20:14:24 +10:00
46de11ec2d
debug to find jenkins workspace
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-28 20:14:23 +10:00
3a1f31c9eb
only chown autobahn reports if directory exists
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-28 20:14:23 +10:00
eacddab552
fix file permissions on websocket autobahn generated test reports
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-28 20:14:22 +10:00
5fd0b07c45
run WebSocket Autobahn tests in java code using Testcontainers
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-28 20:14:22 +10:00
e726eefb0b
Updating to version 9.4.34-SNAPSHOT
2020-10-20 18:55:39 -05:00
1be6875565
Updating to version 9.4.33.v20201020
2020-10-20 18:28:51 -05:00
681f46bd2a
Merge pull request #5406 from eclipse/jetty-10.0.x-WebSocketSCI
...
throw ISE if the WebSocketSCI configure() is called on a started ServletContextHandler
2020-10-16 17:13:19 +11:00
c95fc2a3dc
Merge pull request #5295 from eclipse/jetty-10.0.x-5287-CompressionPool
...
Issue #5287 - rework CompressionPool to use the jetty-util pool
2020-10-16 17:12:36 +11:00
792531d124
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-10-16 17:08:01 +11:00
f99b4ca80c
Merge pull request #5377 from eclipse/jetty-9.4.x-5368-WebSocketInputStream
...
Issue #5368 - ensure onMessage exits before next frame is read
2020-10-16 15:51:54 +11:00
7ed6998a9c
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 14:55:07 -05:00
dc74bcf4cc
throw ISE if WebSocketSCI.configure() is called on started ServletContextHandler
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 14:55:07 -05:00
4cb475c97d
Issue #5320 - also test WebSocketClient on server from WEB-INF/lib
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 16:15:57 +11:00
1b07c846c6
Issue #5320 - use HttpClient classloader to load jetty-websocket-httpclient.xml
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 16:15:20 +11:00
6cd70ce136
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient
2020-10-15 14:12:21 +11:00
be041d3044
Issue #5368 - add tests for not reading to end of InputStream
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 12:10:33 +11:00
680020dcb2
Issue #5368 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 12:08:57 +11:00
4690aa51ba
allow override of shared CompressionPools in WebSocketServerComponents
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
0e3cfe8fc2
Issue #5287 - share compression pools and size with max num threads
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
608a895aab
Issue #5287 - make default CompressionPool capacity 1024
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
5dc0242986
Issue #5287 - Changes from review & fix broken tests from NPE
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
21576f2312
Issue #5287 - fix usages of new CompressionPool
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
419eefc2ef
move logic from messageComplete into appendFrame with fin==true
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 10:26:08 +11:00
1cd15e8d85
Fixes #5379 - Better handling for wrong SNI. ( #5398 )
...
* Fixes #5379 - Better handling for wrong SNI.
Reworked the SNI logic.
Added support for IP addresses in the SAN extension of certificates in the X509 class.
Fixed keystores to have CN=localhost and SAN with ip=127.0.0.1 and ip=[::1].
Fixed tests that were not using the correct Host header.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-10-12 15:48:53 +02:00
dfa076fdb5
Merge pull request #5403 from eclipse/jetty-10.0.x-5401-move-httptester
...
Move HttpTester to jetty-http
2020-10-12 06:14:44 -05:00
94bafba6ac
simplify the usage of WebSocketUpgradeFilter
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-09 17:31:41 +11:00
7003b3c42e
Issue #5378 - guard against concurrent requests lazily initializing the filter
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-08 08:46:51 +11:00
2a4d672fc1
Issue #5378 - improve testing for WebSocketUpgradeFilter
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-08 08:46:51 +11:00
857e888e8b
Issue #5401 - Move HttpTester to jetty-http
...
+ leaving jetty-http-tools alone
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-07 14:50:31 -05:00
09947681fe
allow MessageInputStream to read multiple bytes at a time
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-07 19:48:13 +11:00
aa1299912d
Issue #5368 - when resuming always call onFillable from newThread.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-07 16:32:06 +11:00
7df0dfa7c2
warn if did not read until EOF once per MessageInputStream
2020-10-07 15:41:51 +11:00
6c94ef5848
Issue #5368 - warn if MessageInputStream closed without fully consuming
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-06 17:43:58 +11:00
a91a7630e0
fix NPE from contextClassLoader in XmlBasedHttpClientProvider
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-01 17:40:37 +10:00
941ffcead7
Issue #5368 - ensure onMessage exits before next frame is read
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-01 15:42:50 +10:00
81c88cdde0
Issue #5320 - do all exception handling in XmlBasedHttpClientProvider
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-01 14:03:25 +10:00
5b96f6f984
Issue #5320 - Run jetty-websocket-httpclient.xml with server class access.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-01 12:38:17 +10:00
85e257fc98
Updating to version 9.4.33-SNAPSHOT
2020-09-30 11:53:09 -05:00
de97d26f7b
Updating to version 9.4.32.v20200930
2020-09-30 11:03:24 -05:00
00f05cb94e
Issue #5320 - reproduce failure to load httpClient for WebSocketClient in webapp
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-30 15:11:05 +10:00
ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-09-29 11:24:28 -05:00
3423375a97
Issue #5357 - Updating to https://eclipse.org/ ( #5358 )
...
* Issue #5357 - Updating to https://eclipse.org/
- Removing redundant <url> refs in pom.xml
- Correcting bad indenting from merge
- Correcting mailing list references
- Correcting bugs.eclipse.org references
- Correcting text file references
- Correcting html references
- Correcting further references
- Correcting download.eclipse.org reference
- Adding test for demo-base /proxy/current/
- Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 11:02:32 -05:00
a55ddc2093
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-25 13:28:41 +10:00
70c8822eef
Updated module descriptions for consistency. Resolves #5313
2020-09-23 13:10:47 -05:00
Lachlan Roberts
Joakim Erdfelt
Simone Bordet
Olivier Lamy
gregw
Ludovic Orban
Baoyi Chen
Chris Walker