From f6bf331b8f6be4dc41e875bea7837aa649ec0467 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 27 Oct 2020 14:57:12 +0100 Subject: [PATCH] Minor cosmetics --- lib/core/settings.py | 2 +- lib/request/inject.py | 2 +- lib/techniques/blind/inference.py | 2 +- lib/techniques/dns/use.py | 2 +- lib/techniques/error/use.py | 2 +- lib/techniques/union/use.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 062e19548..57124f112 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.4.10.20" +VERSION = "1.4.10.21" 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/request/inject.py b/lib/request/inject.py index 8c58beaed..b8fbfe6f2 100644 --- a/lib/request/inject.py +++ b/lib/request/inject.py @@ -126,7 +126,7 @@ def _goInference(payload, expression, charsetType=None, firstChar=None, lastChar kb.inferenceMode = False if not kb.bruteMode: - debugMsg = "performed %d queries in %.2f seconds" % (count, calculateDeltaSeconds(start)) + debugMsg = "performed %d quer%s in %.2f seconds" % (count, 'y' if count == 1 else "ies", calculateDeltaSeconds(start)) logger.debug(debugMsg) return value diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py index 557fea724..3d6362d4a 100644 --- a/lib/techniques/blind/inference.py +++ b/lib/techniques/blind/inference.py @@ -719,7 +719,7 @@ def queryOutputLength(expression, payload): lengthExprUnescaped = agent.forgeQueryOutputLength(expression) count, length = bisection(payload, lengthExprUnescaped, charsetType=CHARSET_TYPE.DIGITS) - debugMsg = "performed %d queries in %.2f seconds" % (count, calculateDeltaSeconds(start)) + debugMsg = "performed %d quer%s in %.2f seconds" % (count, 'y' if count == 1 else "ies", calculateDeltaSeconds(start)) logger.debug(debugMsg) if length == " ": diff --git a/lib/techniques/dns/use.py b/lib/techniques/dns/use.py index 611ad75d5..60f0d04cd 100644 --- a/lib/techniques/dns/use.py +++ b/lib/techniques/dns/use.py @@ -108,7 +108,7 @@ def dnsUse(payload, expression): hashDBWrite(expression, output) if not kb.bruteMode: - debugMsg = "performed %d queries in %.2f seconds" % (count, calculateDeltaSeconds(start)) + debugMsg = "performed %d quer%s in %.2f seconds" % (count, 'y' if count == 1 else "ies", calculateDeltaSeconds(start)) logger.debug(debugMsg) elif conf.dnsDomain: diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py index ce63ba203..310c35d3e 100644 --- a/lib/techniques/error/use.py +++ b/lib/techniques/error/use.py @@ -462,7 +462,7 @@ def errorUse(expression, dump=False): duration = calculateDeltaSeconds(start) if not kb.bruteMode: - debugMsg = "performed %d queries in %.2f seconds" % (kb.counters[getTechnique()], duration) + debugMsg = "performed %d quer%s in %.2f seconds" % (kb.counters[getTechnique()], 'y' if kb.counters[getTechnique()] == 1 else "ies", duration) logger.debug(debugMsg) return value diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py index b21b760b8..8c2991bde 100644 --- a/lib/techniques/union/use.py +++ b/lib/techniques/union/use.py @@ -440,7 +440,7 @@ def unionUse(expression, unpack=True, dump=False): duration = calculateDeltaSeconds(start) if not kb.bruteMode: - debugMsg = "performed %d queries in %.2f seconds" % (kb.counters[PAYLOAD.TECHNIQUE.UNION], duration) + debugMsg = "performed %d quer%s in %.2f seconds" % (kb.counters[PAYLOAD.TECHNIQUE.UNION], 'y' if kb.counters[PAYLOAD.TECHNIQUE.UNION] == 1 else "ies", duration) logger.debug(debugMsg) return value