Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d12b65d

Browse files
stamparmstamparm
committed
Fixes #2624 
1 parent 38c70d9 commit d12b65d

5 files changed

Lines changed: 23 additions & 8 deletions

File tree

‎lib/controller/checks.py‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
from lib.core.exception import SqlmapConnectionException
6464
from lib.core.exception import SqlmapNoneDataException
6565
from lib.core.exception import SqlmapSilentQuitException
66+
from lib.core.exception import SqlmapSkipTargetException
6667
from lib.core.exception import SqlmapUserQuitException
6768
from lib.core.settings import CANDIDATE_SENTENCE_MIN_LENGTH
6869
from lib.core.settings import CHECK_INTERNET_ADDRESS
@@ -744,10 +745,17 @@ def genCmpPayload():
744745
warnMsg = "user aborted during detection phase"
745746
logger.warn(warnMsg)
746747

747-
msg = "how do you want to proceed? [(S)kip current test/(e)nd detection phase/(n)ext parameter/(c)hange verbosity/(q)uit]"
748-
choice = readInput(msg, default='S', checkBatch=False).upper()
748+
if conf.multipleTargets:
749+
msg = "how do you want to proceed? [ne(X)t target/(s)kip current test/(e)nd detection phase/(n)ext parameter/(c)hange verbosity/(q)uit]"
750+
choice = readInput(msg, default='T', checkBatch=False).upper()
751+
else:
752+
msg = "how do you want to proceed? [(S)kip current test/(e)nd detection phase/(n)ext parameter/(c)hange verbosity/(q)uit]"
753+
choice = readInput(msg, default='S', checkBatch=False).upper()
749754

750-
if choice == 'C':
755+
if choice == 'X':
756+
if conf.multipleTargets:
757+
raise SqlmapSkipTargetException
758+
elif choice == 'C':
751759
choice = None
752760
while not ((choice or "").isdigit() and 0 <= int(choice) <= 6):
753761
if choice:

‎lib/controller/controller.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
from lib.core.exception import SqlmapNoneDataException
5555
from lib.core.exception import SqlmapNotVulnerableException
5656
from lib.core.exception import SqlmapSilentQuitException
57+
from lib.core.exception import SqlmapSkipTargetException
5758
from lib.core.exception import SqlmapValueException
5859
from lib.core.exception import SqlmapUserQuitException
5960
from lib.core.settings import ASP_NET_CONTROL_REGEX
@@ -666,6 +667,9 @@ def start():
666667
else:
667668
raise
668669

670+
except SqlmapSkipTargetException:
671+
pass
672+
669673
except SqlmapUserQuitException:
670674
raise
671675

‎lib/core/exception.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ class SqlmapUserQuitException(SqlmapBaseException):
5050
class SqlmapShellQuitException(SqlmapBaseException):
5151
pass
5252

53+
class SqlmapSkipTargetException(SqlmapBaseException):
54+
pass
55+
5356
class SqlmapSyntaxException(SqlmapBaseException):
5457
pass
5558

‎lib/core/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from lib.core.enums import OS
2020

2121
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
22-
VERSION = "1.1.7.21"
22+
VERSION = "1.1.7.22"
2323
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2424
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2525
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

‎txt/checksum.md5‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ c55b400b72acc43e0e59c87dd8bb8d75 extra/shellcodeexec/windows/shellcodeexec.x32.
2121
310efc965c862cfbd7b0da5150a5ad36 extra/sqlharvest/__init__.py
2222
7713aa366c983cdf1f3dbaa7383ea9e1 extra/sqlharvest/sqlharvest.py
2323
7afe836fd97271ccba67b4c0da2482ff lib/controller/action.py
24-
c9733bcd06caea8262240262e4c6a06a lib/controller/checks.py
25-
130d1c16708668b8d89605b6b5b38bf5 lib/controller/controller.py
24+
e711f036d9c561cdb04aec62f872e170 lib/controller/checks.py
25+
a66093c734c7f94ecdf94d882c2d8b89 lib/controller/controller.py
2626
a97df93b552ee4e4ba3692eae870de7c lib/controller/handler.py
2727
310efc965c862cfbd7b0da5150a5ad36 lib/controller/__init__.py
2828
49b4e3b75322bf5f95b1568633bc7914 lib/core/agent.py
@@ -36,7 +36,7 @@ a8143dab9d3a27490f7d49b6b29ea530 lib/core/data.py
3636
7309cf449b009723d1a4655fcf1a96d7 lib/core/dicts.py
3737
65b9187de3d8c9c28ddab53ef2b399bc lib/core/dump.py
3838
b9ff4e622c416116bee6024c0f050349 lib/core/enums.py
39-
9381a0c7e8bc19986299e84f4edda1a0 lib/core/exception.py
39+
a44d7a4cc6c9a67a72d6af2f25f4ddac lib/core/exception.py
4040
310efc965c862cfbd7b0da5150a5ad36 lib/core/__init__.py
4141
9ba39bf66e9ecd469446bdbbeda906c3 lib/core/log.py
4242
5a34a1be62eab520cacc197b5eacda39 lib/core/optiondict.py
@@ -46,7 +46,7 @@ f664e993a4e4d0f8b3153778bec49794 lib/core/option.py
4646
d8e9250f3775119df07e9070eddccd16 lib/core/replication.py
4747
785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py
4848
40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py
49-
590db8b7ada687074d1eed39a9a1c628 lib/core/settings.py
49+
abde6355f9cd07ba43b7f35b3068eb1f lib/core/settings.py
5050
d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py
5151
2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py
5252
080dad10c8350a66fd5321935b53fa70 lib/core/target.py

0 commit comments

Comments
 (0)