0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-26 23:01:04 +08:00

Fixed NULL security test

Has some bits commented out due to #939, now work.

Note: there is an issue in libzmq when binding/unbinding or
connecting/disconnecting (I did not investigate deeper) the
same socket several times. Even closing the socket with zero
linger, zmq_ctx_term will block. The workaround in this test
case is to close the sockets for each test step.
This commit is contained in:
Pieter Hintjens 2014-04-29 12:13:54 +02:00
parent c6f8093bfb
commit d1232d144a

View File

@ -27,6 +27,7 @@ zap_handler (void *handler)
char *version = s_recv (handler);
if (!version)
break; // Terminating
char *sequence = s_recv (handler);
char *domain = s_recv (handler);
char *address = s_recv (handler);
@ -57,7 +58,7 @@ zap_handler (void *handler)
free (identity);
free (mechanism);
}
zmq_close (handler);
close_zero_linger (handler);
}
int main (void)
@ -76,72 +77,57 @@ int main (void)
void *zap_thread = zmq_threadstart (&zap_handler, handler);
// We bounce between a binding server and a connecting client
// We first test client/server with no ZAP domain
// Libzmq does not call our ZAP handler, the connect must succeed
void *server = zmq_socket (ctx, ZMQ_DEALER);
assert (server);
void *client = zmq_socket (ctx, ZMQ_DEALER);
assert (client);
// We first test client/server with no ZAP domain
// Libzmq does not call our ZAP handler, the connect must succeed
rc = zmq_bind (server, "tcp://127.0.0.1:9000");
assert (rc == 0);
rc = zmq_connect (client, "tcp://localhost:9000");
rc = zmq_connect (client, "tcp://127.0.0.1:9000");
assert (rc == 0);
bounce (server, client);
zmq_unbind (server, "tcp://127.0.0.1:9000");
zmq_disconnect (client, "tcp://localhost:9000");
close_zero_linger (client);
close_zero_linger (server);
// Now define a ZAP domain for the server; this enables
// authentication. We're using the wrong domain so this test
// must fail.
// **************************************************************
// PH: the following causes libzmq to get confused, so that the
// next step fails. To reproduce, uncomment this block. Note that
// even creating a new client/server socket pair, the behaviour
// does not change.
// **************************************************************
// Destroying the old sockets and creating new ones isn't needed,
// but it shows that the problem isn't related to specific sockets.
//close_zero_linger (client);
//close_zero_linger (server);
//server = zmq_socket (ctx, ZMQ_DEALER);
//assert (server);
//client = zmq_socket (ctx, ZMQ_DEALER);
//assert (client);
//// The above code should not be required
//rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5);
//assert (rc == 0);
//rc = zmq_bind (server, "tcp://127.0.0.1:9001");
//assert (rc == 0);
//rc = zmq_connect (client, "tcp://localhost:9001");
//assert (rc == 0);
//expect_bounce_fail (server, client);
//zmq_unbind (server, "tcp://127.0.0.1:9001");
//zmq_disconnect (client, "tcp://localhost:9001");
server = zmq_socket (ctx, ZMQ_DEALER);
assert (server);
client = zmq_socket (ctx, ZMQ_DEALER);
assert (client);
rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5);
assert (rc == 0);
rc = zmq_bind (server, "tcp://127.0.0.1:9001");
assert (rc == 0);
rc = zmq_connect (client, "tcp://127.0.0.1:9001");
assert (rc == 0);
expect_bounce_fail (server, client);
close_zero_linger (client);
close_zero_linger (server);
// Now use the right domain, the test must pass
server = zmq_socket (ctx, ZMQ_DEALER);
assert (server);
client = zmq_socket (ctx, ZMQ_DEALER);
assert (client);
rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 4);
assert (rc == 0);
rc = zmq_bind (server, "tcp://127.0.0.1:9002");
assert (rc == 0);
rc = zmq_connect (client, "tcp://localhost:9002");
rc = zmq_connect (client, "tcp://127.0.0.1:9002");
assert (rc == 0);
// **************************************************************
// PH: it fails here; though the ZAP reply is 200 OK, and
// null_mechanism.cpp correctly parses that, the connection
// never succeeds and the test hangs.
// **************************************************************
bounce (server, client);
zmq_unbind (server, "tcp://127.0.0.1:9002");
zmq_disconnect (client, "tcp://localhost:9002");
// Shutdown
close_zero_linger (client);
close_zero_linger (server);
// Shutdown
rc = zmq_ctx_term (ctx);
assert (rc == 0);
// Wait until ZAP handler terminates.
// Wait until ZAP handler terminates
zmq_threadclose (zap_thread);
return 0;