clear pending on startup and options to clear all

Author: johnnykv

beeswarm/__init__.py

@@ -4,5 +4,5 @@
 except ImportError:
     pass
 
-version = '0.4.15'
+version = '0.4.16'
 

beeswarm/drones/client/models/dispatcher.py

@@ -58,9 +58,13 @@ def _run(self):
                 gevent.sleep(5)
             while self.time_in_range():
                 if self.activation_probability >= random.random():
-                    # TODO: sessions whould be moved from here, too many has knowledge of the sessions list
-                    bait = self.bait_type(self.sessions, self.options)
-                    gevent.spawn(bait.start)
+                    if not self.options['server']:
+                        logging.debug('Discarding bait session because the honeypot has not announced '
+                                      'the ip address yet')
+                    else:
+                        # TODO: sessions whould be moved from here, too many has knowledge of the sessions list
+                        bait = self.bait_type(self.sessions, self.options)
+                        gevent.spawn(bait.start)
                 gevent.sleep(self.sleep_interval)
 
     def time_in_range(self):

beeswarm/server/db/session_persister.py

@@ -33,8 +33,18 @@
 
 
 class SessionPersister(gevent.Greenlet):
-    def __init__(self):
+    def __init__(self, clear_sessions=False):
         Greenlet.__init__(self)
+        db_session = database_setup.get_session()
+        # clear all pending sessions on startup, pending sessions on startup
+        pending_classification = db_session.query(Classification).filter(Classification.type == 'pending').one()
+        pending_deleted = db_session.query(Session).filter(Session.classification == pending_classification).delete()
+        db_session.commit()
+        logging.info('Cleaned {0} pending sessions on startup'.format(pending_deleted))
+        if clear_sessions:
+            count = db_session.query(Session).delete()
+            logging.info('Deleting {0} sessions on startup.'.format(count))
+            db_session.commit()
         ctx = beeswarm.zmq_context
         self.subscriber_sessions = ctx.socket(zmq.SUB)
         self.subscriber_sessions.connect('inproc://sessionPublisher')

bin/beeswarm

@@ -91,6 +91,8 @@ if __name__ == '__main__':
     parser.add_argument('-v', '--verbose', action='store_true', default=False, help='Logs debug messages.')
     parser.add_argument('--customize', action='store_true', default=False,
                         help='Asks for specific network and certificate information on the first run.')
+    parser.add_argument('--clearsessions', action='store_true', default=False,
+                        help='Deletes all sessions on startup.')
     args = parser.parse_args()
 
     setuplogging(args.logfile, args.verbose)
@@ -128,7 +130,7 @@ if __name__ == '__main__':
         sys.exit(1)
 
     try:
-        m = mode(args.workdir, config, customize=args.customize)
+        m = mode(args.workdir, config, customize=args.customize, clear_db=args.clearsessions)
     except ConfigNotFound as ex:
         logger.error(ex)
         sys.exit(ex)

requirements.txt

@@ -1,6 +1,6 @@
 --allow-unverified pyDes
 --allow-external pyDes
-pyzmq>=14.1.1
+pyzmq==14.3.0
 fs
 pycrypto
 Crypto