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

Problem: test_security_null not using a test framework

Browse Source 
Solution: migrate to Unity and separate test_security_no_zap_handler
This commit is contained in:
Simon Giesecke
2019-03-16 17:20:19 +01:00
parent bd6fa4bbb3
commit 223ef516b6
4 changed files with 183 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@@ -419,7 +419,8 @@ test_apps = \
tests/test_unbind_wildcard \ tests/test_unbind_wildcard \
tests/test_ctx_options \ tests/test_ctx_options \
tests/test_ctx_destroy \ tests/test_ctx_destroy \
tests/test_security_null \ tests/test_security_no_zap_handler \
tests/test_security_null \
tests/test_security_plain \ tests/test_security_plain \
tests/test_security_zap \ tests/test_security_zap \
tests/test_iov \ tests/test_iov \
@@ -598,8 +599,13 @@ tests_test_ctx_destroy_SOURCES = tests/test_ctx_destroy.cpp
tests_test_ctx_destroy_LDADD = src/libzmq.la ${UNITY_LIBS} tests_test_ctx_destroy_LDADD = src/libzmq.la ${UNITY_LIBS}
tests_test_ctx_destroy_CPPFLAGS = ${UNITY_CPPFLAGS} tests_test_ctx_destroy_CPPFLAGS = ${UNITY_CPPFLAGS}
tests_test_security_no_zap_handler_SOURCES = tests/test_security_no_zap_handler.cpp
tests_test_security_no_zap_handler_LDADD = src/libzmq.la ${UNITY_LIBS}
tests_test_security_no_zap_handler_CPPFLAGS = ${UNITY_CPPFLAGS}
tests_test_security_null_SOURCES = tests/test_security_null.cpp tests_test_security_null_SOURCES = tests/test_security_null.cpp
tests_test_security_null_LDADD = src/libzmq.la tests_test_security_null_LDADD = src/libzmq.la ${UNITY_LIBS}
tests_test_security_null_CPPFLAGS = ${UNITY_CPPFLAGS}
tests_test_security_plain_SOURCES = tests/test_security_plain.cpp tests_test_security_plain_SOURCES = tests/test_security_plain.cpp
tests_test_security_plain_LDADD = src/libzmq.la tests_test_security_plain_LDADD = src/libzmq.la

1
tests/CMakeLists.txt
View File

@@ -31,6 +31,7 @@ set(tests
test_unbind_wildcard test_unbind_wildcard
test_ctx_options test_ctx_options
test_ctx_destroy test_ctx_destroy
test_security_no_zap_handler
test_security_null test_security_null
test_security_plain test_security_plain
test_security_zap test_security_zap

90
tests/test_security_no_zap_handler.cpp Normal file
View File

@@ -0,0 +1,90 @@
/*
Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
This file is part of libzmq, the ZeroMQ core engine in C++.
libzmq is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License (LGPL) as published
by the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
As a special exception, the Contributors give you permission to link
this library with independent modules to produce an executable,
regardless of the license terms of these independent modules, and to
copy and distribute the resulting executable under terms of your choice,
provided that you also meet, for each linked independent module, the
terms and conditions of the license of that module. An independent
module is a module which is not derived from or based on this library.
If you modify this library, you must extend this exception to your
version of the library.
libzmq is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "testutil.hpp"
#include "testutil_unity.hpp"
void setUp ()
{
setup_test_context ();
}
void tearDown ()
{
teardown_test_context ();
}
void test_no_zap_handler ()
{
// We first test client/server with a ZAP domain but with no handler
// If there is no handler, libzmq should ignore the ZAP option unless
// ZMQ_ZAP_ENFORCE_DOMAIN is set
void *server = test_context_socket (ZMQ_DEALER);
void *client = test_context_socket (ZMQ_DEALER);
TEST_ASSERT_SUCCESS_ERRNO (
zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 5));
char my_endpoint[MAX_SOCKET_STRING];
bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
bounce (server, client);
test_context_socket_close_zero_linger (client);
test_context_socket_close_zero_linger (server);
}
void test_no_zap_handler_enforce_domain ()
{
#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
// Now set ZMQ_ZAP_ENFORCE_DOMAIN which strictly enforces the ZAP
// RFC but is backward-incompatible, now it should fail
void *server = test_context_socket (ZMQ_DEALER);
void *client = test_context_socket (ZMQ_DEALER);
int required = 1;
TEST_ASSERT_SUCCESS_ERRNO (
zmq_setsockopt (server, ZMQ_ZAP_ENFORCE_DOMAIN, &required, sizeof (int)));
TEST_ASSERT_SUCCESS_ERRNO (
zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 5));
char my_endpoint[MAX_SOCKET_STRING];
bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
expect_bounce_fail (server, client);
test_context_socket_close_zero_linger (client);
test_context_socket_close_zero_linger (server);
#endif
}
int main ()
{
setup_test_environment ();
UNITY_BEGIN ();
RUN_TEST (test_no_zap_handler);
RUN_TEST (test_no_zap_handler_enforce_domain);
return UNITY_END ();
}

205
tests/test_security_null.cpp
View File

@@ -28,6 +28,8 @@
*/ */
#include "testutil.hpp" #include "testutil.hpp"
#include "testutil_unity.hpp"
#if defined(ZMQ_HAVE_WINDOWS) #if defined(ZMQ_HAVE_WINDOWS)
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
@@ -80,140 +82,97 @@ static void zap_handler (void *handler_)
close_zero_linger (handler_); close_zero_linger (handler_);
} }
int main (void) void *zap_thread;
static void setup_zap_handler ()
{ {
setup_test_environment ();
size_t len = MAX_SOCKET_STRING;
char my_endpoint[MAX_SOCKET_STRING];
void *ctx = zmq_ctx_new ();
assert (ctx);
// We first test client/server with a ZAP domain but with no handler
// If there is no handler, libzmq should ignore the ZAP option unless
// ZMQ_ZAP_ENFORCE_DOMAIN is set
void *server = zmq_socket (ctx, ZMQ_DEALER);
assert (server);
void *client = zmq_socket (ctx, ZMQ_DEALER);
assert (client);
int rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 5);
assert (rc == 0);
rc = zmq_bind (server, "tcp://127.0.0.1:*");
assert (rc == 0);
rc = zmq_getsockopt (server, ZMQ_LAST_ENDPOINT, my_endpoint, &len);
assert (rc == 0);
rc = zmq_connect (client, my_endpoint);
assert (rc == 0);
bounce (server, client);
close_zero_linger (client);
close_zero_linger (server);
#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
// Now set ZMQ_ZAP_ENFORCE_DOMAIN which strictly enforces the ZAP
// RFC but is backward-incompatible, now it should fail
server = zmq_socket (ctx, ZMQ_DEALER);
assert (server);
client = zmq_socket (ctx, ZMQ_DEALER);
assert (client);
int required = 1;
rc =
zmq_setsockopt (server, ZMQ_ZAP_ENFORCE_DOMAIN, &required, sizeof (int));
assert (rc == 0);
rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 5);
assert (rc == 0);
rc = zmq_bind (server, "tcp://127.0.0.1:*");
assert (rc == 0);
rc = zmq_getsockopt (server, ZMQ_LAST_ENDPOINT, my_endpoint, &len);
assert (rc == 0);
rc = zmq_connect (client, my_endpoint);
assert (rc == 0);
expect_bounce_fail (server, client);
close_zero_linger (client);
close_zero_linger (server);
#endif
// Spawn ZAP handler // Spawn ZAP handler
// We create and bind ZAP socket in main thread to avoid case // We create and bind ZAP socket in main thread to avoid case
// where child thread does not start up fast enough. // where child thread does not start up fast enough.
void *handler = zmq_socket (ctx, ZMQ_REP); void *handler = zmq_socket (get_test_context (), ZMQ_REP);
assert (handler); TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
rc = zmq_bind (handler, "inproc://zeromq.zap.01"); zap_thread = zmq_threadstart (&zap_handler, handler);
assert (rc == 0); }
void *zap_thread = zmq_threadstart (&zap_handler, handler);
// We bounce between a binding server and a connecting client static void teardown_zap_handler ()
{
// Wait until ZAP handler terminates
zmq_threadclose (zap_thread);
}
void setUp ()
{
setup_test_context ();
setup_zap_handler ();
}
void tearDown ()
{
teardown_test_context ();
teardown_zap_handler ();
}
void test_no_domain ()
{
// We first test client/server with no ZAP domain // We first test client/server with no ZAP domain
// Libzmq does not call our ZAP handler, the connect must succeed // Libzmq does not call our ZAP handler, the connect must succeed
server = zmq_socket (ctx, ZMQ_DEALER); void *server = test_context_socket (ZMQ_DEALER);
assert (server); void *client = test_context_socket (ZMQ_DEALER);
client = zmq_socket (ctx, ZMQ_DEALER); char my_endpoint[MAX_SOCKET_STRING];
assert (client); bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
rc = zmq_bind (server, "tcp://127.0.0.1:*"); TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
assert (rc == 0);
rc = zmq_getsockopt (server, ZMQ_LAST_ENDPOINT, my_endpoint, &len);
assert (rc == 0);
rc = zmq_connect (client, my_endpoint);
assert (rc == 0);
bounce (server, client); bounce (server, client);
close_zero_linger (client); test_context_socket_close_zero_linger (client);
close_zero_linger (server); test_context_socket_close_zero_linger (server);
}
void test_wrong_domain_fails ()
{
// 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); void *server = test_context_socket (ZMQ_DEALER);
assert (server); void *client = test_context_socket (ZMQ_DEALER);
client = zmq_socket (ctx, ZMQ_DEALER); TEST_ASSERT_SUCCESS_ERRNO (
assert (client); zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5));
rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5); char my_endpoint[MAX_SOCKET_STRING];
assert (rc == 0); bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
rc = zmq_bind (server, "tcp://127.0.0.1:*"); TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
assert (rc == 0);
len = MAX_SOCKET_STRING;
rc = zmq_getsockopt (server, ZMQ_LAST_ENDPOINT, my_endpoint, &len);
assert (rc == 0);
rc = zmq_connect (client, my_endpoint);
assert (rc == 0);
expect_bounce_fail (server, client); expect_bounce_fail (server, client);
close_zero_linger (client); test_context_socket_close_zero_linger (client);
close_zero_linger (server); test_context_socket_close_zero_linger (server);
}
void test_success ()
{
// Now use the right domain, the test must pass // Now use the right domain, the test must pass
server = zmq_socket (ctx, ZMQ_DEALER); void *server = test_context_socket (ZMQ_DEALER);
assert (server); void *client = test_context_socket (ZMQ_DEALER);
client = zmq_socket (ctx, ZMQ_DEALER); TEST_ASSERT_SUCCESS_ERRNO (
assert (client); zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 4));
rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 4); char my_endpoint[MAX_SOCKET_STRING];
assert (rc == 0); bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
rc = zmq_bind (server, "tcp://127.0.0.1:*"); TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
assert (rc == 0);
len = MAX_SOCKET_STRING;
rc = zmq_getsockopt (server, ZMQ_LAST_ENDPOINT, my_endpoint, &len);
assert (rc == 0);
rc = zmq_connect (client, my_endpoint);
assert (rc == 0);
bounce (server, client); bounce (server, client);
close_zero_linger (client); test_context_socket_close_zero_linger (client);
close_zero_linger (server); test_context_socket_close_zero_linger (server);
}
void test_vanilla_socket ()
{
// Unauthenticated messages from a vanilla socket shouldn't be received // Unauthenticated messages from a vanilla socket shouldn't be received
server = zmq_socket (ctx, ZMQ_DEALER); void *server = test_context_socket (ZMQ_DEALER);
assert (server); TEST_ASSERT_SUCCESS_ERRNO (
rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5); zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5));
assert (rc == 0); char my_endpoint[MAX_SOCKET_STRING];
rc = zmq_bind (server, "tcp://127.0.0.1:*"); bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
assert (rc == 0);
len = MAX_SOCKET_STRING;
rc = zmq_getsockopt (server, ZMQ_LAST_ENDPOINT, my_endpoint, &len);
assert (rc == 0);
struct sockaddr_in ip4addr; struct sockaddr_in ip4addr;
fd_t s; fd_t s;
unsigned short int port; unsigned short int port;
rc = sscanf (my_endpoint, "tcp://127.0.0.1:%hu", &port); int rc = sscanf (my_endpoint, "tcp://127.0.0.1:%hu", &port);
assert (rc == 1); TEST_ASSERT_EQUAL_INT (1, rc);
ip4addr.sin_family = AF_INET; ip4addr.sin_family = AF_INET;
ip4addr.sin_port = htons (port); ip4addr.sin_port = htons (port);
@@ -225,7 +184,7 @@ int main (void)
s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
rc = connect (s, (struct sockaddr *) &ip4addr, sizeof ip4addr); rc = connect (s, (struct sockaddr *) &ip4addr, sizeof ip4addr);
assert (rc > -1); TEST_ASSERT_GREATER_THAN_INT (-1, rc);
// send anonymous ZMTP/1.0 greeting // send anonymous ZMTP/1.0 greeting
send (s, "\x01\x00", 2, 0); send (s, "\x01\x00", 2, 0);
// send sneaky message that shouldn't be received // send sneaky message that shouldn't be received
@@ -235,16 +194,20 @@ int main (void)
char *buf = s_recv (server); char *buf = s_recv (server);
if (buf != NULL) { if (buf != NULL) {
printf ("Received unauthenticated message: %s\n", buf); printf ("Received unauthenticated message: %s\n", buf);
assert (buf == NULL); TEST_ASSERT_NULL (buf);
} }
close (s); close (s);
close_zero_linger (server); test_context_socket_close_zero_linger (server);
}
// Shutdown
rc = zmq_ctx_term (ctx); int main ()
assert (rc == 0); {
// Wait until ZAP handler terminates setup_test_environment ();
zmq_threadclose (zap_thread);
UNITY_BEGIN ();
return 0; RUN_TEST (test_no_domain);
RUN_TEST (test_wrong_domain_fails);
RUN_TEST (test_success);
RUN_TEST (test_vanilla_socket);
return UNITY_END ();
} }