From 9bec68354c2b7d16f9be16c726aae4ce6df36e3e Mon Sep 17 00:00:00 2001 From: sigiesec Date: Thu, 17 Aug 2017 18:20:45 +0200 Subject: [PATCH] Problem: console output for NULL protocol errors Solution: emit socket monitor events for NULL protocol errors (like CURVE) --- include/zmq.h | 1 + src/null_mechanism.cpp | 19 ++++++++++++++----- src/zmq_draft.h | 1 + 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/zmq.h b/include/zmq.h index 47dff04a..9477575a 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -588,6 +588,7 @@ ZMQ_EXPORT void zmq_threadclose (void* thread); #define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE 0x10000012 #define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO 0x10000013 #define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE 0x10000014 +#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR 0x10000015 // the following two may be due to erroneous configuration of a peer #define ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC 0x11000001 diff --git a/src/null_mechanism.cpp b/src/null_mechanism.cpp index cca61482..c765bdee 100644 --- a/src/null_mechanism.cpp +++ b/src/null_mechanism.cpp @@ -104,8 +104,9 @@ int zmq::null_mechanism_t::next_handshake_command (msg_t *msg_) int zmq::null_mechanism_t::process_handshake_command (msg_t *msg_) { if (ready_command_received || error_command_received) { - // Temporary support for security debugging - puts ("NULL I: client sent invalid NULL handshake (duplicate READY)"); + session->get_socket ()->event_handshake_failed_protocol ( + session->get_endpoint (), + ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND); errno = EPROTO; return -1; } @@ -121,8 +122,9 @@ int zmq::null_mechanism_t::process_handshake_command (msg_t *msg_) if (data_size >= 6 && !memcmp (cmd_data, "\5ERROR", 6)) rc = process_error_command (cmd_data, data_size); else { - // Temporary support for security debugging - puts ("NULL I: client sent invalid NULL handshake (not READY)"); + session->get_socket ()->event_handshake_failed_protocol ( + session->get_endpoint (), + ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND); errno = EPROTO; rc = -1; } @@ -147,11 +149,19 @@ int zmq::null_mechanism_t::process_error_command ( const unsigned char *cmd_data, size_t data_size) { if (data_size < 7) { + session->get_socket ()->event_handshake_failed_protocol ( + session->get_endpoint (), + ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR); + errno = EPROTO; return -1; } const size_t error_reason_len = static_cast (cmd_data [6]); if (error_reason_len > data_size - 7) { + session->get_socket ()->event_handshake_failed_protocol ( + session->get_endpoint (), + ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR); + errno = EPROTO; return -1; } @@ -191,4 +201,3 @@ void zmq::null_mechanism_t::send_zap_request () { zap_client_t::send_zap_request ("NULL", 4, NULL, NULL, 0); } - diff --git a/src/zmq_draft.h b/src/zmq_draft.h index 2c82d174..89386ea6 100644 --- a/src/zmq_draft.h +++ b/src/zmq_draft.h @@ -70,6 +70,7 @@ #define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE 0x10000012 #define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO 0x10000013 #define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE 0x10000014 +#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR 0x10000015 // the following two may be due to erroneous configuration of a peer #define ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC 0x11000001