From ee0439cf1194d17849ad7afcfb61103e251d6682 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 27 Jan 2016 10:03:30 +0100
Subject: [PATCH] Update for #1678

---
 lib/core/settings.py |  3 +++
 lib/utils/api.py     | 17 +++++++++++------
 sqlmapapi.py         |  3 ++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index a53cd2e37..71199f08e 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -602,6 +602,9 @@ EVENTVALIDATION_REGEX = r'(?i)(?P<name>__EVENTVALIDATION[^"]*)[^>]+value="(?P<re
 # Number of rows to generate inside the full union test for limited output (mustn't be too large to prevent payload length problems)
 LIMITED_ROWS_TEST_NUMBER = 15
 
+# Default adapter to use for bottle server
+RESTAPI_DEFAULT_ADAPTER = "wsgiref"
+
 # Default REST-JSON API server listen address
 RESTAPI_DEFAULT_ADDRESS = "127.0.0.1"
 
diff --git a/lib/utils/api.py b/lib/utils/api.py
index 9992979e0..9513f31f4 100644
--- a/lib/utils/api.py
+++ b/lib/utils/api.py
@@ -35,6 +35,7 @@ from lib.core.enums import PART_RUN_CONTENT_TYPES
 from lib.core.exception import SqlmapConnectionException
 from lib.core.log import LOGGER_HANDLER
 from lib.core.optiondict import optDict
+from lib.core.settings import RESTAPI_DEFAULT_ADAPTER
 from lib.core.settings import IS_WIN
 from lib.core.settings import RESTAPI_DEFAULT_ADDRESS
 from lib.core.settings import RESTAPI_DEFAULT_PORT
@@ -637,7 +638,7 @@ def download(taskid, target, filename):
         return jsonize({"success": False, "message": "File does not exist"})
 
 
-def server(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, adapter='wsgiref'):
+def server(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, adapter=RESTAPI_DEFAULT_ADAPTER):
     """
     REST-JSON API server
     """
@@ -655,20 +656,24 @@ def server(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, adapter='wsg
 
     # Run RESTful API
     try:
-        if adapter == 'gevent':
+        if adapter == "gevent":
             from gevent import monkey
             monkey.patch_all()
-        elif adapter == 'eventlet':
+        elif adapter == "eventlet":
             import eventlet
             eventlet.monkey_patch()
-        logger.debug('use {0} adapter run bottle'.format(adapter))
+        logger.debug("Using adapter '%s' to run bottle" % adapter)
         run(host=host, port=port, quiet=True, debug=False, server=adapter)
     except socket.error, ex:
         if "already in use" in getSafeExString(ex):
             logger.error("Address already in use ('%s:%s')" % (host, port))
         else:
             raise
-
+    except ImportError:
+        errMsg = "Adapter '%s' is not available on this system" % adapter
+        if adapter in ("gevent", "eventlet"):
+            errMsg += " (e.g.: 'sudo apt-get install python-%s')" % adapter
+        logger.critical(errMsg)
 
 def _client(url, options=None):
     logger.debug("Calling %s" % url)
@@ -697,7 +702,7 @@ def client(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT):
         _client(addr)
     except Exception, ex:
         if not isinstance(ex, urllib2.HTTPError):
-            errMsg = "there has been a problem while connecting to the "
+            errMsg = "There has been a problem while connecting to the "
             errMsg += "REST-JSON API server at '%s' " % addr
             errMsg += "(%s)" % ex
             logger.critical(errMsg)
diff --git a/sqlmapapi.py b/sqlmapapi.py
index 0c3562aa7..e31582b53 100755
--- a/sqlmapapi.py
+++ b/sqlmapapi.py
@@ -14,6 +14,7 @@ from sqlmap import modulePath
 from lib.core.common import setPaths
 from lib.core.data import paths
 from lib.core.data import logger
+from lib.core.settings import RESTAPI_DEFAULT_ADAPTER
 from lib.core.settings import RESTAPI_DEFAULT_ADDRESS
 from lib.core.settings import RESTAPI_DEFAULT_PORT
 from lib.utils.api import client
@@ -37,7 +38,7 @@ def main():
     apiparser.add_option("-c", "--client", help="Act as a REST-JSON API client", default=RESTAPI_DEFAULT_PORT, action="store_true")
     apiparser.add_option("-H", "--host", help="Host of the REST-JSON API server", default=RESTAPI_DEFAULT_ADDRESS, action="store")
     apiparser.add_option("-p", "--port", help="Port of the the REST-JSON API server", default=RESTAPI_DEFAULT_PORT, type="int", action="store")
-    apiparser.add_option("", "--adapter", help="bottle Server adapter to use default is wsgiref, see bottle document ", default='wsgiref', action="store")
+    apiparser.add_option("--adapter", help="Server (bottle) adapter to use (default %s)" % RESTAPI_DEFAULT_ADAPTER, default=RESTAPI_DEFAULT_ADAPTER, action="store")
     (args, _) = apiparser.parse_args()
 
     # Start the client or the server