Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:GA
zeromq.11775
zeromq_4.0.5_avoid_curve_test_hang_on_ppc64.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File zeromq_4.0.5_avoid_curve_test_hang_on_ppc64.patch of Package zeromq.11775
From: Michel Normand <normand@linux.vnet.ibm.com> Subject: avoid curve test to hang on ppc64 architecture Date: Wed, 28 Jan 2015 13:46:07 +0100 Avoid curve test to hang on ppc64 architecture At least no problem anymore with those commits: Merge pull request #101 from hintjens/master Problem: issue #1273, protocol downgrade attack Merge pull request #100 from hintjens/master Problem: zmq_ctx_term has insane behavior by default extracted from https://github.com/zeromq/zeromq4-x.git === $git diff -u v4.0.5 b6e3e0f601e2c1ec1f3aac880ed6a3fe63043e51 >/tmp/x and remove the change of version (to keep 4.0.5) === Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com> Index: zeromq-4.0.4/doc/zmq_ctx_term.txt =================================================================== --- zeromq-4.0.4.orig/doc/zmq_ctx_term.txt +++ zeromq-4.0.4/doc/zmq_ctx_term.txt @@ -23,8 +23,8 @@ Context termination is performed in the exception of _zmq_close()_, any further operations on sockets open within 'context' shall fail with an error code of ETERM. -2. After interrupting all blocking calls, _zmq_ctx_term()_ shall _block_ until the - following conditions are satisfied: +2. After interrupting all blocking calls, _zmq_ctx_term()_ shall _block_ until + the following conditions are satisfied: * All sockets open within 'context' have been closed with _zmq_close()_. @@ -39,6 +39,15 @@ option in linkzmq:zmq_setsockopt[3]. This function replaces the deprecated function linkzmq:zmq_term[3]. +WARNING +------- + +As _ZMQ_LINGER_ defaults to "infinite", by default this function will block +indefinitely if there are any pending connects or sends. We strongly +recommend to (a) set _ZMQ_LINGER_ to zero on all sockets and (b) close all +sockets, before calling this function. + + RETURN VALUE ------------ The _zmq_ctx_term()_ function shall return zero if successful. Otherwise Index: zeromq-4.0.4/src/session_base.cpp =================================================================== --- zeromq-4.0.4.orig/src/session_base.cpp +++ zeromq-4.0.4/src/session_base.cpp @@ -324,6 +324,14 @@ int zmq::session_base_t::zap_connect () return 0; } +bool zmq::session_base_t::zap_enabled () +{ + return ( + options.mechanism != ZMQ_NULL || + (options.mechanism == ZMQ_NULL && options.zap_domain.length() > 0) + ); +} + void zmq::session_base_t::process_attach (i_engine *engine_) { zmq_assert (engine_ != NULL); Index: zeromq-4.0.4/src/session_base.hpp =================================================================== --- zeromq-4.0.4.orig/src/session_base.hpp +++ zeromq-4.0.4/src/session_base.hpp @@ -68,7 +68,8 @@ namespace zmq int push_msg (msg_t *msg_); int zap_connect (); - + bool zap_enabled (); + // Fetches a message. Returns 0 if successful; -1 otherwise. // The caller is responsible for freeing the message when no // longer used. Index: zeromq-4.0.4/src/stream_engine.cpp =================================================================== --- zeromq-4.0.4.orig/src/stream_engine.cpp +++ zeromq-4.0.4/src/stream_engine.cpp @@ -464,6 +464,11 @@ bool zmq::stream_engine_t::handshake () // Is the peer using ZMTP/1.0 with no revision number? // If so, we send and receive rest of identity message if (greeting_recv [0] != 0xff || !(greeting_recv [9] & 0x01)) { + if (session->zap_enabled ()) { + // Reject ZMTP 1.0 connections if ZAP is enabled + error (); + return false; + } encoder = new (std::nothrow) v1_encoder_t (out_batch_size); alloc_assert (encoder); @@ -505,6 +510,11 @@ bool zmq::stream_engine_t::handshake () } else if (greeting_recv [revision_pos] == ZMTP_1_0) { + if (session->zap_enabled ()) { + // Reject ZMTP 1.0 connections if ZAP is enabled + error (); + return false; + } encoder = new (std::nothrow) v1_encoder_t ( out_batch_size); alloc_assert (encoder); @@ -515,6 +525,11 @@ bool zmq::stream_engine_t::handshake () } else if (greeting_recv [revision_pos] == ZMTP_2_0) { + if (session->zap_enabled ()) { + // Reject ZMTP 1.0 connections if ZAP is enabled + error (); + return false; + } encoder = new (std::nothrow) v2_encoder_t (out_batch_size); alloc_assert (encoder); Index: zeromq-4.0.4/tests/test_security_curve.cpp =================================================================== --- zeromq-4.0.4.orig/tests/test_security_curve.cpp +++ zeromq-4.0.4/tests/test_security_curve.cpp @@ -18,6 +18,17 @@ */ #include "testutil.hpp" +#if defined (ZMQ_HAVE_WINDOWS) +# include <winsock2.h> +# include <ws2tcpip.h> +# include <stdexcept> +# define close closesocket +#else +# include <sys/socket.h> +# include <netinet/in.h> +# include <arpa/inet.h> +# include <unistd.h> +#endif // We'll generate random test keys at startup static char client_public [41]; @@ -199,6 +210,45 @@ int main (void) expect_bounce_fail (server, client); close_zero_linger (client); + // Unauthenticated messages from a vanilla socket shouldn't be received + struct sockaddr_in ip4addr; + int s; + + ip4addr.sin_family = AF_INET; + ip4addr.sin_port = htons (9998); + inet_pton (AF_INET, "127.0.0.1", &ip4addr.sin_addr); + + s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); + rc = connect (s, (struct sockaddr*) &ip4addr, sizeof (ip4addr)); + assert (rc > -1); + // send anonymous ZMTP/1.0 greeting + send (s, "\x01\x00", 2, 0); + // send sneaky message that shouldn't be received + send (s, "\x08\x00sneaky\0", 9, 0); + int timeout = 150; + zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (timeout)); + char *buf = s_recv (server); + if (buf != NULL) { + printf ("Received unauthenticated message: %s\n", buf); + assert (buf == NULL); + } + close (s); + + // Check return codes for invalid buffer sizes + client = zmq_socket (ctx, ZMQ_DEALER); + assert (client); + errno = 0; + rc = zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, server_public, 123); + assert (rc == -1 && errno == EINVAL); + errno = 0; + rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, client_public, 123); + assert (rc == -1 && errno == EINVAL); + errno = 0; + rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, client_secret, 123); + assert (rc == -1 && errno == EINVAL); + rc = zmq_close (client); + assert (rc == 0); + // Shutdown rc = zmq_close (server); assert (rc == 0); Index: zeromq-4.0.4/tests/test_security_null.cpp =================================================================== --- zeromq-4.0.4.orig/tests/test_security_null.cpp +++ zeromq-4.0.4/tests/test_security_null.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file + Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file This file is part of 0MQ. @@ -18,6 +18,17 @@ */ #include "testutil.hpp" +#if defined (ZMQ_HAVE_WINDOWS) +# include <winsock2.h> +# include <ws2tcpip.h> +# include <stdexcept> +# define close closesocket +#else +# include <sys/socket.h> +# include <netinet/in.h> +# include <arpa/inet.h> +# include <unistd.h> +#endif static void zap_handler (void *handler) @@ -27,6 +38,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 +69,7 @@ zap_handler (void *handler) free (identity); free (mechanism); } - zmq_close (handler); + close_zero_linger (handler); } int main (void) @@ -76,72 +88,89 @@ 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); - rc = zmq_ctx_term (ctx); + + // Unauthenticated messages from a vanilla socket shouldn't be received + server = zmq_socket (ctx, ZMQ_DEALER); + assert (server); + rc = zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5); assert (rc == 0); + rc = zmq_bind (server, "tcp://127.0.0.1:9003"); + assert (rc == 0); + + struct sockaddr_in ip4addr; + int s; + + ip4addr.sin_family = AF_INET; + ip4addr.sin_port = htons(9003); + inet_pton(AF_INET, "127.0.0.1", &ip4addr.sin_addr); + + s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); + rc = connect (s, (struct sockaddr*) &ip4addr, sizeof ip4addr); + assert (rc > -1); + // send anonymous ZMTP/1.0 greeting + send (s, "\x01\x00", 2, 0); + // send sneaky message that shouldn't be received + send (s, "\x08\x00sneaky\0", 9, 0); + int timeout = 150; + zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (timeout)); + char *buf = s_recv (server); + if (buf != NULL) { + printf ("Received unauthenticated message: %s\n", buf); + assert (buf == NULL); + } + close (s); + close_zero_linger (server); - // Wait until ZAP handler terminates. + // Shutdown + rc = zmq_ctx_term (ctx); + assert (rc == 0); + // Wait until ZAP handler terminates zmq_threadclose (zap_thread); return 0; Index: zeromq-4.0.4/tests/test_security_plain.cpp =================================================================== --- zeromq-4.0.4.orig/tests/test_security_plain.cpp +++ zeromq-4.0.4/tests/test_security_plain.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file + Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file This file is part of 0MQ. @@ -18,6 +18,17 @@ */ #include "testutil.hpp" +#if defined (ZMQ_HAVE_WINDOWS) +# include <winsock2.h> +# include <ws2tcpip.h> +# include <stdexcept> +# define close closesocket +#else +# include <sys/socket.h> +# include <netinet/in.h> +# include <arpa/inet.h> +# include <unistd.h> +#endif static void zap_handler (void *ctx) @@ -137,6 +148,30 @@ int main (void) expect_bounce_fail (server, client); close_zero_linger (client); + // Unauthenticated messages from a vanilla socket shouldn't be received + struct sockaddr_in ip4addr; + int s; + + ip4addr.sin_family = AF_INET; + ip4addr.sin_port = htons (9998); + inet_pton (AF_INET, "127.0.0.1", &ip4addr.sin_addr); + + s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); + rc = connect (s, (struct sockaddr*) &ip4addr, sizeof (ip4addr)); + assert (rc > -1); + // send anonymous ZMTP/1.0 greeting + send (s, "\x01\x00", 2, 0); + // send sneaky message that shouldn't be received + send (s, "\x08\x00sneaky\0", 9, 0); + int timeout = 150; + zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (timeout)); + char *buf = s_recv (server); + if (buf != NULL) { + printf ("Received unauthenticated message: %s\n", buf); + assert (buf == NULL); + } + close (s); + // Shutdown rc = zmq_close (server); assert (rc == 0);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
