From e2fb16c98c3110728ea357aa38714e2d7a44b942 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 6 Mar 2017 12:05:58 +0100 Subject: [PATCH] Fixes #2425 --- lib/core/settings.py | 2 +- plugins/generic/entries.py | 9 ++++++++- txt/checksum.md5 | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index a577596a6..4829b48c3 100755 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS # sqlmap version (...) -VERSION = "1.1.3.2" +VERSION = "1.1.3.3" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" 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) diff --git a/plugins/generic/entries.py b/plugins/generic/entries.py index b3a4a1cd1..dda0d83ea 100644 --- a/plugins/generic/entries.py +++ b/plugins/generic/entries.py @@ -192,7 +192,14 @@ class Entries: query = agent.whereQuery(query) if not entries and query: - entries = inject.getValue(query, blind=False, time=False, dump=True) + try: + entries = inject.getValue(query, blind=False, time=False, dump=True) + except KeyboardInterrupt: + entries = None + kb.dumpKeyboardInterrupt = True + clearConsoleLine() + warnMsg = "Ctrl+C detected in dumping phase" + logger.warn(warnMsg) if not isNoneValue(entries): if isinstance(entries, basestring): diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 164ac2680..cd3699687 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -45,7 +45,7 @@ a8143dab9d3a27490f7d49b6b29ea530 lib/core/data.py d8e9250f3775119df07e9070eddccd16 lib/core/replication.py 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py -b06afbda30432e1193289822da317b58 lib/core/settings.py +4e5e1afc5d5ec92b15f7b4ab1a408dd6 lib/core/settings.py d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py afd0636d2e93c23f4f0a5c9b6023ea17 lib/core/target.py @@ -203,7 +203,7 @@ a7f4d3a194f52fbb4fb4488be41273b1 plugins/dbms/sybase/enumeration.py 1f46f2eac95cfdc3fa150ec5b0500eba plugins/generic/connector.py a8f9d0516509e9e4226516ab4f13036a plugins/generic/custom.py 3b54fd65feb9f70c551d315e82653384 plugins/generic/databases.py -45c32855126546a0d9936ecdc943ab3f plugins/generic/entries.py +f7387352380136ac05c0bc3decb85638 plugins/generic/entries.py 55802d1d5d65938414c77ccc27731cab plugins/generic/enumeration.py bc32b21a3ab5421b5307ff7317256229 plugins/generic/filesystem.py feca57a968c528a2fe3ccafbc83a17f8 plugins/generic/fingerprint.py