Merge pull request #448 from csirtgadgets/fix/zmq-fd-leaks

problem: IOLoop leaks FDs in fireball mode

cif/httpd/__init__.py

@@ -219,8 +219,9 @@ def login():
         if request.form['token'] == '':
             return render_template('login.html')
 
-        c = Client(remote, HTTPD_TOKEN)
-        rv = c.tokens_search({'token': request.form['token']})
+        with Client(remote, HTTPD_TOKEN) as cli:
+            rv = cli.tokens_search({'token': request.form['token']})
+
         if len(rv) == 0:
             return render_template('login.html', code=401)
 

cif/httpd/views/indicators.py

@@ -34,7 +34,9 @@ def get(self):
             return jsonify_success(r)
 
         try:
-            r = Client(remote, pull_token()).indicators_search(filters, decode=False)
+            with Client(remote, pull_token()) as cli:
+                r = cli.indicators_search(filters, decode=False)
+
         except RuntimeError as e:
             logger.error(e)
             return jsonify_unknown(msg='search failed')
@@ -68,7 +70,9 @@ def post(self):
                 logger.info('fireball mode')
                 fireball = True
         try:
-            r = Client(remote, pull_token()).indicators_create(request.data, nowait=nowait, fireball=fireball)
+            with Client(remote, pull_token()) as cli:
+                r = cli.indicators_create(request.data, nowait=nowait,
+                                          fireball=fireball)
             if nowait:
                 r = 'pending'
 
@@ -99,7 +103,8 @@ def post(self):
     def delete(self):
         try:
             data = request.data.decode('utf-8')
-            r = Client(remote, pull_token()).indicators_delete(data)
+            with Client(remote, pull_token()) as cli:
+                r = cli.indicators_delete(data)
 
         except RuntimeError as e:
             logger.error(e)

cif/httpd/views/ping.py

@@ -21,7 +21,8 @@ def get(self):
             return jsonify_success(r)
 
         try:
-            r = Client(remote, pull_token()).ping(write=write)
+            with Client(remote, pull_token()) as cli:
+                r = cli.ping(write=write)
 
         except TimeoutError:
             return jsonify_unknown(msg='timeout', code=408)

dev_requirements.txt

@@ -1,4 +1,4 @@
 coverage>=4.2
-pytest-cov>=2.2.1,<2.6.1
-pytest>=2.8.0,<3.0
+pytest-cov>=2.6
+pytest>=4.2
 -r requirements.txt