From 76436726663971ebd58bf2c758b52abb10f7c242 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 2 Jun 2015 17:27:42 -0400
Subject: [bug] allow ipc socket types

previous regex wasn't capturing addresses of type ipc://<path>

Closes: #7089
---
 src/leap/common/events/zmq_components.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'src/leap/common/events/zmq_components.py')

diff --git a/src/leap/common/events/zmq_components.py b/src/leap/common/events/zmq_components.py
index 4fb95d3..3b88862 100644
--- a/src/leap/common/events/zmq_components.py
+++ b/src/leap/common/events/zmq_components.py
@@ -45,7 +45,7 @@ from leap.common.zmq_utils import PUBLIC_KEYS_PREFIX
 logger = logging.getLogger(__name__)
 
 
-ADDRESS_RE = re.compile("(.+)://(.+):([0-9]+)")
+ADDRESS_RE = re.compile("^([a-z]+)://([^:]+):?(\d+)?$")
 
 
 class TxZmqComponent(object):
@@ -63,7 +63,7 @@ class TxZmqComponent(object):
         """
         self._factory = txzmq.ZmqFactory()
         self._factory.registerForShutdown()
-        if path_prefix == None:
+        if path_prefix is None:
             path_prefix = get_path_prefix()
         self._config_prefix = os.path.join(path_prefix, "leap", "events")
         self._connections = []
@@ -125,15 +125,19 @@ class TxZmqComponent(object):
             socket.curve_publickey = public
             socket.curve_secretkey = secret
             self._start_thread_auth(connection.socket)
-        # check if port was given
-        protocol, addr, port = ADDRESS_RE.match(address).groups()
-        if port == "0":
-            port = socket.bind_to_random_port("%s://%s" % (protocol, addr))
+
+        proto, addr, port = ADDRESS_RE.search(address).groups()
+
+        if port is None:
+            params = proto, addr
+            port = socket.bind("%s://%s" % params)
+            # XXX this log doesn't appear
+            logger.debug("Binded %s to %s://%s." % ((connClass,) + params))
         else:
-            socket.bind(address)
-            port = int(port)
-        logger.debug("Binded %s to %s://%s:%d."
-                     % (connClass, protocol, addr, port))
+            params = proto, addr, int(port)
+            socket.bind("%s://%s:%d" % params)
+            # XXX this log doesn't appear
+            logger.debug("Binded %s to %s://%s:%d." % ((connClass,) + params))
         self._connections.append(connection)
         return connection, port
 
-- 
cgit v1.2.3