Merge branch 'white/master'

RELEASE.md

@@ -8,6 +8,10 @@ Make sure you run ```./faraday.py --update``` the first time after an update!
 New features in the latest update
 =====================================
 
+April 10, 2018:
+---
+* Fix bug with tornado version 5.0 and GTK client.
+
 November 17, 2017:
 ---
 * Fix bug with tags in models.

VERSION

@@ -1 +1 @@
-2.7.1
+2.7.2

apis/rest/api.py

@@ -25,28 +25,31 @@
 
 _plugin_controller_api = None
 _http_server = None
-
-
+ioloop_instance = None
 def startServer():
     global _http_server
+    global ioloop_instance
     if _http_server is not None:
-        IOLoop.instance().start()
+        ioloop_instance.start()
 
 
 def stopServer():
     global _http_server
+    global ioloop_instance
     if _http_server is not None:
-        IOLoop.instance().stop()
+        ioloop_instance.stop()
         _http_server.stop()
 
 
 def startAPIs(plugin_controller, model_controller, hostname, port):
     global _rest_controllers
     global _http_server
+    global ioloop_instance
     _rest_controllers = [PluginControllerAPI(plugin_controller), ModelControllerAPI(model_controller)]
 
     app = Flask('APISController')
 
+    ioloop_instance = IOLoop.current()
     _http_server = HTTPServer(WSGIContainer(app))
     while True:
         try:
@@ -76,9 +79,6 @@ def startAPIs(plugin_controller, model_controller, hostname, port):
     logging.getLogger("tornado.access").propagate = False
     threading.Thread(target=startServer).start()
 
-def stopAPIs():
-    stopServer()
-
 
 class RESTApi(object):
     """ Abstract class for REST Controllers

config/default.xml

@@ -2,7 +2,7 @@
 <faraday>
 
     <appname>Faraday - Penetration Test IDE</appname>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
     <debug_status>0</debug_status>
     <font>-Misc-Fixed-medium-r-normal-*-12-100-100-100-c-70-iso8859-1</font>
     <home_path>~/</home_path>

server/models.py

@@ -9,7 +9,7 @@
 from sqlalchemy.ext.declarative import declarative_base
 
 
-SCHEMA_VERSION = 'W.2.7.1'
+SCHEMA_VERSION = 'W.2.7.2'
 
 Base = declarative_base()