diff --git a/CHANGES b/CHANGES index 1f23d438c9..19e3ef2e76 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,20 @@ +8.0.0-dev.92 | 2025-05-13 18:26:22 +0200 + + * btest/cluster/websocket: Update tests for new event signature (Arne Welzel, Corelight) + + * GH-4440: cluster/websocket: Propagate code and reason to websocket_client_lost() (Arne Welzel, Corelight) + + This allows to get visibility into the reason why ixwebsocket or the + client decided to disconnect. + + * cluster/websocket: Support configurable ping interval (Arne Welzel, Corelight) + + Primarily for testing purposes and maybe the hard-coded 5 seconds is too + aggressive for some deployments, so makes sense for it to be + configurable. + + * GH-4440: IXWebSocket: Bump to improve O^2 rxbuf erase() (Arne Welzel, Corelight) + 8.0.0-dev.87 | 2025-05-12 11:33:38 -0700 * Fix clang-tidy `bugprone-inc-dec-in-conditions` report in Spicy plugins glue compiler (Benjamin Bannier, Corelight) diff --git a/VERSION b/VERSION index 7f619ebce0..755695e221 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.0-dev.87 +8.0.0-dev.92 diff --git a/scripts/base/frameworks/cluster/main.zeek b/scripts/base/frameworks/cluster/main.zeek index f6b79b07ca..6620060fae 100644 --- a/scripts/base/frameworks/cluster/main.zeek +++ b/scripts/base/frameworks/cluster/main.zeek @@ -85,6 +85,9 @@ export { ## is incremented when the maximum queue size is reached. const default_websocket_max_event_queue_size = 32 &redef; + ## The default ping interval for WebSocket clients. + const default_websocket_ping_interval = 5 sec &redef; + ## Setting a default dir will, for persistent backends that have not ## been given an explicit file path via :zeek:see:`Cluster::stores`, ## automatically create a path within this dir that is based on the name of @@ -365,6 +368,10 @@ export { listen_port: port; ## The maximum event queue size for this server. max_event_queue_size: count &default=default_websocket_max_event_queue_size; + ## Ping interval to use. A WebSocket client not responding to + ## the pings will be disconnected. Set to a negative value to + ## disable pings. Subsecond intervals are currently not supported. + ping_interval: interval &default=default_websocket_ping_interval; ## The TLS options used for this WebSocket server. By default, ## TLS is disabled. See also :zeek:see:`Cluster::WebSocketTLSOptions`. tls_options: WebSocketTLSOptions &default=WebSocketTLSOptions(); @@ -673,10 +680,11 @@ event websocket_client_added(endpoint: EndpointInfo, subscriptions: string_vec) Cluster::log(msg); } -event websocket_client_lost(endpoint: EndpointInfo) +event websocket_client_lost(endpoint: EndpointInfo, code: count, reason: string) { - local msg = fmt("WebSocket client '%s' (%s:%d) gone", - endpoint$id, endpoint$network$address, endpoint$network$bound_port); + local msg = fmt("WebSocket client '%s' (%s:%d) gone with code %d%s", + endpoint$id, endpoint$network$address, endpoint$network$bound_port, code, + |reason| > 0 ? fmt(" and reason '%s'", reason) : ""); Cluster::log(msg); } diff --git a/src/cluster/cluster.bif b/src/cluster/cluster.bif index fc5a341f9e..83a7cd8f3e 100644 --- a/src/cluster/cluster.bif +++ b/src/cluster/cluster.bif @@ -198,6 +198,13 @@ function Cluster::__listen_websocket%(options: WebSocketServerOptions%): bool }; server_options.max_event_queue_size = options_rec->GetField("max_event_queue_size")->Get(); + + double ping_interval = options_rec->GetField("ping_interval")->Get(); + if ( ping_interval < 0.0 ) + server_options.ping_interval_seconds = -1; + else + server_options.ping_interval_seconds = static_cast(ping_interval); + server_options.tls_options = std::move(tls_options); auto result = zeek::cluster::manager->ListenWebSocket(server_options); diff --git a/src/cluster/websocket/WebSocket-IXWebSocket.cc b/src/cluster/websocket/WebSocket-IXWebSocket.cc index 25f09df1a1..08528f0f51 100644 --- a/src/cluster/websocket/WebSocket-IXWebSocket.cc +++ b/src/cluster/websocket/WebSocket-IXWebSocket.cc @@ -135,7 +135,8 @@ std::unique_ptr StartServer(std::unique_ptrQueueForProcessing(WebSocketMessage{id, msg->str}); } else if ( msg->type == ix::WebSocketMessageType::Close ) { - dispatcher->QueueForProcessing(WebSocketClose{id}); + auto& ci = msg->closeInfo; + dispatcher->QueueForProcessing(WebSocketClose{id, ci.code, std::move(ci.reason)}); } else if ( msg->type == ix::WebSocketMessageType::Error ) { dispatcher->QueueForProcessing(WebSocketClose{id}); diff --git a/src/cluster/websocket/WebSocket.cc b/src/cluster/websocket/WebSocket.cc index 8b3569b6bf..a49ce30049 100644 --- a/src/cluster/websocket/WebSocket.cc +++ b/src/cluster/websocket/WebSocket.cc @@ -356,7 +356,8 @@ void WebSocketEventDispatcher::Process(const WebSocketClose& close) { // should be the last event related to this WebSocket client. auto rec = zeek::cluster::detail::bif::make_endpoint_info(backend->NodeId(), wsc->getRemoteIp(), wsc->getRemotePort(), TRANSPORT_TCP); - zeek::event_mgr.Enqueue(Cluster::websocket_client_lost, std::move(rec)); + zeek::event_mgr.Enqueue(Cluster::websocket_client_lost, std::move(rec), zeek::val_mgr->Count(close.code), + zeek::make_intrusive(close.reason)); } clients.erase(it); diff --git a/src/cluster/websocket/WebSocket.h b/src/cluster/websocket/WebSocket.h index 685c16b077..eff83c11f2 100644 --- a/src/cluster/websocket/WebSocket.h +++ b/src/cluster/websocket/WebSocket.h @@ -131,6 +131,8 @@ struct WebSocketOpen { // A WebSocket client disconnected. struct WebSocketClose { std::string id; + uint16_t code; + std::string reason; }; // A WebSocket client send a message. diff --git a/src/cluster/websocket/auxil/IXWebSocket b/src/cluster/websocket/auxil/IXWebSocket index 1babe1d8e1..abb632fb0f 160000 --- a/src/cluster/websocket/auxil/IXWebSocket +++ b/src/cluster/websocket/auxil/IXWebSocket @@ -1 +1 @@ -Subproject commit 1babe1d8e13573c073fa739fd2597dd0a6828b6b +Subproject commit abb632fb0f778258e9a8c8c1b3a262f804755fdb diff --git a/src/cluster/websocket/events.bif b/src/cluster/websocket/events.bif index d730b42419..e02798eea7 100644 --- a/src/cluster/websocket/events.bif +++ b/src/cluster/websocket/events.bif @@ -10,4 +10,8 @@ event websocket_client_added%(endpoint: EndpointInfo, subscriptions: string_vec% ## Generated when a WebSocket client was lost. ## ## endpoint: Various information about the WebSocket client. -event websocket_client_lost%(endpoint: EndpointInfo%); +## code: The code sent by the client in its CLOSE frame, or a code generated +## internally if the server disconnected the client. +## reason: The reason sent by the client in its CLOSE frame, or a reason generated +## internally if the server disconnected the client. +event websocket_client_lost%(endpoint: EndpointInfo, code: count, reason: string%); diff --git a/testing/btest/Baseline.zam/cluster.websocket.listen-idempotent/.stderr b/testing/btest/Baseline.zam/cluster.websocket.listen-idempotent/.stderr index 38b947db5d..f55de0446c 100644 --- a/testing/btest/Baseline.zam/cluster.websocket.listen-idempotent/.stderr +++ b/testing/btest/Baseline.zam/cluster.websocket.listen-idempotent/.stderr @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error in <...>/main.zeek, line 666: Already listening on 127.0.0.1: (Cluster::__listen_websocket(ws_opts_x)) -error in <...>/main.zeek, line 666: Already listening on 127.0.0.1: (Cluster::__listen_websocket(ws_opts_wss_port)) -error in <...>/main.zeek, line 666: Already listening on 127.0.0.1: (Cluster::__listen_websocket(ws_opts_qs)) +error in <...>/main.zeek, line 673: Already listening on 127.0.0.1: (Cluster::__listen_websocket(ws_opts_x)) +error in <...>/main.zeek, line 673: Already listening on 127.0.0.1: (Cluster::__listen_websocket(ws_opts_wss_port)) +error in <...>/main.zeek, line 673: Already listening on 127.0.0.1: (Cluster::__listen_websocket(ws_opts_qs)) received termination signal diff --git a/testing/btest/Baseline.zam/cluster.websocket.tls-usage-error/.stderr b/testing/btest/Baseline.zam/cluster.websocket.tls-usage-error/.stderr index 0a8d499f53..49a7f00389 100644 --- a/testing/btest/Baseline.zam/cluster.websocket.tls-usage-error/.stderr +++ b/testing/btest/Baseline.zam/cluster.websocket.tls-usage-error/.stderr @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error in <...>/main.zeek, line 666: Invalid tls_options: No key_file field (Cluster::__listen_websocket(Cluster::options.0)) -error in <...>/main.zeek, line 666: Invalid tls_options: No cert_file field (Cluster::__listen_websocket(Cluster::options.3)) +error in <...>/main.zeek, line 673: Invalid tls_options: No key_file field (Cluster::__listen_websocket(Cluster::options.0)) +error in <...>/main.zeek, line 673: Invalid tls_options: No cert_file field (Cluster::__listen_websocket(Cluster::options.3)) diff --git a/testing/btest/Baseline/cluster.websocket.cluster-log/..manager.cluster.log.cannonified b/testing/btest/Baseline/cluster.websocket.cluster-log/..manager.cluster.log.cannonified index bc1ec612fb..ea56a35efc 100644 --- a/testing/btest/Baseline/cluster.websocket.cluster-log/..manager.cluster.log.cannonified +++ b/testing/btest/Baseline/cluster.websocket.cluster-log/..manager.cluster.log.cannonified @@ -2,6 +2,6 @@ manager WebSocket client (127.0.0.1:) subscribed to [/topic/ws/1, /topic/ws/all] manager WebSocket client (127.0.0.1:) subscribed to [/topic/ws/2, /topic/ws/all] manager WebSocket client (127.0.0.1:) subscribed to [/topic/ws/3, /topic/ws/all] -manager WebSocket client (127.0.0.1:) gone -manager WebSocket client (127.0.0.1:) gone -manager WebSocket client (127.0.0.1:) gone +manager WebSocket client (127.0.0.1:) gone with code 1000 +manager WebSocket client (127.0.0.1:) gone with code 1000 +manager WebSocket client (127.0.0.1:) gone with code 1000 diff --git a/testing/btest/Baseline/cluster.websocket.ping-timeout/..client..stderr b/testing/btest/Baseline/cluster.websocket.ping-timeout/..client..stderr new file mode 100644 index 0000000000..49d861c74c --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.ping-timeout/..client..stderr @@ -0,0 +1 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. diff --git a/testing/btest/Baseline/cluster.websocket.ping-timeout/..client.out b/testing/btest/Baseline/cluster.websocket.ping-timeout/..client.out new file mode 100644 index 0000000000..794caa7feb --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.ping-timeout/..client.out @@ -0,0 +1,3 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +received 1011 (internal error) Ping timeout; then sent 1011 (internal error) Ping timeout +received 1011 (internal error) Ping timeout; then sent 1011 (internal error) Ping timeout diff --git a/testing/btest/Baseline/cluster.websocket.ping-timeout/..manager..stderr b/testing/btest/Baseline/cluster.websocket.ping-timeout/..manager..stderr new file mode 100644 index 0000000000..e3f6131b1d --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.ping-timeout/..manager..stderr @@ -0,0 +1,2 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +received termination signal diff --git a/testing/btest/Baseline/cluster.websocket.ping-timeout/..manager.cluster.log.cannonified b/testing/btest/Baseline/cluster.websocket.ping-timeout/..manager.cluster.log.cannonified new file mode 100644 index 0000000000..3fb274a13f --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.ping-timeout/..manager.cluster.log.cannonified @@ -0,0 +1,5 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +WebSocket client (127.0.0.1:) subscribed to [] +WebSocket client (127.0.0.1:) subscribed to [] +WebSocket client (127.0.0.1:) gone with code 1011 and reason 'Ping timeout' +WebSocket client (127.0.0.1:) gone with code 1011 and reason 'Ping timeout' diff --git a/testing/btest/Baseline/cluster.websocket.ping-timeout/..manager.out b/testing/btest/Baseline/cluster.websocket.ping-timeout/..manager.out new file mode 100644 index 0000000000..5657e61a7f --- /dev/null +++ b/testing/btest/Baseline/cluster.websocket.ping-timeout/..manager.out @@ -0,0 +1,5 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +Cluster::websocket_client_added, [] +Cluster::websocket_client_added, [] +Cluster::websocket_client_lost, 1011, Ping timeout +Cluster::websocket_client_lost, 1011, Ping timeout diff --git a/testing/btest/cluster/websocket/bad-event-args.zeek b/testing/btest/cluster/websocket/bad-event-args.zeek index ad938e1b84..323614d312 100644 --- a/testing/btest/cluster/websocket/bad-event-args.zeek +++ b/testing/btest/cluster/websocket/bad-event-args.zeek @@ -50,7 +50,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "Cluster::websocket_client_lost"; terminate(); diff --git a/testing/btest/cluster/websocket/bad-subscriptions.zeek b/testing/btest/cluster/websocket/bad-subscriptions.zeek index 7b32248793..be2cd473f4 100644 --- a/testing/btest/cluster/websocket/bad-subscriptions.zeek +++ b/testing/btest/cluster/websocket/bad-subscriptions.zeek @@ -47,7 +47,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", added, subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print "Cluster::websocket_client_lost", lost; diff --git a/testing/btest/cluster/websocket/bad-url.zeek b/testing/btest/cluster/websocket/bad-url.zeek index 27215835a3..1e6349b25a 100644 --- a/testing/btest/cluster/websocket/bad-url.zeek +++ b/testing/btest/cluster/websocket/bad-url.zeek @@ -53,7 +53,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "Cluster::websocket_client_lost"; terminate(); diff --git a/testing/btest/cluster/websocket/broker/manager-recvs.zeek b/testing/btest/cluster/websocket/broker/manager-recvs.zeek index eaaf6e9127..c67f4425a9 100644 --- a/testing/btest/cluster/websocket/broker/manager-recvs.zeek +++ b/testing/btest/cluster/websocket/broker/manager-recvs.zeek @@ -63,7 +63,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print fmt("%s: Cluster::websocket_client_added %s %s", current_time(), added, subscriptions); } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print fmt("%s: Cluster::websocket_client_lost %s", current_time(), lost); diff --git a/testing/btest/cluster/websocket/broker/manager-sends.zeek b/testing/btest/cluster/websocket/broker/manager-sends.zeek index 51e396ac54..ff6fb86be2 100644 --- a/testing/btest/cluster/websocket/broker/manager-sends.zeek +++ b/testing/btest/cluster/websocket/broker/manager-sends.zeek @@ -66,7 +66,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions event send_ping(); } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print fmt("%s: Cluster::websocket_client_lost %s", current_time(), lost); diff --git a/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek b/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek index c1a63892e6..1420733269 100644 --- a/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek +++ b/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek @@ -94,7 +94,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print fmt("%s: Cluster::websocket_client_added %s %s", current_time(), added, subscriptions); } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print fmt("%s: Cluster::websocket_client_lost %s", current_time(), lost); diff --git a/testing/btest/cluster/websocket/cluster-log.zeek b/testing/btest/cluster/websocket/cluster-log.zeek index 544e363ee5..2f7ba20fc6 100644 --- a/testing/btest/cluster/websocket/cluster-log.zeek +++ b/testing/btest/cluster/websocket/cluster-log.zeek @@ -63,7 +63,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", added, subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print "Cluster::websocket_client_lost", lost; diff --git a/testing/btest/cluster/websocket/one-pipelining.zeek b/testing/btest/cluster/websocket/one-pipelining.zeek index c73c530993..0f43142280 100644 --- a/testing/btest/cluster/websocket/one-pipelining.zeek +++ b/testing/btest/cluster/websocket/one-pipelining.zeek @@ -53,7 +53,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "Cluster::websocket_client_lost"; terminate(); diff --git a/testing/btest/cluster/websocket/one.zeek b/testing/btest/cluster/websocket/one.zeek index 420b63716e..bcd6b7775e 100644 --- a/testing/btest/cluster/websocket/one.zeek +++ b/testing/btest/cluster/websocket/one.zeek @@ -53,7 +53,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "Cluster::websocket_client_lost"; terminate(); diff --git a/testing/btest/cluster/websocket/ping-timeout.zeek b/testing/btest/cluster/websocket/ping-timeout.zeek new file mode 100644 index 0000000000..f0347b1a3a --- /dev/null +++ b/testing/btest/cluster/websocket/ping-timeout.zeek @@ -0,0 +1,100 @@ +# @TEST-DOC: Ensure the websocket_client_lost() event contains code and reason. This starts two WebSocket client that aren't replying to PING frames. +# +# @TEST-REQUIRES: python3 -c 'import websockets.sync' +# +# @TEST-PORT: WEBSOCKET_PORT +# +# @TEST-EXEC: cp $FILES/ws/wstest.py . +# @TEST-EXEC: zeek -b --parse-only manager.zeek +# @TEST-EXEC: python3 -m py_compile client.py +# +# @TEST-EXEC: btest-bg-run manager "ZEEKPATH=$ZEEKPATH:.. && zeek -b ../manager.zeek >out" +# @TEST-EXEC: btest-bg-run client "python3 ../client.py >out" +# +# @TEST-EXEC: btest-bg-wait 30 +# @TEST-EXEC: btest-diff ./manager/out +# @TEST-EXEC: btest-diff ./manager/.stderr +# @TEST-EXEC: zeek-cut message < ./manager/cluster.log | sed -r "s/client '.+' /client /g" | sed -r "s/:[0-9]+/:/g" > ./manager/cluster.log.cannonified +# @TEST-EXEC: btest-diff ./manager/cluster.log.cannonified +# @TEST-EXEC: btest-diff ./client/out +# @TEST-EXEC: btest-diff ./client/.stderr + +# @TEST-START-FILE manager.zeek +redef exit_only_after_terminate = T; + +global lost = 0; + +event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions: string_vec) + { + print "Cluster::websocket_client_added", subscriptions; + } + +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) + { + ++lost; + print "Cluster::websocket_client_lost", code, reason; + if ( lost == 2 ) + terminate(); + } + +event zeek_init() + { + Cluster::listen_websocket([$listen_host="127.0.0.1", $listen_port=to_port(getenv("WEBSOCKET_PORT")), $ping_interval=1sec]); + Cluster::subscribe("/test/pings/"); + } +# @TEST-END-FILE + + +# @TEST-START-FILE client.py +import json +import functools + +import wstest + +from websockets.sync.client import connect +from websockets.sync.client import ClientConnection +from websockets.frames import OP_PONG + +class MyClientConnection(ClientConnection): + """ + Custom Client class patching the protocol.send_frame() function + to discard any PONG frames. The websocket library responds + automatically to these in a thread and can't easily turn this off, + but we want to test Zeek behavior when a client fails to respond + with PONG frames quickly enough. + """ + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.__orig_send_frame = self.protocol.send_frame + def __my_send_frame(_self, frame): + if frame.opcode != OP_PONG: + self.__orig_send_frame(frame) + + self.protocol.send_frame = functools.partial(__my_send_frame, self.protocol) + +def run(ws_url): + with ( + connect(ws_url, create_connection=MyClientConnection) as c1, + connect(ws_url, create_connection=MyClientConnection) as c2, + ): + c1.send(json.dumps([])) + ack1 = json.loads(c1.recv()) + assert ack1["type"] == "ack", repr(ack1) + + c2.send(json.dumps([])) + ack2 = json.loads(c2.recv()) + assert ack2["type"] == "ack", repr(ack2) + + try: + c1.recv() + except Exception as e: + print(e) + try: + c2.recv() + except Exception as e: + print(e) + + +if __name__ == "__main__": + wstest.main(run, wstest.WS4_URL_V1) +# @TEST-END-FILE diff --git a/testing/btest/cluster/websocket/terminate-while-queuing.zeek b/testing/btest/cluster/websocket/terminate-while-queuing.zeek index 54cc99b428..006fa55dc8 100644 --- a/testing/btest/cluster/websocket/terminate-while-queuing.zeek +++ b/testing/btest/cluster/websocket/terminate-while-queuing.zeek @@ -46,7 +46,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "B Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "E Cluster::websocket_client_lost"; } diff --git a/testing/btest/cluster/websocket/three.zeek b/testing/btest/cluster/websocket/three.zeek index 05e85d5708..3bf980cc8e 100644 --- a/testing/btest/cluster/websocket/three.zeek +++ b/testing/btest/cluster/websocket/three.zeek @@ -52,7 +52,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "B Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print "D Cluster::websocket_client_lost", lost; diff --git a/testing/btest/cluster/websocket/tls.zeek b/testing/btest/cluster/websocket/tls.zeek index 4e9015cca3..bd816c5328 100644 --- a/testing/btest/cluster/websocket/tls.zeek +++ b/testing/btest/cluster/websocket/tls.zeek @@ -67,7 +67,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print "Cluster::websocket_client_added", subscriptions; } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { print "Cluster::websocket_client_lost"; terminate(); diff --git a/testing/btest/cluster/websocket/two-pipelining.zeek b/testing/btest/cluster/websocket/two-pipelining.zeek index e70c3f2fff..fbf51da293 100644 --- a/testing/btest/cluster/websocket/two-pipelining.zeek +++ b/testing/btest/cluster/websocket/two-pipelining.zeek @@ -84,7 +84,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions drain_if_ready(); } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print "C Cluster::websocket_client_lost"; diff --git a/testing/btest/cluster/websocket/zeromq/manager-worker-ping-pong.zeek b/testing/btest/cluster/websocket/zeromq/manager-worker-ping-pong.zeek index 0212f601a8..b9f19948ef 100644 --- a/testing/btest/cluster/websocket/zeromq/manager-worker-ping-pong.zeek +++ b/testing/btest/cluster/websocket/zeromq/manager-worker-ping-pong.zeek @@ -93,7 +93,7 @@ event Cluster::websocket_client_added(info: Cluster::EndpointInfo, subscriptions print fmt("%s: Cluster::websocket_client_added %s %s", current_time(), added, subscriptions); } -event Cluster::websocket_client_lost(info: Cluster::EndpointInfo) +event Cluster::websocket_client_lost(info: Cluster::EndpointInfo, code: count, reason: string) { ++lost; print fmt("%s: Cluster::websocket_client_lost %s", current_time(), lost);