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
18,724 Commits 55 Branches 466 Tags
Commit Graph

485 Commits

Author SHA1 Message Date
Lachlan
62eedebd17
Issue #3705 - WebSocket upgrade failure and CompletableFuture refactor 
* Issue #3705 - notify WebSocket framehandler on client upgrade failure

getFrameHandler on the ClientUpgradeRequest no longer takes
the upgrade response, the response must be set later if it is
required by the framehandler implementation

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - throw if FrameHandler could not be created

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* wip

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - count down the onOpen latch in NetworkFuzzer

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - WebSocket Session CompletableFuture refactor

- sessionFutures for jetty and javax are now implemented using the
futureCoreSession which will occur after onOpen

- the request and response are set on the FrameHandler before the
upgrade

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-06 08:13:33 +10:00
Lachlan Roberts
6681da7e74 Issue #3666 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-03 11:18:41 +10:00
Lachlan Roberts
e5a6910be4 Issue #3666 - changes from review 
- code cleanups
- made SHUTDOWN 1001 status an abnormal close status

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-24 05:58:02 +10:00
Lachlan Roberts
9e09f76fda Issue #3666 - error CloseFrames skip frames in the FrameFlusher queue 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-24 05:54:49 +10:00
Lachlan Roberts
d6c68c4911 Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-configuration-refactor 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-23 09:03:27 +10:00
Lachlan Roberts
f4990dd0f5 prefer the field and variable name of coreSession instead of session 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-22 08:29:05 +02:00
Lachlan Roberts
491ff5eb93 rename WebSocketChannel to WebSocketCoreSession 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-22 08:29:05 +02:00
Lachlan Roberts
5f62e0f2db store shared websocket components as attributes and not beans 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-21 18:56:53 +10:00
Lachlan Roberts
e31009cb06 WebSocketCoreClient no longer stores configuration and can be shared 
configuration moved to ClientUpgradeRequest

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-21 11:33:06 +10:00
Lachlan Roberts
0b41386c0d don't allow custom CoreClients to be supplied to JavaxClientContainer 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-17 16:54:09 +10:00
Lachlan Roberts
a115e92029 move maxMessageSize configuration from javax framehandler to session 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-16 15:43:38 +10:00
Lachlan Roberts
c68a1b6066 fix the websocket configuration problems shown by ClientConfigTest 
correctly detect when a message has exceeded the max size in the sink

forward changes to the input buffer size to the connection in WSChannel

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-16 15:38:33 +10:00
Lachlan Roberts
7019c18117 refactor of javax WebSocketContainer configuration 
the client and server subclasses of JavaxWebSocketContainer now
share a common configuration instance which is used as the default
configuration for both server and client endpoints

to do this a setter was added for the configuration on the CoreClient

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-16 15:38:12 +10:00
Lachlan Roberts
7e5dcda708 force websocket idle timeout default to be set on endpoint 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-15 12:39:04 +02:00
Lachlan Roberts
2782344d4c revert ConfigurationCustomizer change from #3374 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-15 12:39:04 +02:00
lachan-roberts
5f4c6c3b94 Issue #3374 - comments, name changes and fixes to timeout algorithm 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-05-09 00:05:57 +02:00
Lachlan Roberts
1ef191ffcd Issue #3374 - websocket write timeout improvements 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-09 00:05:57 +02:00
Lachlan Roberts
92e38fcb42 Issue #3374 - implementation of write timeouts for websockets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-09 00:05:57 +02:00
Lachlan Roberts
6887f9d6dd Issue #3608 - fix merge of tests jetty-10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-04 14:50:20 +02:00
Joakim Erdfelt
52bb963186 Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	aggregates/jetty-all-compact3/pom.xml
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
#	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
#	jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
#	jetty-http2/http2-alpn-tests/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
#	jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
#	jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
#	jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
#	pom.xml
#	tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
#	tests/test-http-client-transport/pom.xml
#	tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
 2019-05-01 15:02:31 -05:00
lachan-roberts
c5cb2170aa documentation link fixes and use of static loggers 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-29 13:51:18 +04:00
lachan-roberts
002ecf526d Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3494-clientclosetest 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-09 18:21:40 +10:00
Lachlan Roberts
6cd5fb42e9 Issue #3494 - adjustments to WebSocketChannel processConnectionError 
WebSocketChannel.processConnectionError now defaults to NO_CLOSE
status if no protocol reasons can be found

added some debug logging

improvements to tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-05 12:18:09 +11:00
Simone Bordet
9c13cf3a52 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-04-02 17:37:56 +02:00
lachan-roberts
50c193c23b Issue #3494 - fix ClientCloseTest.testWriteException() 
Nulling out values in WebSocketAdapter causes race conditions when
trying to access session and endpoint externally

Race condition in WebSocketChannel.Flusher.onCompleteFailure(),
processConnectionError should be called first to ensure that the
correct close reason is processed, super.onCompleteFailure() was closing
the connection causing a read failure.

race condition between the server detecting a read failure and sending
a response and the client detecting the write failure, now blocking
on the server so it is not reading and will not detect the failure

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-01 11:19:23 +11:00
Lachlan Roberts
46ef94c1b9 Issue #3465 - client/server error handling behavior for ExtensionStack 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-26 16:29:45 +11:00
lachan-roberts
0d570dd6b6 Issue #3478 - changes from review 
ExtensionStack.negotiate now differentiates between incorrect
extension config offered or incorrect config from negotiation

adding more BadMessageException cases

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-22 15:42:39 +11:00
Lachlan Roberts
eb4f7c000f Issue #3465 - internal WebSocket extensions 
do not allow internal extensions to be offered by the client
do not validate internal extensions

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-21 12:33:53 +11:00
Lachlan Roberts
26e7881dbd Issue #3465 - Negotiation of WebSocket extensions 
default behaviour of Negotiation no longer includes all of the
offered extensions as the negotiated extensions but it now takes
only the first extension if there are multiple of the same name,
this is now done when the negotiation is created and can be overwritten
by the negotiator

Throw exception on websocket errors so the proper status code can
be reported back to the client

fix to checking for multiple negotiated extensions of the same name

added tests for core and jetty websockets for the negotiation

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-21 11:41:01 +11:00
Lachlan Roberts
7e9700fb9a Issue #3462 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-19 14:38:17 +11:00
Lachlan Roberts
403bdb70ea Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3462-websocketclient-validation 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-19 11:54:19 +11:00
Lachlan Roberts
cdd3ed943c Issue #3462 - parse extensions and subprotocols from headers every time 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-19 11:20:49 +11:00
Lachlan Roberts
20e9770b73 Issue #3458 - testing of Jetty WebSocket API ExtensionConfig 
wire up the jetty-api extensions by copying the ExtensionConfig from
the jetty-api upgrade request to the core upgrade request

make UpgradeListener interface methods default for convenience

introduce test to test the functionality of API ExtensionConfig

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-18 15:24:23 +11:00
lachan-roberts
1a20c8cda3 Issue #3462 - fix server validation of websocket upgrade response 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-18 15:12:23 +11:00
lachan-roberts
53a4a747db Issue #3462 - fix client validation of websocket upgrade response 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-18 12:20:11 +11:00
lachan-roberts
59ec0da768 Issue #3406 - fix jetty websocket tests 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-07 10:52:03 +11:00
Greg Wilkins
c341928b84
Merge pull request #3390 from lachlan-roberts/jetty-10.0.x-3106-websocketConnectionStats 
Issue #3106 - implement WebSocketConnection stats
 2019-03-06 18:00:41 +11:00
lachan-roberts
ebbca84a87 WebSocketChannel bug fixes, cleanup and javadoc updates for FrameHandler 
pass the cause from the AbnormalCloseStatus to closeConnection in
WSChannel

If onOpen throws we now throw a runtime exception in addition to
failing the callback, this is to fail the CompletableFuture in the
ClientUpgradeRequest.

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-06 14:15:04 +11:00
Lachlan Roberts
6094b3802f Issue #3106 - WebSocketConnectionStats changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-06 10:27:02 +11:00
Lachlan Roberts
46c2941a82 Issue #3106 - implement WebSocketConnection stats 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-06 10:27:02 +11:00
Greg Wilkins
c63a578c29
Merge pull request #3413 from lachlan-roberts/jetty-10.0.x-3412-WebSocketSession-Customizer 
Issue #3412 - WebSocket CoreSession Customizer
 2019-03-06 10:09:50 +11:00
Greg Wilkins
ad8b22abf0
Merge pull request #3401 from lachlan-roberts/jetty-10.0.x-3159-permessage-deflate-rsv1 
Issue #3159 - permessage-deflate continuation frame with RSV1 set
 2019-03-06 09:20:50 +11:00
Lachlan Roberts
69822efb45 Issue #3412 - WSChannel only sets idleTimeout on connection if non null 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-05 13:30:34 +11:00
Lachlan Roberts
9cd96c3c93 Issue #3159 - Ensuring we follow permessage-deflate RSV1 rules in RFC7692 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-05 10:43:00 +11:00
Greg Wilkins
15647a742c
Merge pull request #3407 from lachlan-roberts/jetty-10.0.x-core-test-cleanup 
websocket core test cleanup
 2019-03-05 10:03:19 +11:00
Joakim Erdfelt
715bac2660 Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageBinaryCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/OnMessageTextCallable.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/BinaryWholeMessage.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/TextWholeMessage.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/EchoTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtension.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/FragmentExtensionTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/OutgoingFramesCapture.java
 2019-03-04 09:44:47 -05:00
lachan-roberts
d380012fc9 Issue #3412 - WSChannel delay config of idletimeout on WSConnection 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-01 18:22:18 +11:00
Lachlan Roberts
5ecd512a90 Issue #3412 - always customize WSChannel directly after creation 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-01 15:47:23 +11:00
Joakim Erdfelt
e476cec6d3 Issue #1676 - Removing deprecated methods and classes 
+ Changing usages of JVM deprecated classes / methods as well
+ Cleaning up test cases and javadoc
+ Removing test methods that rely on deprecated and now removed concepts

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-02-28 17:54:28 -05:00
Lachlan Roberts
4ee399be1e WebSocket core test cleanups 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-02-28 18:14:34 +11:00