3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-14 09:47:56 +08:00
Code Issues Projects Releases Wiki Activity

Fixed NULL security test

Browse Source 
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
1 changed files with 31 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
tests/test_security_null.cpp
View File

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