diff --git a/lib/controller/controller.py b/lib/controller/controller.py index af7a17a8f..d8e42f06c 100644 --- a/lib/controller/controller.py +++ b/lib/controller/controller.py @@ -491,7 +491,7 @@ def start(): elif parameter in conf.testParameter: pass - elif parameter == conf.rParam: + elif parameter in conf.rParam: testSqlInj = False infoMsg = "skipping randomizing %s parameter '%s'" % (paramType, parameter) diff --git a/lib/core/option.py b/lib/core/option.py index 44c43dc95..a9be0a9a3 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -41,6 +41,7 @@ from lib.core.common import findPageForms from lib.core.common import getConsoleWidth from lib.core.common import getFileItems from lib.core.common import getFileType +from lib.core.common import intersect from lib.core.common import normalizePath from lib.core.common import ntToPosixSlashes from lib.core.common import openFile @@ -2416,8 +2417,14 @@ def _basicOptionValidation(): raise SqlmapSyntaxException(errMsg) if conf.skip and conf.testParameter: - errMsg = "option '--skip' is incompatible with option '-p'" - raise SqlmapSyntaxException(errMsg) + if intersect(conf.skip, conf.testParameter): + errMsg = "option '--skip' is incompatible with option '-p'" + raise SqlmapSyntaxException(errMsg) + + if conf.rParam and conf.testParameter: + if intersect(conf.rParam, conf.testParameter): + errMsg = "option '--randomize' is incompatible with option '-p'" + raise SqlmapSyntaxException(errMsg) if conf.mobile and conf.agent: errMsg = "switch '--mobile' is incompatible with option '--user-agent'" diff --git a/lib/core/settings.py b/lib/core/settings.py index f8b7e25d2..a5ea57c99 100644 --- 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.3.2.2" +VERSION = "1.3.2.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/txt/checksum.md5 b/txt/checksum.md5 index a8034d0aa..68e54b9dd 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -25,7 +25,7 @@ fb6be55d21a70765e35549af2484f762 extra/wafdetectify/__init__.py aec73042403993076f478da48066a79e extra/wafdetectify/wafdetectify.py ec782b9cdb8d857a80b6ecf0f32db7f4 lib/controller/action.py d392dbccdb59ac36530c1182675a2609 lib/controller/checks.py -b37a93767459162b30798bd9732a12a3 lib/controller/controller.py +8581acf56b8fb0def50af3707490a834 lib/controller/controller.py c1da277517c7ec4c23e953a51b51e203 lib/controller/handler.py fb6be55d21a70765e35549af2484f762 lib/controller/__init__.py ed7874be0d2d3802f3d20184f2b280d5 lib/core/agent.py @@ -43,14 +43,14 @@ e1f7758f433202c50426efde5eb96768 lib/core/datatype.py fb6be55d21a70765e35549af2484f762 lib/core/__init__.py 18c896b157b03af716542e5fe9233ef9 lib/core/log.py fa9f24e88c81a6cef52da3dd5e637010 lib/core/optiondict.py -835fdd61d9845ca4a7b27c7cf3ddac8e lib/core/option.py +7099592edf923ff3b88ecc4a98b52762 lib/core/option.py fe370021c6bc99daf44b2bfc0d1effb3 lib/core/patch.py 4b12aa67fbf6c973d12e54cf9cb54ea0 lib/core/profiling.py 5e2c16a8e2daee22dd545df13386e7a3 lib/core/readlineng.py 7d8a22c582ad201f65b73225e4456170 lib/core/replication.py 3179d34f371e0295dd4604568fb30bcd lib/core/revision.py d6269c55789f78cf707e09a0f5b45443 lib/core/session.py -91f30b68b964780114a4fedc25df0a2e lib/core/settings.py +474088278707e6d5c01de7515e433c05 lib/core/settings.py 4483b4a5b601d8f1c4281071dff21ecc lib/core/shell.py 10fd19b0716ed261e6d04f311f6f527c lib/core/subprocessng.py 9c7b5c6397fb3da33e7a4d7876d159c6 lib/core/target.py