rbczmq 1.7.1 → 1.7.2

data/ext/zeromq/tests/test_req_relaxed.cpp

@@ -0,0 +1,116 @@
+/*
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ 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"
+
+int main (void)
+{
+    setup_test_environment();
+    void *ctx = zmq_ctx_new ();
+    assert (ctx);
+
+    void *req = zmq_socket (ctx, ZMQ_REQ);
+    assert (req);
+
+    int enabled = 1;
+    int rc = zmq_setsockopt (req, ZMQ_REQ_RELAXED, &enabled, sizeof (int));
+    assert (rc == 0);
+
+    rc = zmq_setsockopt (req, ZMQ_REQ_CORRELATE, &enabled, sizeof (int));
+    assert (rc == 0);
+
+    rc = zmq_bind (req, "tcp://127.0.0.1:5555");
+    assert (rc == 0);
+
+    const size_t services = 5;
+    void *rep [services];
+    for (size_t peer = 0; peer < services; peer++) {
+        rep [peer] = zmq_socket (ctx, ZMQ_REP);
+        assert (rep [peer]);
+
+        int timeout = 100;
+        rc = zmq_setsockopt (rep [peer], ZMQ_RCVTIMEO, &timeout, sizeof (int));
+        assert (rc == 0);
+
+        rc = zmq_connect (rep [peer], "tcp://localhost:5555");
+        assert (rc == 0);
+    }
+    //  We have to give the connects time to finish otherwise the requests
+    //  will not properly round-robin. We could alternatively connect the
+    //  REQ sockets to the REP sockets.
+    zmq_sleep(1);
+
+    //  Case 1: Second send() before a reply arrives in a pipe.
+
+    //  Send a request, ensure it arrives, don't send a reply
+    s_send_seq (req, "A", "B", SEQ_END);
+    s_recv_seq (rep [0], "A", "B", SEQ_END);
+
+    //  Send another request on the REQ socket
+    s_send_seq (req, "C", "D", SEQ_END);
+    s_recv_seq (rep [1], "C", "D", SEQ_END);
+
+    //  Send a reply to the first request - that should be discarded by the REQ
+    s_send_seq (rep [0], "WRONG", SEQ_END);
+
+    //  Send the expected reply
+    s_send_seq (rep [1], "OK", SEQ_END);
+    s_recv_seq (req, "OK", SEQ_END);
+
+
+    //  Another standard req-rep cycle, just to check
+    s_send_seq (req, "E", SEQ_END);
+    s_recv_seq (rep [2], "E", SEQ_END);
+    s_send_seq (rep [2], "F", "G", SEQ_END);
+    s_recv_seq (req, "F", "G", SEQ_END);
+
+
+    //  Case 2: Second send() after a reply is already in a pipe on the REQ.
+
+    //  Send a request, ensure it arrives, send a reply
+    s_send_seq (req, "H", SEQ_END);
+    s_recv_seq (rep [3], "H", SEQ_END);
+    s_send_seq (rep [3], "BAD", SEQ_END);
+
+    // Wait for message to be there.
+    rc = zmq_poll (0, 0, 100);
+    assert (rc == 0);
+
+    //  Without receiving that reply, send another request on the REQ socket
+    s_send_seq (req, "I", SEQ_END);
+    s_recv_seq (rep [4], "I", SEQ_END);
+
+    //  Send the expected reply
+    s_send_seq (rep [4], "GOOD", SEQ_END);
+    s_recv_seq (req, "GOOD", SEQ_END);
+
+
+    close_zero_linger (req);
+    for (size_t peer = 0; peer < services; peer++)
+        close_zero_linger (rep [peer]);
+
+    // Wait for disconnects.
+    rc = zmq_poll (0, 0, 100);
+    assert (rc == 0);
+
+    rc = zmq_ctx_term (ctx);
+    assert (rc == 0);
+
+    return 0 ;
+}

data/ext/zeromq/tests/test_reqrep_device.cpp

@@ -1,7 +1,5 @@
 /*
-    Copyright (c) 2010-2011 250bpm s.r.o.
-    Copyright (c) 2011 VMware, Inc.
-    Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -19,18 +17,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/zmq.h"
-#include <stdio.h>
-#include <string.h>
-
-#undef NDEBUG
-#include <assert.h>
+#include "testutil.hpp"
 
 int main (void)
 {
-    fprintf (stderr, "test_reqrep_device running...\n");
-
-    void *ctx = zmq_init (1);
+    setup_test_environment();
+    void *ctx = zmq_ctx_new ();
     assert (ctx);
 
     //  Create a req/rep device.
@@ -66,13 +58,13 @@ int main (void)
         zmq_msg_t msg;
         rc = zmq_msg_init (&msg);
         assert (rc == 0);
-        rc = zmq_recvmsg (router, &msg, 0);
+        rc = zmq_msg_recv (&msg, router, 0);
         assert (rc >= 0);
         int rcvmore;
         size_t sz = sizeof (rcvmore);
         rc = zmq_getsockopt (router, ZMQ_RCVMORE, &rcvmore, &sz);
         assert (rc == 0);
-        rc = zmq_sendmsg (dealer, &msg, rcvmore ? ZMQ_SNDMORE : 0);
+        rc = zmq_msg_send (&msg, dealer, rcvmore? ZMQ_SNDMORE: 0);
         assert (rc >= 0);
     }
 
@@ -104,12 +96,12 @@ int main (void)
         zmq_msg_t msg;
         rc = zmq_msg_init (&msg);
         assert (rc == 0);
-        rc = zmq_recvmsg (dealer, &msg, 0);
+        rc = zmq_msg_recv (&msg, dealer, 0);
         assert (rc >= 0);
         int rcvmore;
         rc = zmq_getsockopt (dealer, ZMQ_RCVMORE, &rcvmore, &sz);
         assert (rc == 0);
-        rc = zmq_sendmsg (router, &msg, rcvmore ? ZMQ_SNDMORE : 0);
+        rc = zmq_msg_send (&msg, router, rcvmore? ZMQ_SNDMORE: 0);
         assert (rc >= 0);
     }
 
@@ -136,7 +128,7 @@ int main (void)
     assert (rc == 0);
     rc = zmq_close (dealer);
     assert (rc == 0);
-    rc = zmq_term (ctx);
+    rc = zmq_ctx_term (ctx);
     assert (rc == 0);
 
     return 0 ;

data/ext/zeromq/tests/test_reqrep_inproc.cpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2010-2011 250bpm s.r.o.
-    Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -18,14 +17,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdio.h>
 #include "testutil.hpp"
 
 int main (void)
 {
-    fprintf (stderr, "test_reqrep_inproc running...\n");
-
-    void *ctx = zmq_init (0);
+    setup_test_environment();
+    void *ctx = zmq_ctx_new ();
     assert (ctx);
 
     void *sb = zmq_socket (ctx, ZMQ_REP);
@@ -46,7 +43,7 @@ int main (void)
     rc = zmq_close (sb);
     assert (rc == 0);
 
-    rc = zmq_term (ctx);
+    rc = zmq_ctx_term (ctx);
     assert (rc == 0);
 
     return 0 ;

data/ext/zeromq/tests/test_reqrep_ipc.cpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2010-2011 250bpm s.r.o.
-    Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -18,14 +17,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdio.h>
 #include "testutil.hpp"
 
 int main (void)
 {
-    fprintf (stderr, "test_reqrep_ipc running...\n");
-
-    void *ctx = zmq_init (1);
+    setup_test_environment();
+    void *ctx = zmq_ctx_new ();
     assert (ctx);
 
     void *sb = zmq_socket (ctx, ZMQ_REP);
@@ -46,7 +43,7 @@ int main (void)
     rc = zmq_close (sb);
     assert (rc == 0);
 
-    rc = zmq_term (ctx);
+    rc = zmq_ctx_term (ctx);
     assert (rc == 0);
 
     return 0 ;

data/ext/zeromq/tests/test_reqrep_tcp.cpp

@@ -1,7 +1,5 @@
 /*
-    Copyright (c) 2010-2011 250bpm s.r.o.
-    Copyright (c) 2011 iMatix Corporation
-    Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -19,14 +17,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdio.h>
 #include "testutil.hpp"
 
 int main (void)
 {
-    fprintf (stderr, "test_reqrep_tcp running...\n");
-
-    void *ctx = zmq_init (1);
+    setup_test_environment();
+    void *ctx = zmq_ctx_new ();
     assert (ctx);
 
     void *sb = zmq_socket (ctx, ZMQ_REP);
@@ -47,7 +43,7 @@ int main (void)
     rc = zmq_close (sb);
     assert (rc == 0);
 
-    rc = zmq_term (ctx);
+    rc = zmq_ctx_term (ctx);
     assert (rc == 0);
 
     return 0 ;

data/ext/zeromq/tests/test_router_mandatory.cpp

@@ -1,7 +1,5 @@
 /*
-    Copyright (c) 2010-2011 250bpm s.r.o.
-    Copyright (c) 2011 iMatix Corporation
-    Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -19,43 +17,64 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdio.h>
 #include "testutil.hpp"
 
 int main (void)
 {
-    fprintf (stderr, "test_router_mandatory running...\n");
-
-    void *ctx = zmq_init (1);
+    setup_test_environment();
+    void *ctx = zmq_ctx_new ();
     assert (ctx);
+    void *router = zmq_socket (ctx, ZMQ_ROUTER);
+    assert (router);
 
-    // Creating the first socket.
-    void *sa = zmq_socket (ctx, ZMQ_ROUTER);
-    assert (sa);
-    
-    int rc = zmq_bind (sa, "tcp://127.0.0.1:15560");
+    int rc = zmq_bind (router, "tcp://127.0.0.1:5560");
     assert (rc == 0);
 
-    // Sending a message to an unknown peer with the default setting
-    rc = zmq_send (sa, "UNKNOWN", 7, ZMQ_SNDMORE);
+    //  Send a message to an unknown peer with the default setting
+    //  This will not report any error
+    rc = zmq_send (router, "UNKNOWN", 7, ZMQ_SNDMORE);
     assert (rc == 7);
-    rc = zmq_send (sa, "DATA", 4, 0);
+    rc = zmq_send (router, "DATA", 4, 0);
     assert (rc == 4);
 
+    //  Send a message to an unknown peer with mandatory routing
+    //  This will fail
     int mandatory = 1;
+    rc = zmq_setsockopt (router, ZMQ_ROUTER_MANDATORY, &mandatory, sizeof (mandatory));
+    assert (rc == 0);
+    rc = zmq_send (router, "UNKNOWN", 7, ZMQ_SNDMORE);
+    assert (rc == -1 && errno == EHOSTUNREACH);
 
-    // Set mandatory routing on socket
-    rc = zmq_setsockopt (sa, ZMQ_ROUTER_MANDATORY, &mandatory, sizeof (mandatory));
+    //  Create dealer called "X" and connect it to our router
+    void *dealer = zmq_socket (ctx, ZMQ_DEALER);
+    assert (dealer);
+    rc = zmq_setsockopt (dealer, ZMQ_IDENTITY, "X", 1);
+    assert (rc == 0);
+    rc = zmq_connect (dealer, "tcp://127.0.0.1:5560");
     assert (rc == 0);
 
-    // Send a message and check that it fails
-    rc = zmq_send (sa, "UNKNOWN", 7, ZMQ_SNDMORE | ZMQ_DONTWAIT);
-    assert (rc == -1 && errno == EHOSTUNREACH);
+    //  Get message from dealer to know when connection is ready
+    char buffer [255];
+    rc = zmq_send (dealer, "Hello", 5, 0);
+    assert (rc == 5);
+    rc = zmq_recv (router, buffer, 255, 0);
+    assert (rc == 1);
+    assert (buffer [0] ==  'X');
+
+    //  Send a message to connected dealer now
+    //  It should work
+    rc = zmq_send (router, "X", 1, ZMQ_SNDMORE);
+    assert (rc == 1);
+    rc = zmq_send (router, "Hello", 5, 0);
+    assert (rc == 5);
+    
+    rc = zmq_close (router);
+    assert (rc == 0);
 
-    rc = zmq_close (sa);
+    rc = zmq_close (dealer);
     assert (rc == 0);
 
-    rc = zmq_term (ctx);
+    rc = zmq_ctx_term (ctx);
     assert (rc == 0);
 
     return 0 ;

data/ext/zeromq/tests/test_security_curve.cpp

@@ -0,0 +1,212 @@
+/*
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ 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"
+
+//  We'll generate random test keys at startup
+static char client_public [41];
+static char client_secret [41];
+static char server_public [41];
+static char server_secret [41];
+
+//  --------------------------------------------------------------------------
+//  Encode a binary frame as a string; destination string MUST be at least
+//  size * 5 / 4 bytes long plus 1 byte for the null terminator. Returns
+//  dest. Size must be a multiple of 4.
+
+static void zap_handler (void *handler)
+{
+    //  Process ZAP requests forever
+    while (true) {
+        char *version = s_recv (handler);
+        if (!version)
+            break;          //  Terminating
+
+        char *sequence = s_recv (handler);
+        char *domain = s_recv (handler);
+        char *address = s_recv (handler);
+        char *identity = s_recv (handler);
+        char *mechanism = s_recv (handler);
+        uint8_t client_key [32];
+        int size = zmq_recv (handler, client_key, 32, 0);
+        assert (size == 32);
+
+        char client_key_text [41];
+        zmq_z85_encode (client_key_text, client_key, 32);
+
+        assert (streq (version, "1.0"));
+        assert (streq (mechanism, "CURVE"));
+        assert (streq (identity, "IDENT"));
+
+        s_sendmore (handler, version);
+        s_sendmore (handler, sequence);
+
+        if (streq (client_key_text, client_public)) {
+            s_sendmore (handler, "200");
+            s_sendmore (handler, "OK");
+            s_sendmore (handler, "anonymous");
+            s_send     (handler, "");
+        }
+        else {
+            s_sendmore (handler, "400");
+            s_sendmore (handler, "Invalid client public key");
+            s_sendmore (handler, "");
+            s_send     (handler, "");
+        }
+        free (version);
+        free (sequence);
+        free (domain);
+        free (address);
+        free (identity);
+        free (mechanism);
+    }
+    zmq_close (handler);
+}
+
+
+int main (void)
+{
+#ifndef HAVE_LIBSODIUM
+    printf ("libsodium not installed, skipping CURVE test\n");
+    return 0;
+#endif
+
+    //  Generate new keypairs for this test
+    int rc = zmq_curve_keypair (client_public, client_secret);
+    assert (rc == 0);
+    rc = zmq_curve_keypair (server_public, server_secret);
+    assert (rc == 0);
+
+    setup_test_environment ();
+    void *ctx = zmq_ctx_new ();
+    assert (ctx);
+
+    //  Spawn ZAP handler
+    //  We create and bind ZAP socket in main thread to avoid case
+    //  where child thread does not start up fast enough.
+    void *handler = zmq_socket (ctx, ZMQ_REP);
+    assert (handler);
+    rc = zmq_bind (handler, "inproc://zeromq.zap.01");
+    assert (rc == 0);
+    void *zap_thread = zmq_threadstart (&zap_handler, handler);
+
+    //  Server socket will accept connections
+    void *server = zmq_socket (ctx, ZMQ_DEALER);
+    assert (server);
+    int as_server = 1;
+    rc = zmq_setsockopt (server, ZMQ_CURVE_SERVER, &as_server, sizeof (int));
+    assert (rc == 0);
+    rc = zmq_setsockopt (server, ZMQ_CURVE_SECRETKEY, server_secret, 40);
+    assert (rc == 0);
+    rc = zmq_setsockopt (server, ZMQ_IDENTITY, "IDENT", 6);
+    assert (rc == 0);
+    rc = zmq_bind (server, "tcp://127.0.0.1:9998");
+    assert (rc == 0);
+
+    //  Check CURVE security with valid credentials
+    void *client = zmq_socket (ctx, ZMQ_DEALER);
+    assert (client);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, server_public, 40);
+    assert (rc == 0);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, client_public, 40);
+    assert (rc == 0);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, client_secret, 40);
+    assert (rc == 0);
+    rc = zmq_connect (client, "tcp://localhost:9998");
+    assert (rc == 0);
+    bounce (server, client);
+    rc = zmq_close (client);
+    assert (rc == 0);
+
+    //  Check CURVE security with a garbage server key
+    //  This will be caught by the curve_server class, not passed to ZAP
+    char garbage_key [] = "0000111122223333444455556666777788889999";
+    client = zmq_socket (ctx, ZMQ_DEALER);
+    assert (client);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, garbage_key, 40);
+    assert (rc == 0);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, client_public, 40);
+    assert (rc == 0);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, client_secret, 40);
+    assert (rc == 0);
+    rc = zmq_connect (client, "tcp://localhost:9998");
+    assert (rc == 0);
+    expect_bounce_fail (server, client);
+    close_zero_linger (client);
+
+    //  Check CURVE security with a garbage client public key
+    //  This will be caught by the curve_server class, not passed to ZAP
+    client = zmq_socket (ctx, ZMQ_DEALER);
+    assert (client);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, server_public, 40);
+    assert (rc == 0);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, garbage_key, 40);
+    assert (rc == 0);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, client_secret, 40);
+    assert (rc == 0);
+    rc = zmq_connect (client, "tcp://localhost:9998");
+    assert (rc == 0);
+    expect_bounce_fail (server, client);
+    close_zero_linger (client);
+
+    //  Check CURVE security with a garbage client secret key
+    //  This will be caught by the curve_server class, not passed to ZAP
+    client = zmq_socket (ctx, ZMQ_DEALER);
+    assert (client);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, server_public, 40);
+    assert (rc == 0);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, client_public, 40);
+    assert (rc == 0);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, garbage_key, 40);
+    assert (rc == 0);
+    rc = zmq_connect (client, "tcp://localhost:9998");
+    assert (rc == 0);
+    expect_bounce_fail (server, client);
+    close_zero_linger (client);
+
+    //  Check CURVE security with bogus client credentials
+    //  This must be caught by the ZAP handler
+    char bogus_public [41];
+    char bogus_secret [41];
+    zmq_curve_keypair (bogus_public, bogus_secret);
+
+    client = zmq_socket (ctx, ZMQ_DEALER);
+    assert (client);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, server_public, 40);
+    assert (rc == 0);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, bogus_public, 40);
+    assert (rc == 0);
+    rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, bogus_secret, 40);
+    assert (rc == 0);
+    rc = zmq_connect (client, "tcp://localhost:9998");
+    assert (rc == 0);
+    expect_bounce_fail (server, client);
+    close_zero_linger (client);
+
+    //  Shutdown
+    rc = zmq_close (server);
+    assert (rc == 0);
+    rc = zmq_ctx_term (ctx);
+    assert (rc == 0);
+
+    //  Wait until ZAP handler terminates
+    zmq_threadclose (zap_thread);
+
+    return 0;
+}