mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-22 17:46:37 +03:00
Minor update for #1282
This commit is contained in:
parent
f285bc7459
commit
c124086021
|
@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
|
||||||
from lib.core.enums import OS
|
from lib.core.enums import OS
|
||||||
|
|
||||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||||
VERSION = "1.1.4.2"
|
VERSION = "1.1.4.3"
|
||||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
||||||
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
||||||
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
||||||
|
|
|
@ -50,6 +50,7 @@ from thirdparty.bottle.bottle import post
|
||||||
from thirdparty.bottle.bottle import request
|
from thirdparty.bottle.bottle import request
|
||||||
from thirdparty.bottle.bottle import response
|
from thirdparty.bottle.bottle import response
|
||||||
from thirdparty.bottle.bottle import run
|
from thirdparty.bottle.bottle import run
|
||||||
|
from thirdparty.bottle.bottle import server_names
|
||||||
|
|
||||||
|
|
||||||
# global settings
|
# global settings
|
||||||
|
@ -682,9 +683,12 @@ def server(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, adapter=REST
|
||||||
else:
|
else:
|
||||||
raise
|
raise
|
||||||
except ImportError:
|
except ImportError:
|
||||||
errMsg = "Adapter '%s' is not available on this system" % adapter
|
if adapter.lower() not in server_names:
|
||||||
if adapter in ("gevent", "eventlet"):
|
errMsg = "Adapter '%s' is unknown. " % adapter
|
||||||
errMsg += " (e.g.: 'sudo apt-get install python-%s')" % adapter
|
errMsg += "(Note: available adapters '%s')" % ', '.join(sorted(server_names.keys()))
|
||||||
|
else:
|
||||||
|
errMsg = "Server '%s' is not installed on this system. " % adapter
|
||||||
|
errMsg += "(Note: you can try to install it with 'sudo apt-get install python-%s' or 'sudo pip install %s')" % (adapter, adapter)
|
||||||
logger.critical(errMsg)
|
logger.critical(errMsg)
|
||||||
|
|
||||||
def _client(url, options=None):
|
def _client(url, options=None):
|
||||||
|
|
|
@ -45,7 +45,7 @@ a8143dab9d3a27490f7d49b6b29ea530 lib/core/data.py
|
||||||
d8e9250f3775119df07e9070eddccd16 lib/core/replication.py
|
d8e9250f3775119df07e9070eddccd16 lib/core/replication.py
|
||||||
785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py
|
785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py
|
||||||
40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py
|
40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py
|
||||||
45a1b62030dc2d0b476002199a18bacf lib/core/settings.py
|
5313f20ce6dcf42d289f7b66441f8ee6 lib/core/settings.py
|
||||||
d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py
|
d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py
|
||||||
2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py
|
2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py
|
||||||
afd0636d2e93c23f4f0a5c9b6023ea17 lib/core/target.py
|
afd0636d2e93c23f4f0a5c9b6023ea17 lib/core/target.py
|
||||||
|
@ -99,7 +99,7 @@ d3da4c7ceaf57c4687a052d58722f6bb lib/techniques/dns/use.py
|
||||||
310efc965c862cfbd7b0da5150a5ad36 lib/techniques/union/__init__.py
|
310efc965c862cfbd7b0da5150a5ad36 lib/techniques/union/__init__.py
|
||||||
19fd73af7a278fd72b46a5a60f5bdd09 lib/techniques/union/test.py
|
19fd73af7a278fd72b46a5a60f5bdd09 lib/techniques/union/test.py
|
||||||
8cd5655c60a638caa30ca1220896aeda lib/techniques/union/use.py
|
8cd5655c60a638caa30ca1220896aeda lib/techniques/union/use.py
|
||||||
96ac1b27dd4ec1edd36acd3aa142ceb5 lib/utils/api.py
|
4f7da214999bfed8ebaa23defe9e0734 lib/utils/api.py
|
||||||
29e32d59fcdd63c5a13498af1f367c8c lib/utils/crawler.py
|
29e32d59fcdd63c5a13498af1f367c8c lib/utils/crawler.py
|
||||||
ba12c69a90061aa14d848b8396e79191 lib/utils/deps.py
|
ba12c69a90061aa14d848b8396e79191 lib/utils/deps.py
|
||||||
3b9fd519164e0bf275d5fd361c3f11ff lib/utils/getch.py
|
3b9fd519164e0bf275d5fd361c3f11ff lib/utils/getch.py
|
||||||
|
|
Loading…
Reference in New Issue
Block a user