rbczmq 1.7.1 → 1.7.2

data/ext/czmq/examples/security/strawhouse.c

@@ -0,0 +1,44 @@
+//  The Strawhouse Pattern
+//
+//  We allow or deny clients according to their IP address. It may keep 
+//  spammers and idiots away, but won't stop a real attacker for more 
+//  than a heartbeat.
+
+#include <czmq.h>
+
+int main (void) 
+{
+    //  Create context
+    zctx_t *ctx = zctx_new ();
+    
+    //  Start an authentication engine for this context. This engine
+    //  allows or denies incoming connections (talking to the libzmq
+    //  core over a protocol called ZAP).
+    zauth_t *auth = zauth_new (ctx);
+    
+    //  Get some indication of what the authenticator is deciding
+    zauth_set_verbose (auth, true);
+    
+    //  Whitelist our address; any other address will be rejected
+    zauth_allow (auth, "127.0.0.1");
+        
+    //  Create and bind server socket
+    void *server = zsocket_new (ctx, ZMQ_PUSH);
+    zsocket_set_zap_domain (server, "global");
+    zsocket_bind (server, "tcp://*:9000");
+
+    //  Create and connect client socket
+    void *client = zsocket_new (ctx, ZMQ_PULL);
+    zsocket_connect (client, "tcp://127.0.0.1:9000");
+    
+    //  Send a single message from server to client
+    zstr_send (server, "Hello");
+    char *message = zstr_recv (client);
+    assert (streq (message, "Hello"));
+    free (message);
+    puts ("Strawhouse test OK");
+
+    zauth_destroy (&auth);
+    zctx_destroy (&ctx);
+    return 0;
+}

data/ext/czmq/examples/security/woodhouse.c

@@ -0,0 +1,40 @@
+//  The Woodhouse Pattern
+//
+//  It may keep some malicious people out but all it takes is a bit
+//  of network sniffing, and they'll be able to fake their way in.
+
+#include <czmq.h>
+
+int main (void) 
+{
+    //  Create context and start authentication engine
+    zctx_t *ctx = zctx_new ();
+    zauth_t *auth = zauth_new (ctx);
+    zauth_set_verbose (auth, true);
+    zauth_allow (auth, "127.0.0.1");
+    
+    //  Tell the authenticator how to handle PLAIN requests
+    zauth_configure_plain (auth, "*", "passwords");
+        
+    //  Create and bind server socket
+    void *server = zsocket_new (ctx, ZMQ_PUSH);
+    zsocket_set_plain_server (server, 1);
+    zsocket_bind (server, "tcp://*:9000");
+
+    //  Create and connect client socket
+    void *client = zsocket_new (ctx, ZMQ_PULL);
+    zsocket_set_plain_username (client, "admin");
+    zsocket_set_plain_password (client, "secret");
+    zsocket_connect (client, "tcp://127.0.0.1:9000");
+    
+    //  Send a single message from server to client
+    zstr_send (server, "Hello");
+    char *message = zstr_recv (client);
+    assert (streq (message, "Hello"));
+    free (message);
+    puts ("Woodhouse test OK");
+
+    zauth_destroy (&auth);
+    zctx_destroy (&ctx);
+    return 0;
+}

data/ext/czmq/include/czmq.h

@@ -32,9 +32,9 @@
 
 //  CZMQ version macros for compile-time API detection
 
-#define CZMQ_VERSION_MAJOR 1
-#define CZMQ_VERSION_MINOR 4
-#define CZMQ_VERSION_PATCH 2
+#define CZMQ_VERSION_MAJOR 2
+#define CZMQ_VERSION_MINOR 0
+#define CZMQ_VERSION_PATCH 1
 
 #define CZMQ_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))
@@ -43,22 +43,28 @@
 
 //  Classes in the API
 
+#include "zchunk.h"
 #include "zclock.h"
 #include "zconfig.h"
 #include "zctx.h"
 #include "zfile.h"
+#include "zdir.h"
 #include "zframe.h"
 #include "zlist.h"
 #include "zhash.h"
-#include "ztree.h"
 #include "zloop.h"
 #include "zmsg.h"
 #include "zmutex.h"
+#include "zpoller.h"
 #include "zsocket.h"
 #include "zsockopt.h"
 #include "zstr.h"
 #include "zsys.h"
 #include "zthread.h"
+#include "ztree.h"
 #include "zbeacon.h"
+#include "zauth.h"
+#include "zcert.h"
+#include "zcertstore.h"
 
 #endif

data/ext/czmq/include/czmq_prelude.h

@@ -88,10 +88,9 @@
 #   define __WINDOWS__
 #   undef __MSDOS__
 #   define __MSDOS__
-#   if _MSC_VER == 1500
-#       ifndef _CRT_SECURE_NO_DEPRECATE
-#           define _CRT_SECURE_NO_DEPRECATE   1
-#       endif
+//  Stop cheeky warnings about "deprecated" functions like fopen
+#   if _MSC_VER >= 1500
+#       define _CRT_SECURE_NO_DEPRECATE
 #       pragma warning(disable: 4996)
 #   endif
 #endif
@@ -248,12 +247,6 @@
 #   include <sys/stat.h>
 #   include <sys/utime.h>
 #   include <share.h>
-#   if _MSC_VER == 1500
-#       ifndef _CRT_SECURE_NO_DEPRECATE
-#           define _CRT_SECURE_NO_DEPRECATE   1
-#       endif
-#       pragma warning(disable: 4996)
-#   endif
 #endif
 
 #if (defined (__UNIX__))
@@ -274,9 +267,10 @@
 #   include <sys/ioctl.h>
 #   include <sys/file.h>
 #   include <sys/wait.h>
-#   include <sys/uio.h>                 //  This is required to make CZMQ compile with libzmq/3.x
-#   include <netinet/in.h>              //  Must come before arpa/inet.h
-#   if (!defined (__UTYPE_ANDROID)) && (!defined (__UTYPE_IBMAIX)) && (!defined (__UTYPE_HPUX)) && (!defined (__UTYPE_SUNOS))
+#   include <sys/uio.h>             //  Let CZMQ build with libzmq/3.x
+#   include <netinet/in.h>          //  Must come before arpa/inet.h
+#   if (!defined (__UTYPE_ANDROID)) && (!defined (__UTYPE_IBMAIX)) \
+    && (!defined (__UTYPE_HPUX)) && (!defined (__UTYPE_SUNOS))
 #       include <ifaddrs.h>
 #   endif
 #   if (!defined (__UTYPE_BEOS))
@@ -291,12 +285,12 @@
 #   if (defined (__UTYPE_BEOS))
 #       include <NetKit.h>
 #   endif
-#   if ((defined (_XOPEN_REALTIME) && (_XOPEN_REALTIME >= 1)) || \
-        (defined (_POSIX_VERSION)  && (_POSIX_VERSION  >= 199309L)))
+#   if ((defined (_XOPEN_REALTIME) && (_XOPEN_REALTIME >= 1)) \
+     || (defined (_POSIX_VERSION)  && (_POSIX_VERSION  >= 199309L)))
 #       include <sched.h>
 #   endif
 #   if (defined (__UTYPE_OSX))
-#       include <crt_externs.h>         /* For _NSGetEnviron()               */
+#       include <crt_externs.h>         //  For _NSGetEnviron()
 #   endif
 #endif
 
@@ -372,7 +366,8 @@ typedef unsigned int    qbyte;          //  Quad byte = 32 bits
 #define strneq(s1,s2)   (strcmp ((s1), (s2)))
 
 //  Provide random number from 0..(num-1)
-#if (defined (__WINDOWS__)) || (defined (__UTYPE_IBMAIX)) || (defined (__UTYPE_HPUX)) || (defined (__UTYPE_SUNOS))
+#if (defined (__WINDOWS__)) || (defined (__UTYPE_IBMAIX)) \
+ || (defined (__UTYPE_HPUX)) || (defined (__UTYPE_SUNOS))
 #   define randof(num)  (int) ((float) (num) * rand () / (RAND_MAX + 1.0))
 #else
 #   define randof(num)  (int) ((float) (num) * random () / (RAND_MAX + 1.0))
@@ -380,11 +375,11 @@ typedef unsigned int    qbyte;          //  Quad byte = 32 bits
 
 // Windows MSVS doesn't have stdbool
 #if (defined (__WINDOWS__))
-#    if (!defined(__cplusplus) && (!defined (true)))
-#        define true 1
-#        define false 0
-         typedef char bool;
-#    endif
+#   if (!defined (__cplusplus) && (!defined (true)))
+#       define true 1
+#       define false 0
+        typedef char bool;
+#   endif
 #else
 #   include <stdbool.h>
 #endif
@@ -392,7 +387,9 @@ typedef unsigned int    qbyte;          //  Quad byte = 32 bits
 //- A number of POSIX and C99 keywords and data types -----------------------
 
 #if (defined (__WINDOWS__))
-#   define inline __inline
+#   if (!defined (__cplusplus) && (!defined (inline)))
+#       define inline __inline
+#   endif
 #   define strtoull _strtoui64
 #   define srandom srand
 #   define TIMEZONE _timezone
@@ -475,30 +472,33 @@ static inline void *
 
 #include "zmq.h"
 
-//  Older libzmq APIs will be missing some aspects of libzmq/3.0
+#if ZMQ_VERSION_MAJOR == 4
+#   define ZMQ_POLL_MSEC    1           //  zmq_poll is msec
 
-#ifndef ZMQ_ROUTER
-#   define ZMQ_ROUTER       ZMQ_XREP
-#endif
-#ifndef ZMQ_DEALER
-#   define ZMQ_DEALER       ZMQ_XREQ
-#endif
-#ifndef ZMQ_DONTWAIT
-#   define ZMQ_DONTWAIT     ZMQ_NOBLOCK
-#endif
-#ifndef ZMQ_XSUB
-#   error "please upgrade to latest stable libzmq from http://zeromq.org"
-#endif
-#if ZMQ_VERSION_MAJOR == 2
+#elif ZMQ_VERSION_MAJOR == 3
+#   define ZMQ_POLL_MSEC    1           //  zmq_poll is msec
+
+#elif ZMQ_VERSION_MAJOR == 2
+#   define ZMQ_POLL_MSEC    1000        //  zmq_poll is usec
+#   define zmq_sendmsg      zmq_send    //  Smooth out 2.x changes
+#   define zmq_recvmsg      zmq_recv
+    //  Older libzmq APIs may be missing some aspects of libzmq v3.0
+#   ifndef ZMQ_ROUTER
+#       define ZMQ_ROUTER       ZMQ_XREP
+#   endif
+#   ifndef ZMQ_DEALER
+#       define ZMQ_DEALER       ZMQ_XREQ
+#   endif
+#   ifndef ZMQ_DONTWAIT
+#       define ZMQ_DONTWAIT     ZMQ_NOBLOCK
+#   endif
+#   ifndef ZMQ_XSUB
+#       error "please upgrade your libzmq from http://zeromq.org"
+#   endif
 #   if  ZMQ_VERSION_MINOR == 0 \
     || (ZMQ_VERSION_MINOR == 1 && ZMQ_VERSION_PATCH < 7)
 #       error "CZMQ requires at least libzmq/2.1.7 stable"
 #   endif
-#   define zmq_sendmsg      zmq_send
-#   define zmq_recvmsg      zmq_recv
-#   define ZMQ_POLL_MSEC    1000        //  zmq_poll is usec
-#elif ZMQ_VERSION_MAJOR == 3 || ZMQ_VERSION_MAJOR == 4
-#   define ZMQ_POLL_MSEC    1           //  zmq_poll is msec
 #endif
 
 #endif

data/ext/czmq/include/zauth.h

@@ -0,0 +1,97 @@
+/*  =========================================================================
+    zauth - authentication for ZeroMQ security mechanisms
+
+    -------------------------------------------------------------------------
+    Copyright (c) 1991-2013 iMatix Corporation <www.imatix.com>
+    Copyright other contributors as noted in the AUTHORS file.
+
+    This file is part of CZMQ, the high-level C binding for 0MQ:
+    http://czmq.zeromq.org.
+
+    This 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.
+
+    This software is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABIL-
+    ITY 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/>.
+    =========================================================================
+*/
+
+#ifndef __ZAUTH_H_INCLUDED__
+#define __ZAUTH_H_INCLUDED__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//  Opaque class structure
+typedef struct _zauth_t zauth_t;
+
+//  @interface
+#define CURVE_ALLOW_ANY "*"
+
+//  Constructor
+//  Install authentication for the specified context. Returns a new zauth
+//  object that you can use to configure authentication. Note that until you
+//  add policies, all incoming NULL connections are allowed (classic ZeroMQ
+//  behaviour), and all PLAIN and CURVE connections are denied. If there was
+//  an error during initialization, returns NULL.
+CZMQ_EXPORT zauth_t *
+    zauth_new (zctx_t *ctx);
+    
+//  Allow (whitelist) a single IP address. For NULL, all clients from this
+//  address will be accepted. For PLAIN and CURVE, they will be allowed to
+//  continue with authentication. You can call this method multiple times 
+//  to whitelist multiple IP addresses. If you whitelist a single address,
+//  any non-whitelisted addresses are treated as blacklisted.
+CZMQ_EXPORT void
+    zauth_allow (zauth_t *self, char *address);
+
+//  Deny (blacklist) a single IP address. For all security mechanisms, this
+//  rejects the connection without any further authentication. Use either a
+//  whitelist, or a blacklist, not not both. If you define both a whitelist 
+//  and a blacklist, only the whitelist takes effect.
+CZMQ_EXPORT void
+    zauth_deny (zauth_t *self, char *address);
+
+//  Configure PLAIN authentication for a given domain. PLAIN authentication
+//  uses a plain-text password file. The filename is treated as a printf 
+//  format. To cover all domains, use "*". You can modify the password file
+//  at any time; it is reloaded automatically.
+CZMQ_EXPORT void
+    zauth_configure_plain (zauth_t *self, char *domain, char *filename, ...);
+    
+//  Configure CURVE authentication for a given domain. CURVE authentication
+//  uses a directory that holds all public client certificates, i.e. their
+//  public keys. The certificates must be in zcert_save () format. The 
+//  location is treated as a printf format. To cover all domains, use "*". 
+//  You can add and remove certificates in that directory at any time. 
+//  To allow all client keys without checking, specify CURVE_ALLOW_ANY
+//  for the location.
+CZMQ_EXPORT void
+    zauth_configure_curve (zauth_t *self, char *domain, char *location, ...);
+    
+//  Enable verbose tracing of commands and activity
+CZMQ_EXPORT void
+    zauth_set_verbose (zauth_t *self, bool verbose);
+    
+//  Destructor
+CZMQ_EXPORT void
+    zauth_destroy (zauth_t **self_p);
+
+//  Selftest
+CZMQ_EXPORT int
+    zauth_test (bool verbose);
+//  @end
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

data/ext/czmq/include/zbeacon.h

@@ -74,11 +74,6 @@ CZMQ_EXPORT void
 CZMQ_EXPORT void *
     zbeacon_socket (zbeacon_t *self);
 
-//  Get beacon pipe, for polling or receiving messages
-//  DEPRECATED
-CZMQ_EXPORT void *
-    zbeacon_pipe (zbeacon_t *self);
-
 //  Self test of this class
 CZMQ_EXPORT void
     zbeacon_test (bool verbose);

data/ext/czmq/include/zcert.h

@@ -0,0 +1,118 @@
+/*  =========================================================================
+    zcert - work with CURVE security certificates
+
+    -------------------------------------------------------------------------
+    Copyright (c) 1991-2013 iMatix Corporation <www.imatix.com>
+    Copyright other contributors as noted in the AUTHORS file.
+
+    This file is part of CZMQ, the high-level C binding for 0MQ:
+    http://czmq.zeromq.org.
+
+    This 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.
+
+    This software is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABIL-
+    ITY 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/>.
+    =========================================================================
+*/
+
+#ifndef __ZCERT_H_INCLUDED__
+#define __ZCERT_H_INCLUDED__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//  Opaque class structure
+typedef struct _zcert_t zcert_t;
+
+//  @interface
+
+//  Create and initialize a new certificate in memory
+CZMQ_EXPORT zcert_t *
+    zcert_new (void);
+
+//  Constructor, accepts public/secret key pair from caller
+CZMQ_EXPORT zcert_t *
+    zcert_new_from (byte *public_key, byte *secret_key);
+
+//  Destroy a certificate in memory
+CZMQ_EXPORT void
+    zcert_destroy (zcert_t **self_p);
+
+//  Return public part of key pair as 32-byte binary string
+CZMQ_EXPORT byte *
+    zcert_public_key (zcert_t *self);
+
+//  Return secret part of key pair as 32-byte binary string
+CZMQ_EXPORT byte *
+    zcert_secret_key (zcert_t *self);
+
+//  Return public part of key pair as Z85 armored string
+CZMQ_EXPORT char *
+    zcert_public_txt (zcert_t *self);
+
+//  Return secret part of key pair as Z85 armored string
+CZMQ_EXPORT char *
+    zcert_secret_txt (zcert_t *self);
+
+//  Set certificate metadata from formatted string.
+CZMQ_EXPORT void
+    zcert_set_meta (zcert_t *self, char *name, char *format, ...);
+
+//  Get metadata value from certificate; if the metadata value doesn't 
+//  exist, returns NULL.
+CZMQ_EXPORT char *
+    zcert_meta (zcert_t *self, char *name);
+
+//  Load certificate from file (constructor)
+//  The filename is treated as a printf format specifier.
+CZMQ_EXPORT zcert_t *
+    zcert_load (char *filename, ...);
+
+//  Save full certificate (public + secret) to file for persistent storage
+//  This creates one public file and one secret file (filename + "_secret").
+//  The filename is treated as a printf format specifier.
+CZMQ_EXPORT int
+    zcert_save (zcert_t *self, char *filename, ...);
+
+//  Save public certificate only to file for persistent storage
+//  The filename is treated as a printf format specifier.
+CZMQ_EXPORT int
+    zcert_save_public (zcert_t *self, char *filename, ...);
+
+//  Apply certificate to socket, i.e. use for CURVE security on socket.
+//  If certificate was loaded from public file, the secret key will be
+//  undefined, and this certificate will not work successfully.
+CZMQ_EXPORT void
+    zcert_apply (zcert_t *self, void *zocket);
+
+//  Return copy of certificate
+CZMQ_EXPORT zcert_t *
+    zcert_dup (zcert_t *self);
+
+//  Return true if two certificates have the same keys
+CZMQ_EXPORT bool
+    zcert_eq (zcert_t *self, zcert_t *compare);
+
+//  Dump certificate contents to stderr for debugging
+CZMQ_EXPORT void
+    zcert_dump (zcert_t *self);
+
+//  Self test of this class
+CZMQ_EXPORT int
+    zcert_test (bool verbose);
+//  @end
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif