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
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
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
ec8a1bdb23
Merge pull request #3313 from eclipse/jetty-10.0.x-1350-dynamic_client_transport
...
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
2019-03-19 15:31:11 +01:00
f037258725
Merge pull request #3470 from lachlan-roberts/jetty-10.0.x-3462-websocketclient-validation
...
Issue #3462 - websocket upgrade request valdiation
2019-03-19 16:11:09 +11:00
7e9700fb9a
Issue #3462 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-19 14:38:17 +11:00
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
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
eab971e2cc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-19 09:45:20 +11:00
012b9e526c
Merge pull request #3460 from lachlan-roberts/jetty-10.0.x-3458-jettyWebSocket-API
...
Issue #3458 - jetty websocket upgrades without using websocket-servlet classes
2019-03-19 09:30:20 +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
38787f619d
fix unit test with read module ack
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-18 11:45:33 +10: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
95a6b76851
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-03-15 16:00:59 -05:00
5c134efaca
Updated Windows service documentation. Resolves #3417
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2019-03-15 16:41:10 -04:00
01f2a4e16b
Merge pull request #3431 from eclipse/jetty-9.4.x_3425_upgrade_conscrypt_get_rid_reflect
...
Issue #3425 upgrade conscrypt to 2.0.0 and get rid reflect usage
2019-03-15 09:19:58 +01:00
123918018e
Issue #3425 - Upgrade conscrypt version to 2.0.0 and remove usage of reflection.
...
Small fixes after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-15 09:19:16 +01:00
59b026efce
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-14 18:22:29 +11:00
74233d5711
Merge pull request #3441 from eclipse/jetty-9.4.x-3440-StopOnUnavailable
...
Issue #3440 Stop on Unavailable
2019-03-14 11:24:39 +11:00
ffdbbd1821
Issue #3440 Stop failed lifecycle
...
check that contexts after error are not started.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-14 09:07:16 +11:00
d719dce18c
Merge pull request #3445 from eclipse/jetty-9.4.x-3429-jmx-webappprovider
...
Issue #3429 - Adding WebAppProvider.scan() method to JMX
2019-03-13 16:50:13 -05:00
67838609c3
Merge pull request #3435 from eclipse/jetty-10.0.x-3012-Compliance
...
Issue #3012 refactored HttpCompliance
2019-03-14 08:12:48 +11:00
de5d04177e
Issue #3399 jetty.webapps.uri should be the parent of the webapp ( #3430 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-03-14 07:59:25 +11:00
32c5726f13
Issue #3429 - Adding WebAppProvider.scan() method to JMX
...
+ Fixing up some bad JMX attributes as well.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-13 15:00:41 -05:00
012bfddddc
Issue #3012 - Adding Cookie Compliance Listener support.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-13 12:35:02 -05:00
07d62bb45e
Issue #3012 - Fixing javadoc errors
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-13 11:46:23 -05:00
7404cce052
remove debug logging
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 16:31:27 +01:00
a21dab222f
fix simone review comments
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 16:29:21 +01:00
9471eff332
Issue #3425 upgrade conscrypt to 2.0.0 add note to disable TLS 1.3 for Java 8
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 11:35:10 +01:00
e2ddfbde00
Issue #3425 upgrade conscrypt to 2.0.0 disable TLSv1.3 for jdk8 tests
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 11:35:10 +01:00
adbfcbcf60
- Issue #3425 upgrade conscrypt to 2.0.0 and get rid of reflection usage
...
- align conscrypt version in conscrypt.mod file
- add more simple unit test to test conscrypt alpn usage
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 11:35:10 +01:00
481cedaa94
Issue #3012 Compliance modes.
...
Fixed up httpCompliance configuration.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-13 16:43:11 +11:00
d8695f0712
Issue #3012 Compliance modes.
...
added valueOf methods for XML calls.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-13 15:43:38 +11:00
c7f66521cb
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3012-Compliance
2019-03-13 14:59:02 +11:00
0fb17bff76
Issue #3012 Compliance modes.
...
Updated unit tests for messages and reasons
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-13 11:47:11 +11:00
3b7338888b
Merge pull request #3452 from eclipse/jetty-9.4.x-3444-httpfields-add-preencoded
...
Jetty 9.4.x 3444 httpfields add preencoded
2019-03-13 11:06:12 +11: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
61484a1209
Merge pull request #3448 from lachlan-roberts/jetty-10.0.x-cometd5
...
Issue #3446 - upgrade jetty-websockets with WebSocketUpgradeFilter
2019-03-13 11:03:01 +11:00
925d38b9db
Issue #3012 Compliance modes.
...
CookieCompliance implemented new APIs
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-13 10:15:26 +11:00
6baa4a96f7
Issue #3012 Compliance modes.
...
unused field
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-13 09:54:15 +11:00
e92808156d
Issue #3012 Compliance modes.
...
clean up violation testing and reporting in HttpParser
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-13 09:45:51 +11:00
73ad887ce8
Issue #3012 Compliance modes.
...
Added an abstraction of general compliance mode, violation and listener
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-13 09:17:46 +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
7b407ecb6c
Issue #3440 Stop failed lifecycle
...
stop in reverse order.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-12 22:44:12 +11:00
lachan-roberts
Simone Bordet
Greg Wilkins
olivier lamy
Joakim Erdfelt
WalkerWatch
Jan Bartel