generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-03 12:58:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2696 from sigiesec/gssapi-dont-abort-on-bad-data

Browse Source 
Problem: gssapi_mechanism_base_t aborts the application when it receives a message it cannot decode
This commit is contained in:
Luca Boccassi 2017-08-18 12:50:28 +01:00 committed by GitHub
commit f0554e7f16
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gssapi_mechanism_base.cpp
View File

@ -181,12 +181,18 @@ int zmq::gssapi_mechanism_base_t::decode_message (msg_t *msg_)
maj_stat = gss_unwrap(&min_stat, context, &wrapped, &plaintext, maj_stat = gss_unwrap(&min_stat, context, &wrapped, &plaintext,
&state, (gss_qop_t *) NULL); &state, (gss_qop_t *) NULL);
// TODO I don't think it is a good idea to use zmq_assert here. If if (maj_stat != GSS_S_COMPLETE)
// decryption fails, gss_unwrap returns GSS_S_BAD_SIG. This opens up {
// to DoS attacks by clients! Instead, a // TODO is it correct to release the plaintext buffer if gss_unwrap
// ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC event should be emitted. // did not succeed?
gss_release_buffer (&min_stat, &plaintext);
zmq_assert(maj_stat == GSS_S_COMPLETE); free (wrapped);
session->get_socket ()->event_handshake_failed_protocol (
session->get_endpoint (),
ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
errno = EPROTO;
return -1;
}
zmq_assert(state); zmq_assert(state);
// Re-initialize msg_ for plaintext // Re-initialize msg_ for plaintext