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
96027f5437
Issue #3462 - incorrectly setting websocket extensions and subprotocol
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-18 16:36:16 +11:00
dab3b64d70
Issue #3458 - make jetty-websocket-client hide websocket-core
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-18 15:24:23 +11:00
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
62406cdfa2
Issue #3458 - missing licence headers and changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-18 15:24:23 +11:00
f60534a8ac
Issue #3458 - jetty websocket upgrades with only websocket-server
...
websocket-servlet exposes core classes as it is used by the jetty and
javax sides, so this introduces a way to add websocket mappings
with jetty-server which does not depend on websocket-servlet
to set websocket mappings through the JettyWebSocketServerContainer
you now need to use the JettyWebSocketCreator which abstracts away
the core classes from use with the jetty websocket api
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-18 15:24:23 +11:00
86675422a6
Issue #3458 - ExtensionConfig now delegates to core implementation
...
ExtensionConfig is now interface in jetty-websocket-api and
implemented in jetty-websocket-common, for its static methods it now
uses a ExtensionConfig.Parser found by the ServiceLoader
the api tests were moved to jetty-websocket-tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-18 15:24:23 +11:00
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
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
d7364e4794
Issue #3422 - Fixing testcase expectations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-15 14:08:33 -05:00
4fb1940283
Issue #3422 - Fixing testcase expectation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-15 12:44:28 -05:00
76de1c0f24
Issue #3422 - WebSocket wss CLOSE_WAIT on aborted client connection
...
+ Adding testcase to replicate
+ Fixing CLOSE_WAIT by issuing wsclose + disconnect on eof
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-15 11:52:14 -05:00
8b2b626f3c
Merge pull request #3455 from eclipse/jetty-10.0.x-3453-remove-deprecated-websocket-extension-api
...
Issue #3453 - Removing deprecated Extension classes in jetty-websocket-api
2019-03-13 11:05:47 +11:00
8a0fff9153
Issue #3453 - Removing deprecated Extension classes in jetty-websocket-api
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-12 10:23:51 -05:00
8f727bef40
Issue #3446 - changes from review
...
use the same FrameHandlerFactory for WebSocketServlet and
WebSocketUpgradeFilter
removed addMapping with PathSpec and only support addMapping
with String
JettyWebSocketServerContainer now implements WebSocketPolicy which
configures the FrameHandler.Customizer
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-12 10:46:22 +11:00
76a37352f5
Issue #3440 Stop on Unavailable
...
+ revert schedulers to non-daemon threads for now so this PR can
proceed.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-12 09:21:19 +11:00
e355ec31b8
Issue #3446 - renaming, code cleanup and fixes
...
rename WebSocketSessionImpl to WebSocketSession
remove SessionListener which is unused and replaced by
WebSocketSessionListener
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-11 18:07:52 +11:00
e9df97e314
Issue #3446 - allow jetty-websocket upgrades with WebSocketUpgradeFilter
...
JettyWebSocketServerContainer moved out of internal and is now used
in a similar way to the Javax server container, and can now be
used to configure upgrades using the shared mapping with
the WSUpgradeFilter
the JettyWSSCI now works in the same way as the JavaxWSSCI, the
JettyWebSocketEmbeddedStarter has been removed and the configureContext
now returns the JettyWebSocketServerContainer
WebSocket upgrade failures due to exceptions will now be logged as
a warning in WebSocketMapping rather than being ignored
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-11 18:05:44 +11:00
265e0be6f7
Issue #3446 - jetty-websocket tests for WebSocketUpgradeFilter
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-11 18:05:44 +11:00
a01fc193a1
WebSocket code cleanups and renaming
...
rename JettyWSSCI.configure to configureContext, this is more similar
to the javax equivalent version
introduce helper method getMapping in WebSocketMapping
WebSocketServletFactory now implements FrameHandler.Configuration
changed WebSocketMapping Attribute name in WebSocketUpgradeFilter
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-11 18:05:44 +11:00
ddd60f1992
Issue #3406 - changes from review
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-08 14:50:49 +11:00
375ad81f4b
Issue #3440 Stop on Unavailable
...
+ Any schedulers created are named (for ease of debug) and daemon
so they do not stop the JVM exiting.
+ If the server.doStart() fails, it calls server.doStop to ensure
connectors are stopped, ports are free etc.
+ cleanup of addBean handling of scheduler in proxy
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-07 15:10:53 +11:00
01bc9d3835
Issue #3406 - fix SessionTracker and JettyWebSocketFrameHandlerTest
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-07 14:19:35 +11:00
59ec0da768
Issue #3406 - fix jetty websocket tests
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-07 10:52:03 +11:00
155974bc07
Issue #3406 - jetty and javax WebSocket FrameHandler fixes
...
invoke the close handle in onClosed instead of onCloseFrame in
JettyWebSocketFrameHandler
in both frame handlers replace usage of getClass().getName()
with getClass().getSimpleName() to increase the amount of characters
from the original exception which can fit in the close frame message
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-07 10:27:50 +11:00
13f8202c06
Issue #3412 - fix WebSocketClient configuration methods
...
WebSocketClient implements WebSocketPolicy but the methods were never
wired through to use the websocket core FrameHandler.Customizer
the WSClient now has a ConfigurationCustomizer which it uses to
configure the WebSocketCoreClient
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-07 10:27:50 +11:00
16fa1133d7
Issue #3406 - enabling all disabled tests in WebSocket
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-07 10:22:59 +11:00
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
ab304a096e
avoid adding NULL UpgradeListeners to WebSocketClient
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-06 17:11:57 +11:00
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
1160a8d08f
Issue #3106 - turn auto fragment off for WebSocketStatsTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-06 10:27:02 +11:00
6094b3802f
Issue #3106 - WebSocketConnectionStats changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-06 10:27:02 +11:00
46c2941a82
Issue #3106 - implement WebSocketConnection stats
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-06 10:27:02 +11:00
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
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
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
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
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
ec28eb6ddd
Merge pull request #3414 from lachlan-roberts/jetty-10.0.x-UpgradeListener
...
add support for WebSocket UpgradeListeners in WebSocketClient
2019-03-05 09:57:55 +11:00
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
438042e28b
Merge pull request #3418 from eclipse/jetty-9.4.x-3401-websocket-permessage-deflate-rsv1
...
Issue #3159 - Ensuring we follow permessage-deflate RSV1 rules in RFC7692
2019-03-04 09:26:47 -05:00
6444446652
Issue #3159 - Ensuring we follow permessage-deflate RSV1 rules in RFC7692
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-01 16:56:29 -05:00
160842805b
Issue #3389 - Fixing testcase expectation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-01 15:44:42 -05:00
3bc3d7514d
Issue #3389 - missing willDecode calls in javax.websocket
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-01 14:12:21 -05:00
ddb75984d1
add support for WebSocket UpgradeListeners for jetty WebSocketClient
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-03-01 18:34:07 +11:00
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
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
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
234d3e224b
Adding missing ClientWriteThread
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-28 08:47:36 -05:00
d791b3631d
Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x
2019-02-28 08:27:18 -05:00
ddc904f1f6
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# 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-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-2/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmh/pom.xml
# jetty-jmh/src/main/java/org/eclipse/jetty/http/jmh/MultiPartBenchmark.java
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/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-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/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-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/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-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/AbstractJsrRemote.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrCallable.java
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/OnPartialTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTrackingTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/ConfiguredEchoSocket.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/LargeEchoAnnotatedSocket.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/LargeEchoConfiguredSocket.java
# jetty-websocket/jetty-websocket-tests/pom.xml
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/SlowClientTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ContainerEndpoint.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseCreator.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerTest.java
# jetty-websocket/jetty-websocket-tests/src/test/resources/jetty-logging.properties
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java
# jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WriteCallback.java
# jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/IncomingFrames.java
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketUpgradeRequest.java
# jetty-websocket/websocket-client/src/test/resources/jetty-logging.properties
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/LogicalConnection.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/Parser.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpoint.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/AbstractEventDriver.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/AbstractExtension.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/identity/IdentityExtension.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FramePipes.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/DelegatedContainerScope.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/SimpleContainerScope.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/WebSocketContainerScope.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ClosePayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/GeneratorParserRoundtripTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/PingPayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/RFC6455ExamplesParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TextPayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase1_1.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase1_2.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase2.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase7_3.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventDriverTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/DummyIncomingFrames.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/FrameFlusherTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/LocalWebSocketConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadClient.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/DummyConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/IncomingFramesCapture.java
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdleTimeoutTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/SimpleServletServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketProtocolTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/ABSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/BigEchoSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/RFCSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SessionSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
# jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-distribution/pom.xml
# tests/test-http-client-transport/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-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-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-http2-webapp/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-simple-webapp/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2019-02-28 08:26:58 -05:00
4ee399be1e
WebSocket core test cleanups
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-28 18:14:34 +11:00
d3c32b2446
Merge pull request #3403 from lachlan-roberts/jetty-10.0.x-websocket-tests-tls
...
Issue #3402 - parameterized WebSocketCloseTest over TLS
2019-02-28 16:28:41 +11:00
3525c403a5
Disabling old test
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-27 17:24:36 -05:00
d8a9f2619b
Issue #3379 - Add tracking of WebSocket Sessions to various WebSocket Container APIs
...
+ Jetty WebSocket API now tracks Sessions and will close them on
lifecycle stop
+ Javax WebSocket API now tracks Sessions and will close them on
lifecycle stop
+ Adding Jetty WebSocket tests for proper close / session tracking
+ Disabling tests that need triage
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-27 16:26:43 -05:00
4f0abff931
Issue #3402 - parameterized WebSocketCloseTest over TLS
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-27 15:27:26 +11:00
3a7dee0e18
Merge pull request #3384 from lachlan-roberts/jetty-10.0.x-3165-javax-websocket-server-tests
...
Issue #3165 use add-exports instead of add-opens in javax WS-Server pom
2019-02-22 08:54:41 +01:00
037d8b9059
Issue #3165 use add-exports instead of add-opens in javax WS-Server pom
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-02-22 14:19:37 +11:00
ee1a7f613f
Issue #3279 - Merge of FrameFlusher fix
...
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-21 13:56:32 -05:00
0f4294e95a
Issue #3380 - Adding configured Connection.Listeners to WebSocket Connections
...
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-21 10:05:36 -05:00
58c0808f19
Issue #3165 - fix to javax-websocket-server module issues
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-02-20 15:15:12 +11:00
4378f5d08e
Issue #3165 - Configure the HttpClient via XmlHttpClientProvider
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 11:30:30 +11:00
1e93a46eed
Issue #3165 - added test for examples in javax-websocket-server
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 11:29:10 +11:00
beff8a208e
Issue #3165 - rearrange packages for javax-websocket-server tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-19 11:28:37 +11:00
83b53f102c
Merge pull request #3336 from eclipse/jetty-10.0.x-3290-websocket-close
...
Jetty 10.0.x #3290 websocket close
2019-02-18 10:49:33 +01:00
85bc84b122
Issue #3341 - XmlHttpClientProvider
...
Updated comment referencing old class name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-18 10:40:32 +01:00
42290828a6
Merge pull request #3357 from lachlan-roberts/jetty-10.0.x-3341-HttpClientProvider
...
Issue #3341 - WebSocket HttpClientProvider
2019-02-18 10:37:08 +01:00
c14df16494
Merge pull request #3335 from lachlan-roberts/jetty-10.0.x-3290-websocket-close
...
Issue #3290 - FrameFlusher and WebSocket close fixes
2019-02-18 07:30:19 +09:00
a4a6bd03e7
Fix from review
...
use the new close(Throwable) in endpoint
2019-02-17 18:11:23 +09:00
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05:00
eb70b24016
Updating to version 9.4.15.v20190215
2019-02-15 11:53:00 -05:00
8dba440317
Issue #3279 - WebSocket Close Refactoring
...
+ FrameFlusher "close" frames are detected during
enqueue and sets the state properly for failing
other frames after it
+ Moving away from Blockhead(Client|Server) to using actual implementations
+ Moved tests to /jetty-websocket-tests/ to be able to use actual impl
for both sides of testcase (client and server)
+ Corrected FrameFlusher terminate/close to not fail the close frame
itself, but only frames that arrive AFTER the close frame.
+ Moving WebSocketCloseTest to jetty-websocket-tests to avoid
using BlockheadClient / BlockheadServer in testing
+ Cleanup of unnecessary modifiers on interface
+ Logging error if @OnWebSocketError is undeclared
+ IOState removed
+ New ConnectionState tracks connection basics in a simpler
method then IOState did.
+ No tracking of Remote close initiated (not needed)
+ IncomingFrames.incomingError() removed
+ Session delegates to Connection for all state changes
+ Errors can be communicated to application multiple times
+ Close is only communicated once
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-15 10:07:24 -05:00
d8b5f0e1b3
Issue #3341 - HttpClientProvider changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-15 18:31:53 +11:00
149620598d
Issue #3341 - change HttpClientProvider to interface
...
- HttpClientProvider is now an interface which defines a default method
newHttpClient, its static get() method get will attempt to use the
XmlHttpClientProvider to create a client, and if this fails to give a
non null client it will be created with the default newHttpClient method
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-14 16:13:43 +11:00
c6fd7a616f
Issue #3341 - Use HttpClientProvider in WebSocketCoreClient
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-14 12:19:00 +11:00
6aa917080f
Issue #3347 - Fix race condition between onFillable() and resume().
...
Renamed Suspender -> ReadState.
Reworked the implementation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 16:15:07 +01:00
e16e836aa6
Fix race condition between onFillable() and resume()
...
Signed-off-by: Shawn Smith <shawn@thena.net>
2019-02-11 18:08:53 -06:00
b9f89af847
Fixes #3320 - Review Jetty 10 module-info.java.
...
Reviewed module-info.java files.
For those that have a "requires static" added a comment about
why the dependency is optional.
Rearranged directives in alphabetical order.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-08 17:30:27 +01:00
6f7e1e3c48
Fixes #3333 - Jetty 10 standalone cannot start on the module-path.
...
Added --add-modules=ALL-MODULE-PATH by default because now Jetty has
proper JPMS modules and when starting in standalone mode only the
org.eclipse.jetty.xml module will be in the module graph - while
before automatic modules where added to the module graph implicitly.
Added --add-reads=ALL-UNNAMED to the websocket module to allow the
websocket implementation to access method handles of application
classes (the websocket endpoints) that live in the web application
classloader (which forms an unnamed module).
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-07 17:48:17 +01:00
3d096c9e99
Merge branch 'jetty-10.0.x-3290-websocket-close' of https://github.com/lachlan-roberts/jetty.project into jetty-10.0.x-3290-websocket-close
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-07 14:17:25 +11:00
c86bf2e57f
Issue #3290 - review changes, javadoc and todos
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-07 14:09:23 +11:00
11dfe70fc2
Add a Throwable case to EndPoint and Connection onClose notifications
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-07 11:55:40 +11:00
1709c90286
Issue #3290 - fixing issues with WebSocketClose
...
introduce channelState check in the catch in WSChannel sendFrame
to guard from multiple closes
WebSocketConnection fillAndParse will now try to read until EOF
removed state change in the isOutputOpen check in webSocketChannelState
to as we do the state change in the catch block in WSChannel
added and improved WebSocketCloseTest to test more cases
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-07 09:58:43 +11:00
ff1f3ca3be
Issue #3290 - WebSocket read and writer error handling
...
when the WSConnection reads EOF it now notifies the WSChannel
the channel instead of handling it locally
fixed FlusherFlusher failure issues
fixed issue with the WebSocketCloseTest expecting close reason
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-07 09:58:08 +11:00
cd488c2d7d
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3162_jetty_servlet_api'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 23:11:32 +01:00
33f314e9f5
Issue #3162 - Use Jetty specific Servlet API jar.
...
Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:51:51 +01:00
bfcb890ab2
Issue #3298 - rename typo in JettyWebSocketTest name
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-04 15:05:15 +11:00
77b7e275cc
Issue #3298 - fix to pom file
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-04 14:54:27 +11:00
88408375ab
Issue #3049 - Warn on common SslContextFactory problematic configurations.
...
Updating SslContextFactory configuration for tests, since
the change in the default endPointIdentificationAlgorithm
makes the test failing as the certificates are not valid
for the local host, which is different depending on where
the tests are run (locally, jenkins).
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-31 15:31:35 +01:00
6a98cc0bd2
Issue #3298 - bug fixes for jetty websockets
...
succeed callback when you do not have a message sink
OnWebSocketFrame annotation should take an API frame not a core frame
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-31 22:24:09 +11:00
bd4f9b30fc
Issue #3298 - cleanup of CompletableFutures for WebSocket upgrades
...
Jetty and Javax ClientUpgradeRequests no longer use the combination of
the the onOpenFuture and the futureCoreSession and instead use only
the CompletableFuture future given to the FrameHandler onOpen
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-31 11:13:05 +11:00
c30c8d4339
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-client/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
# 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/TestJettyOSGiBootWithJavaxWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
# jetty-quickstart/pom.xml
# jetty-servlets/pom.xml
# jetty-util/pom.xml
# jetty-websocket/javax-websocket-client/pom.xml
# jetty-websocket/javax-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-server/pom.xml
# pom.xml
2019-01-30 11:56:58 -06:00
684dcd1693
Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3298-completableFutures
2019-01-30 15:00:01 +11:00
78dc801153
WebSocketMapping Refactor - add javadoc for WebSocketComponents
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-30 14:02:50 +11:00
deaaa0bf30
Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-websocketmapping-refactor
2019-01-30 13:49:10 +11:00
b4bd5980aa
Issue #3298 - Refactor of upgrade request class names
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-30 10:00:56 +11:00
b0aec2b26e
fix bug in WebSocketMapping failing isInstance test
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-29 15:26:16 +11:00
f5751618bd
Issue #3290 async onOpen, onClose and onError
...
Fixed OSGi tests.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-29 13:08:35 +11:00
8c5d421b5b
remove unnecessary imports in jetty-websocket-tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-29 12:03:53 +11:00
cf0eaecbdc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3290-websocket-onOpen
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-29 10:59:08 +11:00
1d9e7b7613
Merge pull request #3199 from lachlan-roberts/jetty-10.0.x-3139-npe-websocket-sci
...
Issue #3139 - NPE in WebSocketContainerInitializer for jetty10
2019-01-29 10:56:59 +11:00
3ad584eaef
Issue #3290 async onOpen, onClose and onError
...
Changes after review:
+ failure to send abnormal close closes connection prior to failing
callback.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-29 10:45:54 +11:00
6f7395c8f0
Issue #3290 async onOpen, onClose and onError
...
Changes after review:
+ fixed import order
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-29 10:38:12 +11:00
84d74ba1de
Issue #3290 async onOpen, onClose and onError
...
Changes after review:
+ removed Adaptor from FrameHandler, so all non test usages of
FrameHandler now use async API.
+ Fixed sequencing of multiple async operation so callback is notified
after completion (created more Callback.from utilities for this)
+ fixed import order
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-29 10:33:37 +11:00
402d756ea5
rename websocket-tests module to jetty-websocket-tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-29 10:29:38 +11:00
1171d7c8d7
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3290-websocket-onOpen
2019-01-26 18:16:30 +11:00
8b93922d08
Issue #3290 async onOpen, onClose and onError
...
Gave onOpen, onError and onClose callback signatures
Illegal to ask for demand prior to onOpen success
added tests for various onOpen scenarios
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-26 15:34:50 +11:00
aa1d6ff9cd
WebSocketMapping refactor changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-25 17:11:27 +11:00
a8a5e50579
Issue #3139 ContextHandler must be set on server before configureContext
...
If configure context is called with a context that does not yet have
a server, we should just throw an ISE. This is better than having a
different configuration result depending on if the context has been set
been added to the handler tree or not.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-25 17:05:26 +11:00
6145fd7468
Issue #3166 add autobahn testsuite running via autobahn maven plugin ( #3292 )
...
Issue #3166 Add autobahn profile to automatically run autobahn test suite in Jenkins
2019-01-25 15:10:24 +10:00
0c85b3138f
rename of WebSocketResources to WebSocketComponents
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-25 11:57:03 +11:00
b2f2a16aed
Merge branch 'jetty-10.0.x-websocketmapping-refactor' of https://github.com/lachlan-roberts/jetty.project into jetty-10.0.x-websocketmapping-refactor
2019-01-25 11:38:40 +11:00
ececab10ca
Issue #3139 - NPE in WebSocketContainerInitializer for jetty10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-24 17:18:29 +11:00
e98809c990
javax WebSocketMappings now stored in ContextHandler attributes
...
WebSocketMappings are now stored as attributes in the ContextHandler
init params can be set on the filterHolder to specify what mapping
should be used
the default mapping is stored with attribute key
WebSocketMapping.DEFAULT_KEY and ensureFilter now doesn't ensure there
is an UpgradeFilter registered at "/*" but checks that there is an
UpgradeFilter using the default mapping
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-24 15:10:13 +11:00
1c999a1794
added missing licence headers
...
fixed todo with default WebSocketUpgradeFilter path mapping
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-24 11:50:25 +11:00
330a3e7f58
simple onOpen test
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-24 10:34:14 +11:00
f170191003
Fix problems with close unit tests before creating open unit tests
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-24 10:12:36 +11:00
5f20651d06
Issue #3290 websocket onOpen states
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-24 09:48:30 +11:00
5095c8a7b2
Issue #3288 - Correcting Jetty WebSocket API artifactIds
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-23 15:58:11 -06:00
d37dfd4357
Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-websocketmapping-refactor
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-23 18:45:59 +11:00
90003dee13
Issue #3182 - restored old websocket example files
...
added new test for these example files
added register and setCreator methods in WebSocketServlet to
give more compatibility with old api
implemented isUserInRole in UpgradeHttpServletRequest to get
example working
made the JettyWebSocketTest more clear
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-23 18:43:54 +11:00
b06601e5f1
disable checks for duplicate websocket mappings
...
throwing on adding of a duplicate websocket mapping causes problems
in EndpointViaConfigTest where we can add mappings even if they have
already been discovered by annotation
added a todo to review why we can't implement this check
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-23 10:18:42 +11:00
d520ae5a11
Issue #2175 cleanups after review
...
Re implemented a queue and flusher above extension stack to serialize
frame handling without holding a lock when calling callbacks
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-23 09:06:27 +11:00
3d7ee93112
Issue #2175 cleanups after review
...
Re implemented a queue and flusher above extension stack to serialize
frame handling without holding a lock when calling callbacks
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-23 08:49:55 +11:00
d598e0dc6f
Issue #2175 cleanups after review
...
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 21:20:01 +11:00
74a5cfa190
remove the word default from all WebSocketServletFactory methods
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-22 18:32:14 +11:00
15c6f5250d
do not set WebSocketMapping in WSUpgradeFilter if already set
...
the WSUpgradeFilter now has to be registered at "/" or "/*"
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-22 18:17:33 +11:00
3c2f728574
move check for duplicate mappings to WebSocketMapping class
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-22 18:08:31 +11:00
7fec51ad40
Issue #2175 cleanups after review
...
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 15:41:46 +11:00
1189ceed4c
Issue #2175 cleanups after review
...
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 13:36:09 +11:00
05dfbd18cd
Issue #2175 cleanups after review
...
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 13:25:29 +11:00
4008005a0e
Jetty WebSockets no longer use shared mapping
...
mapping is now created for each WebSocketServlet
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-22 11:55:18 +11:00
e1674cf4b6
separate out resources from the WebSocketMapping
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-22 11:39:53 +11:00
f9b9cc1313
Issue #2175 cleanups after review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 09:11:05 +11:00
2ab6f3d66f
added sharedresources
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-21 21:14:22 +11:00
0f2f1c1e92
new websocket-tests module
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-18 16:39:26 +11:00
51feef6dcf
javax websocket bug fixes, for duplicate mappings, and null messageSinks
...
dont allow duplicate mappings to be added to websocket mapping for javax
succeed the callback in JavaxWebSocketFrameHandler with null messageSink
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-18 15:19:54 +11:00
bc951030ba
cleanup the isEnabledViaContext check in JavaxWebSocket SCI
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-17 12:27:42 +11:00
f16789b101
Issue #3167 cleanups after merge (in #2175 )
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-16 15:19:36 +11:00
be69351f0e
Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 18:02:41 +11:00
4a70d1534e
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 17:59:09 +11:00
5307f49bbc
Merge pull request #3259 from lachlan-roberts/jetty-10.0.x-websocket-tests
...
Issue #3246 - javax-websocket-tests exception stacktraces
2019-01-15 17:56:08 +11:00
c84f97e983
Issue #3246 Avoid concurrent raw write on fuzzer client
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 16:58:30 +11:00
391f2b1a27
Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close
2019-01-15 16:28:39 +11:00
4f570b62e3
BrowserTool enhancements
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 16:28:01 +11:00
12655a0944
Working BrowserDebugTool for jetty websocket API
...
Plus fixes for 10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 15:54:09 +11:00
aedf17b020
Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close
2019-01-15 14:13:55 +11:00
30db9addbb
fixed javadoc
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 14:13:13 +11:00
be3b155e32
fixed merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 14:01:25 +11:00
878e51032d
Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close
2019-01-15 13:38:19 +11:00
e1daad1599
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 13:31:11 +11:00
3246d07ca9
Revert "Working BrowserDebugTool for jetty websocket API"
...
This reverts commit c320e020d2
2019-01-15 13:14:53 +11:00
5d31612ec2
Merge remote-tracking branch 'eclipse/jetty-10.0.x-3167-2175-websocket-close' into jetty-10.0.x-3167-2175-websocket-close
2019-01-15 13:05:23 +11:00
63a1db39a0
Issue #3167 - simplification of WebSocketChannelState from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 11:58:39 +11:00
664ddef6fd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:44:53 +11:00
39e6bff114
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:22:15 +11:00
8802aebc1b
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:19:55 +11:00
cd6964220f
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:11:43 +11:00
4bacaf21e4
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:04:20 +11:00
c320e020d2
Working BrowserDebugTool for jetty websocket API
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-14 10:13:59 -06:00
149c28f463
Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close
2019-01-12 14:39:01 +11:00
5036893426
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 10:30:47 +11:00
392412b2d0
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 10:26:09 +11:00
d89e797a1b
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 10:06:59 +11:00
a7e2ead7bc
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 09:12:02 +11:00
74df6bf1a9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-maven-plugin/src/it/it-parent-pom/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
# jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java
# jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/index.html
# jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/websocket.js
2019-01-11 12:11:38 -06:00
aa7f3bd071
Merge pull request #3245 from eclipse/jetty-9.4.x-issue-3242-websocket-dump-cleanup
...
Issue #3242 - WebSocket dump cleanup
2019-01-11 11:59:06 -06:00
1b7ae00be3
Issue #3242 - Post-review cleanup of AbstractWebSocketConnection dump of EndPoint
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-11 11:27:10 -06:00
478e5ac593
Issue #3242 - Post-review cleanup of WebSocket dump
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-11 10:16:46 -06:00
1e4ac07511
Merge remote-tracking branch 'eclipse/jetty-10.0.x-3167-2175-websocket-close' into jetty-10.0.x-3167-2175-websocket-close
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-10 21:25:15 +11:00
027e7ac959
Issue #3246 Avoid concurrent raw write on fuzzer client
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 18:57:38 +11:00
9a7e7bc999
Issue #3167 - Refactor of WebSocketChannelState
...
WebSocketChannelState now performs frame sequence checks and is called
on every outgoing and incoming frame, these checks return true to
indicate that the WebSocketChannel is fully closed
unrelated changes in
ExtensionStack:
succeeded() needed to be called instead of failed as explained
in the comment above the change
WebSocketClient:
removed duplication of the connect code by calling connect again
with a null UpgradeRequest
FrameFlusher:
improved the logging
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-10 18:53:52 +11:00
ce771070f6
removed extension queue #2175
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 16:31:50 +11:00
9bd9133399
externalized flusher iteration #2175
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 16:05:29 +11:00
4165c4507b
Refactor websocket close for #2175
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 14:50:53 +11:00
6ec615dc32
happy new year
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 08:47:31 +11:00
9b0c8336ba
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 08:34:33 +11:00
40f1d5866f
call succeeded() to drain the queue instead of calling failed() in the
...
ExtensionStack Flusher
documentation fix in WriteFlusher
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-09 16:19:55 +11:00
c36d9bc3fc
Issue #3246 - suppressed logging for stacktrace in IdleTimeoutTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-09 14:37:51 +11:00
19e2ab8a70
Issue #3246 - fix to DecoderReaderManySmallTest stacktrace being logged
...
succeed the callback in EventIdFrameHandler after sending responses in
DecoderReaderManySmallTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-09 14:32:37 +11:00
020a980394
Merge pull request #3155 from eclipse/jetty-9.4.x-issue-3139-npe-websocket-sci
...
Fixes #3139 - NPE in WebSocketContainerInitializer
2019-01-08 15:57:35 -06:00
689fab4979
Issue #3242 - Cleaning up WebSocket dump
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-08 15:47:49 -06:00
0078d8aed6
Issue #3242 - Updating BrowserDebugTool to help troubleshoot issue
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-08 15:45:54 -06:00
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
729bf8299c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-23 13:51:01 +11:00
9216d5ab63
Merge pull request #3224 from lachlan-roberts/jetty-10.0.x-3216-AutobahnWebSocketServerFailures
...
Issue #3216 - Autobahn WebSocketServer failures in jetty 10
2018-12-23 13:49:35 +11:00
f5eb4864cc
Issue #3166 Jetty 10.0.x autobahn test ci ( #3221 )
...
* issue #3166 add autobahn test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 21:16:23 +10:00
8c7c5a5d01
Issue #3167 Improve websocket initialization
...
Improve on #3167 with major refactor of the context initialization of
websocket:
+ The Javax and Jetty sides are more symmetric - both use shared
filter and mapping.
+ Regularised usage of beans rather than attributes for ws components
+ Customization is now part of the mapping, so ws are configured by
how they were mapped and not by who does the upgrade.
+ Filter still can be configured to customize defaults
+ Servlet can be configured to customize any ws mappings added via the
servlet
There is still some strangeness as the WebSocketServlet is mostly
generic, yet can only map Jetty API websockets.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-22 10:30:37 +11:00
164859fb9f
Issue #3216 - Autobahn WebSocketServer failures in jetty 10
...
removed maxFrameSize from CompressExtension now use the
WebSocketChannel.getMaxFrameSize() to fix a bug where a change in the
WebSocketChanel maxFrameSize was not reaching the CompressExtension
create dummy WebSocketChannel in tests using CompressExtension without
a channel to replace the setter for maxFrameSize
increased the maxFrameSize in AutobahnWebSocketNegotiator to fix
autobahn tests being over maxFrameSize after being inflated
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-12-20 20:08:35 +11:00
3779b0384d
Issue #3167 - add the WebSocketCoreClient factory as a bean
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-12-19 15:35:32 +11:00
3bcb4d8229
Issue #3167 - lazily create the WebSocketCoreClient
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-12-18 17:19:55 +11:00
1176b267b5
removed -impl from websocket name and fixed SCI
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 10:05:10 +11:00
52d0d62594
Configure default EndpointIdentificationAlgorithm for WebSocketCoreClient
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 09:36:13 +11:00
9a67114c43
work in progress to fix websocket OSGi
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-12 17:35:46 +11:00
ff0aa965c4
Issue #3162 - Attempting to address ServiceLoader with javax.websocket (client) on OSGi
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-12 14:43:58 +11:00
252bb5dd72
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3129-websocket
2018-12-11 17:02:16 +11:00
0dcdcc7baf
Jetty 10.0.x fix surefire arg line (to avoid locale dependent build) ( #3183 )
...
* surefire.argLine replaced by jetty.surefire.argLine
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-06 09:09:06 +10:00
e8d468b3e1
work in progress
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-05 14:45:23 +01:00
435dd200bd
Issue #3162 - Attempting to address ServiceLoader with javax.websocket (client) on OSGi
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-04 11:31:02 -06:00
Lachlan Roberts
Joakim Erdfelt
Greg Wilkins
Simone Bordet
Joakim Erdfelt
Shawn Smith
Olivier Lamy
olivier lamy