From 511f2a6d124cdf05de8be7ec8f0e2967a04cf875 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 4 Sep 2017 17:16:00 +0200 Subject: [PATCH] Update for #2680 --- lib/core/settings.py | 2 +- lib/utils/api.py | 8 ++++++++ txt/checksum.md5 | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 450eea4b5..9bf2068b1 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.9.1" +VERSION = "1.1.9.2" 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/lib/utils/api.py b/lib/utils/api.py index d9ed6dbf7..404aeff55 100644 --- a/lib/utils/api.py +++ b/lib/utils/api.py @@ -469,6 +469,10 @@ def option_set(taskid): logger.warning("[%s] Invalid task ID provided to option_set()" % taskid) return jsonize({"success": False, "message": "Invalid task ID"}) + if request.json is None: + logger.warning("[%s] Invalid JSON options provided to option_set()" % taskid) + return jsonize({"success": False, "message": "Invalid JSON options"}) + for option, value in request.json.items(): DataStore.tasks[taskid].set_option(option, value) @@ -486,6 +490,10 @@ def scan_start(taskid): logger.warning("[%s] Invalid task ID provided to scan_start()" % taskid) return jsonize({"success": False, "message": "Invalid task ID"}) + if request.json is None: + logger.warning("[%s] Invalid JSON options provided to scan_start()" % taskid) + return jsonize({"success": False, "message": "Invalid JSON options"}) + # Initialize sqlmap engine's options with user's provided options, if any for option, value in request.json.items(): DataStore.tasks[taskid].set_option(option, value) diff --git a/txt/checksum.md5 b/txt/checksum.md5 index ffb24bb72..350dcf877 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -46,7 +46,7 @@ c5f09788ee8ff9c9d12a052986875bc6 lib/core/option.py d8e9250f3775119df07e9070eddccd16 lib/core/replication.py 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py -5b2ab1550ddae49f5f4473db28b48a1c lib/core/settings.py +5c4f3ca6d7e34e0c004c45cef1019e4a lib/core/settings.py d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py 4a6ecdd8a6e44bb4737bd9bc7f9b5743 lib/core/target.py @@ -98,7 +98,7 @@ d3da4c7ceaf57c4687a052d58722f6bb lib/techniques/dns/use.py 310efc965c862cfbd7b0da5150a5ad36 lib/techniques/union/__init__.py d71e48e6fd08f75cc612bf8b260994ce lib/techniques/union/test.py db3090ff9a740ba096ba676fcf44ebfc lib/techniques/union/use.py -720e899d5097d701d258bdc30eb8aa51 lib/utils/api.py +431a0bb6b25cdabd881ca182f3a2dc9d lib/utils/api.py 7d10ba0851da8ee9cd3c140dcd18798e lib/utils/brute.py c08d2487a53a1db8170178ebcf87c864 lib/utils/crawler.py ba12c69a90061aa14d848b8396e79191 lib/utils/deps.py