Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 16:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
jetty.project/jetty-websocket/websocket-jetty-server/pom.xml

77 lines
2.6 KiB
XML
Raw Normal View History

Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
<?xml version="1.0" encoding="UTF-8"?>
Jetty 10.0.x reformat (#3812) * Removing Legacy Method Separators * Restyling branch `jetty-9.4.x` * Applying changes highlighted by checkstyle * Removing Legacy Method Separators * Restyling branch `jetty-10.0.x` * Applying checkstyle changes * Applying checkstyle changes * Applying XML restyling * Restyling XML in branch `jetty-10.0.x` * Fixing XML codestyle for IntelliJ * Fixing XML style mistakes * Fixing XML restyling in branch `jetty-10.0.x` * Revert "Applying XML restyling" * Updating checkstyle for XML codestyle * Revert "Restyling XML in branch `jetty-10.0.x`" # Conflicts: # jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml # jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml * Adding back build-resources * Reformatting pom.xml files * Disabling Checkstyle job * fixed empty string on line wrap * reformatted with latest intellij style * misc checkstyle fixes Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:42:39 +02:00
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
<parent>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-parent</artifactId>
Updating to version 10.0.8-SNAPSHOT
2021-10-06 14:51:32 -05:00
<version>10.0.8-SNAPSHOT</version>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
</parent>
<modelVersion>4.0.0</modelVersion>
Update websocket artifact IDs Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-23 13:32:21 +11:00
<artifactId>websocket-jetty-server</artifactId>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
<name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Server</name>
<properties>
<bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
</properties>
<dependencies>
<dependency>
Issue #2173 & #2174 - Split websocket-core into client/server/common modules Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-12 15:10:44 +10:00
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-api</artifactId>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
</dependency>
<dependency>
Issue #2173 & #2174 - Split websocket-core into client/server/common modules Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-12 15:10:44 +10:00
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-common</artifactId>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
</dependency>
<dependency>
Issue #2173 & #2174 - Split websocket-core into client/server/common modules Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-12 15:10:44 +10:00
<groupId>org.eclipse.jetty.websocket</groupId>
Move websocket-util classes into websocket-core (#5705) - Merge websocket-util classes into websocket-core - rename websocket-util-server to websocket-servlet - remove websocket-util * merge websocket-util into websocket-core-common * move websocket-util-server implementation to websocket-core-server * rename websocket-util-server to websocket-servlet * Negotiator should not need the WebSocketComponents, give this to handshaker instead * fix tests and WebSocketConfigurations * move exception classes in websocket-core-common * move MessageSinks and util to internal package * create internal package for websocket-core-client * fix JPMS warnings for websocket common modules * Fixed exports declarations to make MethodHandles.publicLookup() working properly. * fix broken tests with wrong WebSocketUpgradeFilter package name * remove -T3 option to not have parallel build * no need of jacoco here * do no reuse forks * remove logback dependency and disable debug log level * make this test dynamic instead of hardcoded version... * use -fae * change websocket-servlet bundle symbolic name * cleanup changes * restore bugs.... * Updates after review. Co-authored-by: Simone Bordet <simone.bordet@gmail.com> Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-02 11:10:15 +11:00
<artifactId>websocket-servlet</artifactId>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
</dependency>
Issue #3167 cleanups from review Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:11:43 +11:00
<dependency>
Issue #2173 & #2174 - Split websocket-core into client/server/common modules Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-12 15:10:44 +10:00
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
Issue #3167 cleanups from review Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:11:43 +11:00
</dependency>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
<dependency>
Issue #2173 & #2174 - Split websocket-core into client/server/common modules Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-12 15:10:44 +10:00
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
</dependency>
<dependency>
Issue #2173 & #2174 - Split websocket-core into client/server/common modules Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-12 15:10:44 +10:00
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
</dependency>
Issue #4722 - create new module websocket-util-server - This module contains the WebSocketUpgradeFilter. - Also has an internal package with the components used to implement websocket upgrades common to both the jetty and javax websocket implementations. Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-22 17:26:46 +10:00
<dependency>
Issue #2173 & #2174 - Split websocket-core into client/server/common modules Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-12 15:10:44 +10:00
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<optional>true</optional>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
</dependency>
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency. + Mark as a test dependency Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-19 17:46:41 -05:00
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId>
Issue #4685 - Declare <scope> for jetty-slf4j-impl everywhere Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:12:08 -05:00
<scope>test</scope>
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency. + Mark as a test dependency Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-19 17:46:41 -05:00
</dependency>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
Issue #3661 - review of exposed classes in jetty-websocket-server (#3779) * Issue #3661 - review of exposed classes in jetty-websocket-server Signed-off-by: Lachlan Roberts <lachlan@webtide.com> * Issue #3762 - cleanups of jetty-websocket-server Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-17 17:12:46 +10:00
<Bundle-Description>Jetty Websocket Server</Bundle-Description>
removed -impl from websocket name and fixed SCI Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 10:05:10 +11:00
<Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
Issue #3162 - Fixing OSGi manifest for websocket Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-03 17:31:51 -06:00
<Provide-Capability>
removed -impl from websocket name and fixed SCI Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 10:05:10 +11:00
osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer
Issue #3162 - Fixing OSGi manifest for websocket Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-03 17:31:51 -06:00
</Provide-Capability>
Jetty 10.0.x websocket refactor (#3055) * Adding more todos * More websocket test updates * Adding more information to exception about mismatched hash * AcceptHash improved testing * Prevent duplicate request headers * Removing ability to use LocalFuzzer entirely (until its fixed) * JSR356 HandshakeResponse header modifications are now allowed during Configurator * Correcting MessageSink creation * Using proper sub-protocol * Metadata remembers OnMessage.maxMessageSize now * Minor test updates * Issue #2172 - Fixing JSR-356 Decoder discovery and OnMessage wiring * More websocket test updates * Update for null/empty payload * Partial String Message Sink fix * More websocket fixes around InputStream handling * Moving proposed Abstract FrameHandler hierarchy into core main * More testing fixes, along with a change to use the new core Abstract*FrameHandler * Adding WebSocket URI validation * Updating copy found in other API with improvements made in first API. * More websocket test updates * Fixing compilation * WebSocket test fixes * Fixing ContinuationTest assertions * fixed package * Added some better examples of QuotedCSV I think this test is trying to use QuotedCSV in the wrong way, as it often is offering values when it should be testing parameters. I have added some examples to show that QuotedCSV is capable of handling the quotes, spaces and embedded commas of the tests, but only for parameters and not for values. The question is, is this sufficient for websocket? * Improve close handling The handling of a Close Frame may close the endpoint, so parsing should not continue * moved old AbstractFrameHandler to test * implement ingoing and outgoing frame sequence checking * More work on javax.websocket parameterized server * Bumping up pom plugin versions to jetty-9.4.x standards * Merging up Jenkinsfile to attempt to fix CI build issues * JSR356 @PathParam testing * More WebSocket testing updates * More WebSocket testing updates * WebSocket Idle Timeout from FrameHandler specific policy * WebSocket/JSR Pong support * WebSocket/JSR Correcting MessageHandler.Whole<PongMessage> handling * URL Decode UriTemplatePathSpec values * Fixing test expectations * Fixing AbstractWholeMessageHandler buffer flip * More websocket test fixes * Updated ALPN version for JDK 8u181. * Removing QuotedUtil from WebSocket-core + Moved to QuotedCSV for most usages + Introduced HeaderUtil to satisfy remaining use cases * Review of HttpClient names and Thread names. + Javax WebSocket Server = "Javax-WebSocketServer@####" + Javax WebSocket Client = "Javax-WebSocketClient@####" * added OpCodeTest.java * Minor Frame cleanup * MessageOS cleanup * Made the OpCode of WebSocket Frame immutable. Frames can no longer be set as a continuation and should now be copied using the ContinuationFrame constructor DataFrames can no longer be created without one of the subclasses as the public constructor was removed in favour of newDataFrame method * Chat test * Work on Chat Test Moved implementation of assertValid to WebSocketFrame Removed getFinRsvOp * removed constructors for DataFrame using a basedOn Frame instead use constructors with opCode, payload and fin bit * refactor of WebSocket Frames WIP * WIP: resolved failing tests * CloseStatus rework, now use CloseStatus.toFrame to create Close Frames new DelegateFrame class which ReadOnlyFrame extends trim utf8 byte array in CloseStatus to utf8 character boundaries only * working on test to test socket io erros in websocket-core * renaming for clarity Gave up on maintaining old names, as this is a different package anyway so some adaption will be needed regardless. * Moved AbstractFrameHandlers to common Only have a AbstractTestFrameHandler in core * Close uses CloseStatus Reduced the parsing and generation of CloseStatus when closing * merge * work on WebSocketTest * cleanup log * wip * files missing comment header jetty-jmh was using 9.4.12-SNAPSHOT now using 10.0.0-SNAPSHOT * thread names * remove sequence check from parser * minor cleanups * Call frameHandler externally to parser * OpCode.check now throws ProtocolException instead of returning boolean changed ProtocolException messages in OpCode.check * removed Frame.Type and use OpCode instead separated out FrameValidation for parser into method in WebSocketChannel * moved remaining frame validation checks into WebSocketChannel * referenced counted buffer * cleanups * wip on demand side * First attempt at demandable * demand control * clean up reference counting * clean ups * WebSocketServerTest * wip * fixed auto fragmentation * simple demand test * test demand and retain * Added validation back into the Parser split up validation in WSChannel into methods for incoming and outgoing fixed various tests in websocket-core * more tests * fixed remaining tests failing due to the changes to frame validation * cleanups * more autobahn refixes * adjust mask for auto fragments * clear mask * fully close on unrecoverable error and not wait for close response * Removed the CoreFuzzer and ContinuationTest These tests are now covered elsewhere. * remove declared exception onClosed * Test delay close * Test handler close * fixed test dependency * moved the frame sequence check from OutgoingState from after the ExtensionStack to channel.sendFrame changed error handling to fail the callback of invalid/outOfSequence frames added WebSocket Close tests revealing some problems with demand in state ICLOSE * cleanup * timing issues with WebSocketCloseTest * test cleanups * Cancel demand on close * removed frame validation from generator * finished close testing * Issue #2901 - Moving Http Upgrader to Http Conversation + Solves for Authentication and Redirect * changes from #2902 to jetty-10.0.x * Validation Extension introduced a ValidationExtension to do frame validation in the ExtensionStack added the WebSocketChannel to ExtensionStack.connect to set it on the Extensions * added parameters for ValidationExtension to choose what to validate * ValidationExtension Cleanup ValidationExtension now uses the Validation methods from its WebSocketChannel simplified the parameter passing to the ValidationExtension * core cleanup * Fixed intermittent test failures * clean up duplicates and imports * simplified package structure * many cleanups, simplifications and duplication removal * cleanup * added utf8 validation for text frames into ValidationExtension added tests for utf8 validation * create ValidationExtensionTest * cleanup * merge with jetty-10 update websocket to junit5 * fix to autobahn client report directory * Fixes and cleanup Fixed initial buffer too large for websocket buffer less verbose debug better debug * Removed behavior from policy * cleanup after merge from hell * bug fixes and cleanups * refactor packages with JPMS in mind * unit test for TextMessageHandler * cleanups * more cleanups * provided client/server dependencies * fixed bad refactor * use lambdas for TextMessageHandler * cleanup * cleanup * cleanups * cleanup of websocket-common framehandlers * reverting to jetty websocket api from 9.4 * better chat * renamed websocket common to util * save wip on jetty-websocket-tests * giving up on jetty-websocket-tests as mostly duplicated tests * renamed websocket-util back to websocket-common * moved InvalidWebSocketException to javax common * reworked TextMessageHandler to MessageHandler now handles binary messages as well * implemented getByteBufferPool in remaining DummyChannel classes * Moved the abstract Frame and Message handlers out of websocket-common * replaced usages of AbstractWholeMessageHandler with CoreMessageHandler renamed MessageHandler to CoreMessageHandler * removed AbstractFrameTypeHandler * cleanup * jetty-websocket-common passing tests without websocket-common dependency * fixed compile errors * renamed MessageHandler * Removing reference to websocket-server (no longer exists) * Removing, Extensions now exist in websocket-core * Do not append an empty ByteBuffer * NPE Fix for empty/unused UTF-8 String Builder * NPE Fix for SendPartialBinaryFrameHandler test * Punching holes in WebAppContext needed for JSR356 use * Updating "9.x.x" to "10.x.x" * Removing Bad URI test case that is ignored * Fixing test expectation now that we moved to QuotedCSV * Adding TODO about onOpen failure requiring onError + onClose. * Throwing JSR356 DeploymentException on addEndpoint() failure * Test cleanup (for better error messages) * Adding some comments to explain wrapNonVoidReturnType() * cleanup methodHandle return type filtering * test fixes * Fix change return type to Void * Fixed test by wiring up MessageHandler * test cleanups removed changeReturnType for MethodHandle as filterReturnValue already changes to return type of the filter * fixed MessageReceivingTest.testPartialBinaryFrameHandler * Core BatchMode replaced by boolean * fixed LargeContainerTest.testEcho by allowing the policy to be set on the WSServer as an attribute * acquire batchBuffer before calculating batchSpace in FrameFlusher * Deprecated WebSocketPolicy * Fixing MessageReceivingTest * Refactoring out websocket-servlet + WebSocketPolicy removed from websocket-servlet + websocket-common is removed + Migrating back up to APIs * WIP removing core policy * added missing copyright headers * customize client session * customize cleanup * wip * wip * Removing WebSocketPolicy usage within websocket-core * Allowing DummyCoreSession to have a Behavior * Removing core WebSocketPolicy.clonePolicy() - no longer used * Jetty Native WebSocket now compiles / tests * Remember WebSocketServletFactoryImpl as Context Attribute * JSR356 codebase now compiles * updated websocket servlets * fix handling for no max message size * Fixed LargeContainerTest.testEcho Changed WebSocketServletFactoryImpl.defaultAutFragment to true only check the incoming frame size if autoFragment is false * Added WebSocketConstants to avoid duplicate default locations * applications extensions discovered via headers * fixed ConfiguratorTest.testNoExtensionsConfigurator * cleaned up extension negotiation * cleaned up extension negotiation * cleanups * Convert exceptions to API versions * cleanup imports * convert requestURI to a WebsocketURI in Negotiated * fixed SessionTrackingTest * moved session tracking management to be done by the JavaxWebSocketFrameHandler * Cleanup dump for jdk11 classloaders * fix to ConfiguratorTest added the EchoSocket endpoint on the ServerContainer instead of using server.registerWebSocket * Simplify websocket-servlet fixed jetty websocket chat example fixes for javax websocket chat example fixed Upgrade response header issues Set default configurations improved dump depends on javax server impl do not expose core classes fix javadoc removed FrameHandlerFactory self reference * Removed -impl from javax client and server * Fixed common tests for onClosed event * Improve creation of JavaxWebSocketServerContainer Better handling of executor and httpClient as managed beans * Fixed MessageOutputStream using empty buffers and looping forever no longer enforce maxTextMessageBufferSize on partial messages * Updates after review reintroduced WebSocketServletFactory reverted other API changes * Ignored TextStreamTest tests incorrectly assuming no frame fragmentation When message fragmentation is implemented in PartialStringMessageSink then update these tests to check on the server side for no buffers larger than the maxTextMessageBufferSize. * fixed check for previous WebsocketUpgrade filter Disable the AltFilterTest until problems of the WebSocketUpgradeFilter attributes on the ServletContext are fixed. * fixed flaky SessionTrackingTest by waiting for Sessions to open * remove payload length check for outgoing frames fix bug sending frames after they have failed validation checks * reverted maven coords for javax client and server * updated to latest jetty-10 dump changes * Fix to WebSocketUpgradeFilter Attributes on the ServletContext Removed deprecated method WebSocketUpgradeFilter.configureContext(ServletContext) Changed return type of WebSocketUpgradeFilter.configureContext(ServletContext) to void. WebSocketUpgradeFilter.configureContext was checking the ServletContext for a WebSocketUpgradeFilter set as an attribute before creating a new one. The FilterHolder from web.xml is being set as an attribute in init which is called which happens after configureContext. So instead of checking the attribute in WebSocketUpgradeFilter.configureContext, we are now searching through the filters on the ServletHandler to see if a WebSocketUpgradeFilter has been registered with the CONTEXT_ATTRIBUTE_KEY. * cleanup and identifying problems with FrameHandlerMetadata * properly cache Metadata and copy MessageMetadata properly cache Metadata in the FrameHandlerFactory using the metadataMap copy the MessageMetadata from Metadata to prevent mutating the MethodHandle * added new WebSocketServerContainerExecutorTest removed DelayedStartClientOnServerTest which doesnt seem to be a valid test when executors are shared removed last check for executor==null in JavaxWebSocketServerContainerInitializer as the threadPool is always created in the server * reformatted websocket code * reformat code * Rervert unnecessary changes from 10.0.x * Rervert unnecessary changes from 10.0.x * fix build issues testing Hazelcast sessions * QuotesDecoderTest sessions not being closed * Fixed CookiesTest CookiesTest.testCookiesAreSentToClient was failing due to the Assertion being caught and logged by the upgrade request the response is now captured by a FuturePromise and the assertions are done in the main test the reason the assertion was failing was due to lowercase "set-cookie" instead of "Set-Cookie" * fixed maven coords * javadoc fixes * fixed javadoc * revert maven artifact names * cleanup after review Signed-off-by: Lachlan Roberts <lachlan@webtide.com> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-02 13:07:43 +01:00
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>
Reference in New Issue Copy Permalink