moved shared zmq context

Author: johnnykv

beeswarm/__init__.py

@@ -1,8 +1,2 @@
-try:
-    import zmq.green as zmq
-    zmq_context = zmq.Context()
-except ImportError:
-    pass
-
-version = '0.4.16'
+version = '0.4.17'
 

beeswarm/drones/drone.py

@@ -20,6 +20,7 @@
 
 import requests
 import beeswarm
+import beeswarm.shared
 from requests.exceptions import Timeout, ConnectionError
 import gevent
 from gevent import socket
@@ -65,7 +66,7 @@ def __init__(self, work_dir, config, key='server.key', cert='server.crt', **kwar
         self.config_url_dropper_greenlet = None
 
         # messages from server relayed to internal listeners
-        ctx = beeswarm.zmq_context
+        ctx = beeswarm.shared.zmq_context
         self.internal_server_relay = ctx.socket(zmq.PUSH)
         self.internal_server_relay.bind('inproc://serverCommands')
         self.config_received = gevent.event.Event()
@@ -137,7 +138,7 @@ def stop(self):
 
     # command from server
     def incoming_server_comms(self, server_public, client_public, client_secret):
-        context = beeswarm.zmq_context
+        context = beeswarm.shared.zmq_context
         # data (commands) received from server
         receiving_socket = context.socket(zmq.SUB)
 
@@ -190,7 +191,7 @@ def incoming_server_comms(self, server_public, client_public, client_secret):
         logger.warn('Command listener exiting.')
 
     def outgoing_server_comms(self, server_public, client_public, client_secret):
-        context = beeswarm.zmq_context
+        context = beeswarm.shared.zmq_context
         sending_socket = context.socket(zmq.PUSH)
 
         # setup sending tcp socket

beeswarm/drones/honeypot/tests/test_honeypot.py

@@ -26,6 +26,7 @@
 
 import unittest
 import beeswarm
+import beeswarm.shared
 from beeswarm.drones.honeypot.honeypot import Honeypot
 from beeswarm.shared.asciify import asciify
 
@@ -50,7 +51,7 @@ def tearDown(self):
         self.inbox = gevent.queue.Queue()
 
     def mock_server_relay(self):
-        context = beeswarm.zmq_context
+        context = beeswarm.shared.zmq_context
         internal_server_relay = context.socket(zmq.PULL)
         internal_server_relay.bind('inproc://serverRelay')
 

beeswarm/server/db/session_persister.py

@@ -22,6 +22,7 @@
 from gevent import Greenlet
 
 import beeswarm
+import beeswarm.shared
 from beeswarm.server.db import database_setup
 from beeswarm.server.db.entities import Client, BaitSession, Session, Honeypot, Authentication, Classification, \
     Transcript
@@ -45,15 +46,15 @@ def __init__(self, clear_sessions=False):
             count = db_session.query(Session).delete()
             logging.info('Deleting {0} sessions on startup.'.format(count))
             db_session.commit()
-        ctx = beeswarm.zmq_context
+        ctx = beeswarm.shared.zmq_context
         self.subscriber_sessions = ctx.socket(zmq.SUB)
         self.subscriber_sessions.connect('inproc://sessionPublisher')
         self.subscriber_sessions.setsockopt(zmq.SUBSCRIBE, '')
         self.first_cfg_received = gevent.event.Event()
         self.config = None
 
     def config_subscriber(self):
-        ctx = beeswarm.zmq_context
+        ctx = beeswarm.shared.zmq_context
         subscriber_config = ctx.socket(zmq.SUB)
         subscriber_config.connect('inproc://configPublisher')
         subscriber_config.setsockopt(zmq.SUBSCRIBE, '')

beeswarm/server/misc/config_actor.py

@@ -44,7 +44,7 @@ def __init__(self, config_file, work_dir, command_requests_only=False):
         self.config = json.load(open(self.config_file, 'r'))
         self.work_dir = work_dir
 
-        context = beeswarm.zmq_context
+        context = beeswarm.shared.zmq_context
         self.config_commands = context.socket(zmq.REP)
         self.config_publisher = None
         self.drone_command_receiver = None

beeswarm/server/server.py

@@ -108,25 +108,25 @@ def message_proxy(self, work_dir):
         # external interfaces for communicating with drones
         server_secret_file = os.path.join(secret_keys_dir, 'beeswarm_server.pri')
         server_public, server_secret = load_certificate(server_secret_file)
-        drone_data_inbound = beeswarm.zmq_context.socket(zmq.PULL)
+        drone_data_inbound = beeswarm.shared.zmq_context.socket(zmq.PULL)
         drone_data_inbound.curve_secretkey = server_secret
         drone_data_inbound.curve_publickey = server_public
         drone_data_inbound.curve_server = True
         drone_data_inbound.bind('tcp://*:{0}'.format(self.config['network']['zmq_port']))
 
-        drone_data_outbound = beeswarm.zmq_context.socket(zmq.PUB)
+        drone_data_outbound = beeswarm.shared.zmq_context.socket(zmq.PUB)
         drone_data_outbound.curve_secretkey = server_secret
         drone_data_outbound.curve_publickey = server_public
         drone_data_outbound.curve_server = True
         drone_data_outbound.bind('tcp://*:{0}'.format(self.config['network']['zmq_command_port']))
 
         # internal interfaces
         # all inbound session data from drones will be replayed in this socket
-        sessionPublisher = beeswarm.zmq_context.socket(zmq.PUB)
+        sessionPublisher = beeswarm.shared.zmq_context.socket(zmq.PUB)
         sessionPublisher.bind('inproc://sessionPublisher')
 
         # all commands received on this will be published on the external interface
-        drone_command_receiver = beeswarm.zmq_context.socket(zmq.PULL)
+        drone_command_receiver = beeswarm.shared.zmq_context.socket(zmq.PULL)
         drone_command_receiver.bind('inproc://droneCommandReceiver')
 
         poller = zmq.Poller()
@@ -322,7 +322,7 @@ def prepare_environment(work_dir, customize):
             # tmp actor while initializing
             config_actor = ConfigActor('beeswarmcfg.json', work_dir, True)
             config_actor.start()
-            context = beeswarm.zmq_context
+            context = beeswarm.shared.zmq_context
             socket = context.socket(zmq.REQ)
             gevent.sleep()
             socket.connect('inproc://configCommands')

beeswarm/server/webapp/app.py

@@ -35,6 +35,7 @@
 
 from beeswarm.server.webapp.auth import Authenticator
 import beeswarm
+import beeswarm.shared
 from forms import HoneypotConfigurationForm, NewClientConfigForm, LoginForm, SettingsForm
 from beeswarm.server.db import database_setup
 from beeswarm.server.db.entities import Client, BaitSession, Session, Honeypot, User, BaitUser, Transcript, Drone, \
@@ -68,15 +69,15 @@ def is_hidden_field_filter(field):
 # keys used for adding new drones to the system
 drone_keys = []
 
-context = beeswarm.zmq_context
+context = beeswarm.shared.zmq_context
 config_actor_socket = context.socket(zmq.REQ)
 config_actor_socket.connect('inproc://configCommands')
 request_lock = gevent.lock.RLock()
 
 
 def config_subscriber():
     global config
-    ctx = beeswarm.zmq_context
+    ctx = beeswarm.shared.zmq_context
     subscriber_socket = ctx.socket(zmq.SUB)
     subscriber_socket.connect('inproc://configPublisher')
     subscriber_socket.setsockopt(zmq.SUBSCRIBE, Messages.CONFIG_FULL)
@@ -613,7 +614,7 @@ def settings():
 
 
 def update_config(options):
-    context = beeswarm.zmq_context
+    context = beeswarm.shared.zmq_context
     socket = context.socket(zmq.REQ)
     socket.connect('inproc://configCommands')
     socket.send('{0} {1}'.format(Messages.SET, json.dumps(options)))

beeswarm/shared/__init__.py

@@ -0,0 +1,2 @@
+import zmq.green as zmq
+zmq_context = zmq.Context()

beeswarm/shared/helpers.py

@@ -31,6 +31,7 @@
 import requests
 from beeswarm.shared.asciify import asciify
 import beeswarm
+import beeswarm.shared
 
 from beeswarm.shared.message_enum import Messages
 
@@ -178,7 +179,7 @@ def get_config_dict(configfile):
 
 # for occasional req/resp
 def send_zmq_request(actor_url, request):
-    context = beeswarm.zmq_context
+    context = beeswarm.shared.zmq_context
     socket = context.socket(zmq.REQ)
     socket.connect(actor_url)
     socket.send(request)
@@ -204,7 +205,7 @@ def send_zmq_request_socket(socket, request):
 
 # for occasional zmq pushes
 def send_zmq_push(actor_url, data):
-    context = beeswarm.zmq_context
+    context = beeswarm.shared.zmq_context
     socket = context.socket(zmq.PUSH)
     socket.connect(actor_url)
     socket.send(data)

beeswarm/shared/misc/server_logger.py

@@ -21,14 +21,15 @@
 import zmq.green as zmq
 import zmq.auth
 import beeswarm
+import beeswarm.shared
 
 
 logger = logging.getLogger(__name__)
 
 
 class ServerLogger(object):
     def __init__(self, message_type):
-        context = beeswarm.zmq_context
+        context = beeswarm.shared.zmq_context
         self.socket = context.socket(zmq.PUSH)
         self.socket.connect('inproc://serverRelay')
         self.message_type = message_type