Patch for an Issue #2382

This commit is contained in:
Miroslav Stampar 2017-02-06 11:14:45 +01:00
parent 664684ad8f
commit 03bbf552ef
4 changed files with 31 additions and 29 deletions

View File

@ -163,6 +163,7 @@ def _showInjections():
header = "sqlmap resumed the following injection point(s) from stored session" header = "sqlmap resumed the following injection point(s) from stored session"
if hasattr(conf, "api"): if hasattr(conf, "api"):
conf.dumper.string("", {"url": conf.url, "query": conf.parameters.get(PLACE.GET), "data": conf.parameters.get(PLACE.POST)}, content_type=CONTENT_TYPE.TARGET)
conf.dumper.string("", kb.injections, content_type=CONTENT_TYPE.TECHNIQUES) conf.dumper.string("", kb.injections, content_type=CONTENT_TYPE.TECHNIQUES)
else: else:
data = "".join(set(_formatInjection(_) for _ in kb.injections)).rstrip("\n") data = "".join(set(_formatInjection(_) for _ in kb.injections)).rstrip("\n")

View File

@ -287,31 +287,32 @@ class WEB_API:
JSP = "jsp" JSP = "jsp"
class CONTENT_TYPE: class CONTENT_TYPE:
TECHNIQUES = 0 TARGET = 0
DBMS_FINGERPRINT = 1 TECHNIQUES = 1
BANNER = 2 DBMS_FINGERPRINT = 2
CURRENT_USER = 3 BANNER = 3
CURRENT_DB = 4 CURRENT_USER = 4
HOSTNAME = 5 CURRENT_DB = 5
IS_DBA = 6 HOSTNAME = 6
USERS = 7 IS_DBA = 7
PASSWORDS = 8 USERS = 8
PRIVILEGES = 9 PASSWORDS = 9
ROLES = 10 PRIVILEGES = 10
DBS = 11 ROLES = 11
TABLES = 12 DBS = 12
COLUMNS = 13 TABLES = 13
SCHEMA = 14 COLUMNS = 14
COUNT = 15 SCHEMA = 15
DUMP_TABLE = 16 COUNT = 16
SEARCH = 17 DUMP_TABLE = 17
SQL_QUERY = 18 SEARCH = 18
COMMON_TABLES = 19 SQL_QUERY = 19
COMMON_COLUMNS = 20 COMMON_TABLES = 20
FILE_READ = 21 COMMON_COLUMNS = 21
FILE_WRITE = 22 FILE_READ = 22
OS_CMD = 23 FILE_WRITE = 23
REG_READ = 24 OS_CMD = 24
REG_READ = 25
PART_RUN_CONTENT_TYPES = { PART_RUN_CONTENT_TYPES = {
"checkDbms": CONTENT_TYPE.TECHNIQUES, "checkDbms": CONTENT_TYPE.TECHNIQUES,

View File

@ -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.2.0" VERSION = "1.1.2.1"
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)

View File

@ -21,7 +21,7 @@ c55b400b72acc43e0e59c87dd8bb8d75 extra/shellcodeexec/windows/shellcodeexec.x32.
7713aa366c983cdf1f3dbaa7383ea9e1 extra/sqlharvest/sqlharvest.py 7713aa366c983cdf1f3dbaa7383ea9e1 extra/sqlharvest/sqlharvest.py
5df358defc488bee9b40084892e3d1cb lib/controller/action.py 5df358defc488bee9b40084892e3d1cb lib/controller/action.py
699fd4757390aedb5ad17f4316d17972 lib/controller/checks.py 699fd4757390aedb5ad17f4316d17972 lib/controller/checks.py
10edc8d1057e89c145218d4c5ccaaa31 lib/controller/controller.py fa72e4d6eda241725d90738d61e7d55d lib/controller/controller.py
b3eec7f44bcc5d784d171a187b7fe8cb lib/controller/handler.py b3eec7f44bcc5d784d171a187b7fe8cb lib/controller/handler.py
310efc965c862cfbd7b0da5150a5ad36 lib/controller/__init__.py 310efc965c862cfbd7b0da5150a5ad36 lib/controller/__init__.py
19905ecb4437b94512cf21d5f1720091 lib/core/agent.py 19905ecb4437b94512cf21d5f1720091 lib/core/agent.py
@ -34,7 +34,7 @@ a8143dab9d3a27490f7d49b6b29ea530 lib/core/data.py
47eecd5499eaa15e931793e1d1ac3566 lib/core/defaults.py 47eecd5499eaa15e931793e1d1ac3566 lib/core/defaults.py
4029f6869b36eb5f796c2bcc948f4fae lib/core/dicts.py 4029f6869b36eb5f796c2bcc948f4fae lib/core/dicts.py
77edcfd3d7c5522bb64baf59ac23a047 lib/core/dump.py 77edcfd3d7c5522bb64baf59ac23a047 lib/core/dump.py
18554d2eafd721a2b92dcfd202b9a0ab lib/core/enums.py 2acf5449c71bfae4feec8da538e70116 lib/core/enums.py
9381a0c7e8bc19986299e84f4edda1a0 lib/core/exception.py 9381a0c7e8bc19986299e84f4edda1a0 lib/core/exception.py
310efc965c862cfbd7b0da5150a5ad36 lib/core/__init__.py 310efc965c862cfbd7b0da5150a5ad36 lib/core/__init__.py
9ba39bf66e9ecd469446bdbbeda906c3 lib/core/log.py 9ba39bf66e9ecd469446bdbbeda906c3 lib/core/log.py
@ -45,7 +45,7 @@ e544108e2238d756c94a240e8a1ce061 lib/core/optiondict.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
689a9339741e81a2c460fc794c978163 lib/core/settings.py dee976ba3da61ddc2a097358f0d91293 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