Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,558 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

3674 Commits

Author SHA1 Message Date
Lachlan 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
Lachlan Roberts 3b22c6bc66 fix broken test: AltFilterTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-16 15:57:28 +11:00
olivier lamy 3e09b86903 should exclude autobahn test per default 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-14 13:04:19 +10:00
Lachlan Roberts 6dad0b1b7e rename WebSocketMapping to WebSocketMappings 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-14 10:46:09 +11:00
Lachlan Roberts 165beff3f3 add test for multiple WebSocketUpgradeFilters 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-14 10:43:14 +11:00
Lachlan Roberts 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
olivier lamy 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
Lachlan Roberts a4160c4b5e Fix javadoc on websocket configuration classes. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-12 09:47:38 +11:00
olivier lamy b1b5cc3cd3 not needed anymore 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-11 19:32:13 +10:00
olivier lamy bf01cf280e exclude autobahn via surefire property 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-11 18:59:56 +10:00
olivier lamy 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
Lachlan Roberts 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
Lachlan Roberts 5b9db15018 use the custom jettyproject/autobahn-testsuite image 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-10 14:42:22 +11:00
Lachlan Roberts ab8b4c3427 cleanups of AutobahnTests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-10 11:23:13 +11:00
Lachlan Roberts 42ebdc1bc3 Issue #5320 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-10 01:44:12 +11:00
Lachlan Roberts b6688c0267 Issue #5320 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-09 23:17:30 +11:00
Lachlan Roberts d62831fd6d Cleanups to WebSocket CloseStatus 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-09 19:46:08 +11:00
Lachlan Roberts 6ba1ac55b7 exclude incorrect test case 7.9.6 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-09 19:43:16 +11:00
Lachlan Roberts 53454e70cd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-AutobahnDocker 2020-11-09 18:16:33 +11:00
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts fa1914a5b1 Update Jetty WebSocketConfiguration classes 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-06 19:03:52 +11:00
Lachlan Roberts 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
Lachlan Roberts f857ac9756 fix failures from incorrectly configured WebSocketUpgradeFilters 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-04 15:13:59 +11:00
Lachlan Roberts 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
Lachlan Roberts 88b7035474 do not report unimplemented tests as failures 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-04 10:27:12 +11:00
Lachlan Roberts acff507200 increase the overall startup timeout to 2hours 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-04 10:09:15 +11:00
olivier lamy 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
Lachlan Roberts 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
Lachlan Roberts 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
Joakim Erdfelt edaadff55b Updating to version 9.4.35-SNAPSHOT 2020-11-02 09:04:51 -06:00
Joakim Erdfelt e46af88704 Updating to version 9.4.34.v20201102 2020-11-02 08:03:51 -06:00
Lachlan Roberts 60c56d8856 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-02 23:43:42 +11:00
Lachlan Roberts 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
Lachlan Roberts 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
olivier lamy 137c1e8b3a localhost cannot work on kubernetes 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-02 13:06:04 +10:00
olivier lamy 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
olivier lamy 1ccbe7289c turn json reports to surefire reports 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-10-31 15:48:25 +10:00
Lachlan Roberts 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
Lachlan Roberts 377d0a8dc0 fix checkstyle issues 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-29 16:17:01 +11:00
Lachlan Roberts 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
olivier lamy 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
olivier lamy e3b79d5c86 use userdir only 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-10-28 20:14:24 +10:00
olivier lamy 32fc73d641 use try resource for container 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-10-28 20:14:24 +10:00
Lachlan Roberts e8db752f0b wip 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-28 20:14:24 +10:00
Lachlan Roberts 46de11ec2d debug to find jenkins workspace 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-28 20:14:23 +10:00
Lachlan Roberts 3a1f31c9eb only chown autobahn reports if directory exists 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-28 20:14:23 +10:00
Lachlan Roberts 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
Lachlan Roberts 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
Joakim Erdfelt e726eefb0b Updating to version 9.4.34-SNAPSHOT 2020-10-20 18:55:39 -05:00
Joakim Erdfelt 1be6875565 Updating to version 9.4.33.v20201020 2020-10-20 18:28:51 -05:00
Lachlan 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
Lachlan 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
Lachlan Roberts 792531d124 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 17:08:01 +11:00
Lachlan 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
Lachlan Roberts 7ed6998a9c
changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-15 14:55:07 -05:00
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 680020dcb2 Issue #5368 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-15 12:08:57 +11:00
Lachlan Roberts 4690aa51ba allow override of shared CompressionPools in WebSocketServerComponents 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Lachlan Roberts 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
Lachlan Roberts 608a895aab Issue #5287 - make default CompressionPool capacity 1024 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Lachlan Roberts 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
Lachlan Roberts 21576f2312 Issue #5287 - fix usages of new CompressionPool 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Lachlan Roberts 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
Simone Bordet 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
Joakim Erdfelt 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
Lachlan Roberts 94bafba6ac simplify the usage of WebSocketUpgradeFilter 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-09 17:31:41 +11:00
Lachlan Roberts 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
Lachlan Roberts 2a4d672fc1 Issue #5378 - improve testing for WebSocketUpgradeFilter 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-08 08:46:51 +11:00
Joakim Erdfelt 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
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 7df0dfa7c2 warn if did not read until EOF once per MessageInputStream 2020-10-07 15:41:51 +11:00
Lachlan Roberts 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
Lachlan Roberts a91a7630e0 fix NPE from contextClassLoader in XmlBasedHttpClientProvider 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-01 17:40:37 +10:00
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 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
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Lachlan Roberts 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
Joakim Erdfelt ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-29 11:24:28 -05:00
Joakim Erdfelt 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
Lachlan Roberts 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
Chris Walker 70c8822eef
Updated module descriptions for consistency. Resolves #5313 2020-09-23 13:10:47 -05:00
Lachlan Roberts 5d951e840e fix licence header and checkstyle 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-23 10:34:50 +10:00
Lachlan Roberts 2f3808026f Issue #5170 - add testing to verify if this issue exists in 9.4.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-22 18:23:55 +10:00
Lachlan 76cf6c8bdc
Merge pull request #5266 from eclipse/jetty-10.0.x-WebSocketAutoBahn 
Issue #5170 - fix upgrade bug in HttpReceiverOverHTTP
 2020-09-16 16:39:54 +10:00
Lachlan Roberts 9be277a810 debug log full stacktraces only in processConnectionError and processHandlerError 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-15 16:50:24 +10:00
Lachlan Roberts 14e6bd196e update javadoc for JDK MethodHandles bug tests, stop stacktrace in DistributionTests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-14 17:28:57 +10:00
Lachlan Roberts c9cd27ee4d Issue #5170 - fix upgrade bug in HttpReceiverOverHTTP 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-14 15:09:00 +10:00
Lachlan Roberts 48a8e2fca5 Improve test to reliably reproduce issue seen in the AutobahnTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-14 14:44:38 +10:00
Lachlan Roberts dd72e85b6a improvements to websocket-core logging to reduce duplicate stacktraces 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-14 14:07:20 +10:00
Lachlan Roberts 5d1d7c9c26 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-10 10:55:34 +10:00
Lachlan Roberts 609f0b2159 Merge branch 'jetty-10.0.x-4824-WSmaxOutgoingFrames' into jetty-10.0.x 2020-09-10 10:51:57 +10:00
Lachlan Roberts b44b62038c reorder methods for maxOutgoingFrames, fix javadoc 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-10 09:50:52 +10:00