generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-25 18:23:01 +02:00
Code Issues Projects Releases Wiki Activity

Problem: secure servers ignore zap_connect failre code and set ready.

Browse Source
This commit is contained in:
evoskuil
2017-03-29 14:30:00 -07:00
parent 9c6fb09929
commit a0ccdc866e
3 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/curve_server.cpp
View File

@@ -491,7 +491,8 @@ int zmq::curve_server_t::process_initiate (msg_t *msg_)
// Use ZAP protocol (RFC 27) to authenticate the user. // Use ZAP protocol (RFC 27) to authenticate the user.
rc = session->zap_connect (); rc = session->zap_connect ();
if (rc == 0) { if (rc != 0)
return -1;
rc = send_zap_request (client_key); rc = send_zap_request (client_key);
if (rc != 0) if (rc != 0)
return -1; return -1;
@@ -505,9 +506,6 @@ int zmq::curve_server_t::process_initiate (msg_t *msg_)
state = expect_zap_reply; state = expect_zap_reply;
else else
return -1; return -1;
}
else
state = send_ready;
return parse_metadata (initiate_plaintext + crypto_box_ZEROBYTES + 128, return parse_metadata (initiate_plaintext + crypto_box_ZEROBYTES + 128,
clen - crypto_box_ZEROBYTES - 128); clen - crypto_box_ZEROBYTES - 128);

17
src/gssapi_server.cpp
View File

@@ -120,20 +120,21 @@ int zmq::gssapi_server_t::process_handshake_command (msg_t *msg_)
if (security_context_established) { if (security_context_established) {
// Use ZAP protocol (RFC 27) to authenticate the user. // Use ZAP protocol (RFC 27) to authenticate the user.
bool expecting_zap_reply = false;
int rc = session->zap_connect (); int rc = session->zap_connect ();
if (rc == 0) { if (rc != 0)
return -1;
rc = send_zap_request (); rc = send_zap_request ();
if (rc != 0) if (rc != 0)
return -1; return -1;
rc = receive_and_process_zap_reply (); rc = receive_and_process_zap_reply ();
if (rc != 0) { if (rc == 0)
if (errno != EAGAIN) state = send_ready;
else
if (errno == EAGAIN)
state = expect_zap_reply;
else
return -1; return -1;
expecting_zap_reply = true;
}
}
state = expecting_zap_reply? expect_zap_reply: send_ready;
return 0; return 0;
} }

6
src/plain_server.cpp
View File

@@ -190,7 +190,8 @@ int zmq::plain_server_t::process_hello (msg_t *msg_)
// Use ZAP protocol (RFC 27) to authenticate the user. // Use ZAP protocol (RFC 27) to authenticate the user.
int rc = session->zap_connect (); int rc = session->zap_connect ();
if (rc == 0) { if (rc != 0)
return -1;
rc = send_zap_request (username, password); rc = send_zap_request (username, password);
if (rc != 0) if (rc != 0)
return -1; return -1;
@@ -204,9 +205,6 @@ int zmq::plain_server_t::process_hello (msg_t *msg_)
state = waiting_for_zap_reply; state = waiting_for_zap_reply;
else else
return -1; return -1;
}
else
state = sending_welcome;
return 0; return 0;
} }