From b79d4f70f31c11ac24fee29f2fd1e9186e4b66dd Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 18 Apr 2011 14:51:48 +0000 Subject: [PATCH] cleaner solution for the problem solved with last commit --- lib/core/option.py | 5 +++-- lib/core/settings.py | 4 ++-- lib/parse/cmdline.py | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/core/option.py b/lib/core/option.py index b0005901e..9c5b4edf1 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -1203,8 +1203,9 @@ def __cleanupOptions(): if conf.data: conf.data = urldecode(conf.data) - if conf.timeSec == TIME_DEFAULT_DELAY: - conf.timeSec = int(conf.timeSec) + # to distinguish explicit usafe of --time-sec + if conf.timeSec is None: + conf.timeSec = TIME_DEFAULT_DELAY kb.adjustTimeDelay = True else: kb.adjustTimeDelay = False diff --git a/lib/core/settings.py b/lib/core/settings.py index 31001c716..409e5d11f 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -75,8 +75,8 @@ UNION_STDEV_COEFF = 7 # length of queue for candidates for time delay adjustment TIME_DELAY_CANDIDATES = 3 -# default time delay in seconds (decimal places added to distinguish explicit usage of --time-sec) -TIME_DEFAULT_DELAY = 5.0001 +# default time delay in seconds +TIME_DEFAULT_DELAY = 5 # HTTP timeout in silent mode HTTP_SILENT_TIMEOUT = 3 diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py index 28bb354f9..e7c0ca4e5 100644 --- a/lib/parse/cmdline.py +++ b/lib/parse/cmdline.py @@ -212,9 +212,9 @@ def cmdLineParser(): "(default BEUST)") techniques.add_option("--time-sec", dest="timeSec", - type="int", default=TIME_DEFAULT_DELAY, + type="int", default=None, help="Seconds to delay the DBMS response " - "(default %s)" % int(TIME_DEFAULT_DELAY)) + "(default %s)" % TIME_DEFAULT_DELAY) techniques.add_option("--union-cols", dest="uCols", help="Range of columns to test for UNION query SQL injection")