Commit Graph

63 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon) fda982dccb https://issues.apache.org/jira/browse/AMQ-6343
On MQTT Websocket close, a LWT message will be properly sent if
configured and a disconnect packet was not received

(cherry picked from commit bd442a3388)
2016-07-05 18:19:24 +00:00
Christopher L. Shannon (cshannon) 1dfd0eeb60 https://issues.apache.org/jira/browse/AMQ-6346
Prevent concurrent access to the MQTT protocol handlers which can lead
to a tansport level deadlock

(cherry picked from commit 96494f74c7)
2016-07-05 18:18:14 +00:00
Timothy Bish 0c3d05f2ea https://issues.apache.org/jira/browse/AMQ-6262
Ensure that the connection check task is stopped once commands pass
through the inactivity monitor to prevent the transport from being
closed for no reason.
(cherry picked from commit e47edd7a28)
2016-04-25 17:05:45 -04:00
Christopher L. Shannon (cshannon) 317470330e https://issues.apache.org/jira/browse/AMQ-6182
Adding missing License header

(cherry picked from commit e375af3810)
2016-03-01 16:02:38 +00:00
Christopher L. Shannon (cshannon) d3bb4a1a67 https://issues.apache.org/jira/browse/AMQ-6182
Reworking patch so that the http trace method is also turned off by
default for the HttpTransport, besides just for the Websocket transport.
Also added SSL tests for both transports.

(cherry picked from commit 473b3284d4)
2016-02-29 22:38:19 +00:00
Christopher L. Shannon (cshannon) 6ca0e01a7e https://issues.apache.org/jira/browse/AMQ-6182
adding timeout to test method

(cherry picked from commit 7335f699f2)
2016-02-29 22:38:15 +00:00
Christopher L. Shannon (cshannon) cb4f4fbb47 https://issues.apache.org/jira/browse/AMQ-6182
Disabling the HTTP trace method on the websocket port by default.  It
can be enabled by setting the parameter "http.enableTrace=true" on the
connection uri if it is needed for debugging.

(cherry picked from commit 4fb8083977)
2016-02-26 18:55:12 +00:00
Christopher L. Shannon (cshannon) f6c242ad64 https://issues.apache.org/jira/browse/AMQ-6077
Making new values in ActiveMQObjectMessage transient which fixes HTTP
serialization

(cherry picked from commit b9dcb010f7)
2015-12-16 14:39:27 +00:00
Christopher L. Shannon (cshannon) a4845253d0 https://issues.apache.org/jira/browse/AMQ-6073
WSServlet for websockets will attempt to detect the subprotocol
requested and respond with the appropriate one.  Currently the protocols
loaded are what stomp.js use for stomp (v11.stomp and v12.stomp).
If a protocol can't be found then a default will be returned, either
"stomp" or "mqtt", which is the same behavior before this patch.

This will make it a bit easier to use stomp over websockets out of the
box as stomp.js will work by default.

(cherry picked from commit 913f64476b)
2015-12-07 15:33:36 +00:00
gtully 0a12bcb928 https://issues.apache.org/jira/browse/AMQ-2191 https://issues.apache.org/jira/browse/AMQ-3529 - rework fixes to remove uncertanty from dealing with intettuptedexception. Sync requests will trap interrupts that ocurr while waiting for responses and fail the connection with an interruptedioexception. Interrupts pending before requests will be suppressed, allowing possible clean shutdown. It is not safe to replay openwire ops b/c they are not idempotent, the only safe option is to have a teardown of the broker side state from a close 2015-11-27 12:21:56 +00:00
Christopher L. Shannon (cshannon) bbde8473bd https://issues.apache.org/jira/browse/AMQ-5980
Fixing an intermittent test failure in:

org.apache.activemq.transport.ws.StompWSSTransportTest.
testHeartbeatsKeepsConnectionOpen

Adding synchronization on sends for StompWSConnection.  The protocol
doesn't allow multiple threads to call a blocking send at the same time
and the heartbeat keep alive thread was colliding with the main
thread on sends.
2015-11-22 19:01:31 +00:00
gtully d7a3b9406b https://issues.apache.org/jira/browse/AMQ-6029 - make certs available to tunnle servlet - HttpsNeedClientAuthSendAndReceiveTest regression, add javax.security so login exceptions can propogate over http - https://issues.apache.org/jira/browse/AMQ-6013 2015-11-18 16:08:29 +00:00
Timothy Bish caa6b8e253 https://issues.apache.org/jira/browse/AMQ-6046
Prevent concurrent access to protocol handlers which can lead to
transport level deadlocks.
2015-11-17 11:03:31 -05:00
gtully 8136e67b40 https://issues.apache.org/jira/browse/AMQ-6016 - ensure xstream inits transients to default values when it bypasses the default creation method through object deserialization. Can make it more general if there are ever more instances of this. It avoids the need to check for null and sync 2015-10-30 12:01:08 +00:00
Dejan Bosanac f8bfff0bc8 https://issues.apache.org/jira/browse/AMQ-6029 - wss transport with certificate authentication 2015-10-30 11:42:36 +01:00
Dejan Bosanac a7e2a44fe8 https://issues.apache.org/jira/browse/AMQ-6013 - restrict classes which can be serialized inside the broker 2015-10-16 15:44:23 +02:00
Christopher L. Shannon (cshannon) 0f492f3b4b https://issues.apache.org/jira/browse/AMQ-5356
Migrated to Karaf 4.  This was required to support Jetty 9.2.x.
Fixed all OSGi unit tests.
2015-09-03 12:42:22 +00:00
Christopher L. Shannon (cshannon) f44c3d20ed https://issues.apache.org/jira/browse/AMQ-5356
Upgraded to Jetty 9.2.x to solve JDK 8 compatibility issues.
This required migrating to the new WebSocket API.
2015-09-03 11:54:57 +00:00
gtully 547476d1bc compact byteSequence before xstream marshall so that only required bytes are base64 encoded 2015-08-27 11:10:08 +01:00
Timothy Bish 50604ad932 Update RAT plugin to use latest version, add exclusions for eclipse
settins files and the KahaDB data folders created during most test runs.
Add missing headers to a couple files.
2015-08-05 13:08:15 -04:00
Timothy Bish 10ae0d9d6f https://issues.apache.org/jira/browse/AMQ-5870
Resolve race that leads to stalled connect attempt.  Should fix the
failing CI tests that are seeing this.
2015-06-30 17:16:47 -04:00
Timothy Bish 27edaffded https://issues.apache.org/jira/browse/AMQ-5856
Clean up the MQTT over WebSocket code to allow for handling link
stealing and inactivity monitor.  Ensures that the web socket instances
get cleaned up on errors and avoids leaks that might otherwise arise.
Adds new tests for MQTT over WebSocket.

Adds some missing license headers as well.
2015-06-29 18:35:08 -04:00
Christopher L. Shannon (cshannon) be10b866a7 https://issues.apache.org/jira/browse/AMQ-5865
StompSocket and MQTTSocket will now return the appropriate web socket
remote address based on the HttpRequestServlet that initialized
the web socket connection.
2015-06-29 12:46:43 +00:00
Timothy Bish d919db5e3d https://issues.apache.org/jira/browse/AMQ-5804
Apply patch from Pavlo Vasylchenko
2015-06-19 16:28:59 -04:00
Timothy Bish 73e8d10982 https://issues.apache.org/jira/browse/AMQ-5621
Test cleanup
2015-06-01 18:09:23 -04:00
Timothy Bish df06bdabdc https://issues.apache.org/jira/browse/AMQ-5816
Apply patch from Ievgen Tarasov that ensures that the data locator is
initialized when a MessageId is deserialized.
2015-06-01 17:50:20 -04:00
Timothy Bish 8ca6341d40 https://issues.apache.org/jira/browse/AMQ-5784
Apply patch from Lukas Treyer to address MQTT over WS in Jetty 9
2015-05-28 19:00:20 -04:00
Timothy Bish 3125caee5b https://issues.apache.org/jira/browse/AMQ-5794
implement transport.connectAttemptTimeout option across the transports
fro OpenWire, STOMP, AMQP and MQTT and add tests to cover.
2015-05-26 12:29:23 -04:00
Timothy Bish f05f83b15d https://issues.apache.org/jira/browse/AMQ-5755
Unit tests for some STOMP over WebSockets functionality and some fixes
for resource cleanup.
2015-04-30 14:41:59 -04:00
Timothy Bish eea3230c37 https://issues.apache.org/jira/browse/AMQ-5155
Ensure that the inactivity monitor can see that new data is arriving to
prevent wrongful disconnect of clients.
2015-04-28 18:10:24 -04:00
Timothy Bish 9ef4259297 https://issues.apache.org/jira/browse/AMQ-5616
Use ConcurrentMap in declarations
2015-04-28 11:15:08 -04:00
Timothy Bish 299410820e https://issues.apache.org/jira/browse/AMQ-5155
Attempt to fix additional EOF problem
2015-04-02 09:10:08 -04:00
Timothy Bish 516c9db43b https://issues.apache.org/jira/browse/AMQ-5155
Modifed version of patch supplied by Claudio Parodi to handle incoming
ping frames correctly.
2015-03-31 16:36:56 -04:00
Daniel Kulp ffa396ca2d Fix several eclipse warnings of unused things, and other compiler warnings 2015-01-13 15:03:10 -05:00
Daniel Kulp 2128d4d246 Fix some itests due to the servlet import range being inadequate for the version of karaf we are testing with 2015-01-13 13:29:52 -05:00
Daniel Kulp 3f82625077 [AMQ-5517] Runtime support for Jetty 9. Build/compile with Jetty8, but tests pass with Jetty 9 for runtime level support. 2015-01-13 12:47:53 -05:00
Daniel Kulp bc2e2d9a41 [AMQ-5517] Start stubbing in some of the extra params and such that will be needed to support jetty 9 2015-01-13 09:24:50 -05:00
Hadrian Zbarcea 4bf5d0fc13 Test cleanup: use available port instead of hardcoded 2015-01-06 01:23:13 -05:00
Timothy Bish 9b017fdb39 Ensure all resources shut down. 2014-08-18 17:58:58 -04:00
Timothy Bish 3aec42db4f https://issues.apache.org/jira/browse/AMQ-5237
Ensure that the allowLinkStealing option gets applied to the
WebTransportServer
2014-08-18 17:37:35 -04:00
Timothy Bish 14678e1c44 https://issues.apache.org/jira/browse/AMQ-5295
HTTPS Network Connector doesn't work with Mutual authentication-
HTTPSClientTransport uses wrong SSLSocketFactory
2014-08-13 12:44:25 -04:00
Hadrian Zbarcea ed11b067c5 Add missing license headers in preparation of releases 2014-03-31 18:43:54 -04:00
Hiram Chirino f364b8a391 Fixes regression caused by the implementation of AMQ-5050 2014-02-19 18:24:47 -05:00
Hiram Chirino bc4f4e92a6 Fixes AMQ-4896 - MQTT does not properly restore durable subs with the Paho client. 2013-11-18 12:11:34 -05:00
Timothy Bish 5e5458ec38 https://issues.apache.org/jira/browse/AMQ-3388
ignore unknown fields in openwire commands to allow interop between
openwire versions.
2013-11-13 10:36:53 -05:00
Kevin Earls 692428eee5 Fix for AMQ-4857, added test for null before accessing protocol string 2013-11-08 18:03:56 +01:00
Timothy Bish 0f09f78f3e fix for: https://issues.apache.org/jira/browse/AMQ-4740 2013-10-23 12:24:48 -04:00
Timothy Bish c015a98e0a Adds a little test case for Http based discovery 2013-10-18 17:27:13 -04:00
Claus Ibsen bc2bc86a1d AMQ-4799: ws/wss connectors should also log uri when starting like the others do. 2013-10-11 16:34:29 +02:00
Hiram Chirino 272b846b0c Fixes AMQ-4723: HTTP Discovery agent should only poll for broker URLs while attempting to connect a transport. 2013-09-12 11:16:34 -04:00