Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4a96401

Browse files
stamparmstamparm
committed
more concise
1 parent 6b81eef commit 4a96401

9 files changed

Lines changed: 24 additions & 21 deletions

File tree

‎lib/controller/checks.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from lib.core.common import randomStr
3333
from lib.core.common import readInput
3434
from lib.core.common import showStaticWords
35-
from lib.core.common import singleTimeLogMessage
35+
from lib.core.common import singleTimeWarnMessage
3636
from lib.core.common import trimAlphaNum
3737
from lib.core.common import wasLastRequestDBMSError
3838
from lib.core.common import wasLastRequestHTTPError
@@ -399,7 +399,7 @@ def genCmpPayload():
399399
warnMsg = "using unescaped version of the test "
400400
warnMsg += "because of zero knowledge of the "
401401
warnMsg += "back-end DBMS"
402-
singleTimeLogMessage(warnMsg, logging.WARN, title)
402+
singleTimeWarnMessage(warnMsg, logging.WARN, title)
403403

404404
# Test for UNION query SQL injection
405405
reqPayload, vector = unionTest(comment, place, parameter, value, prefix, suffix)

‎lib/core/common.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,10 @@ def filePathToString(filePath):
640640

641641
return strRepl
642642

643-
def singleTimeLogMessage(message, level=logging.WARN, flag=None):
643+
def singleTimeWarnMessage(message):
644+
singleTimeLogMessage(message, logging.WARN)
645+
646+
def singleTimeLogMessage(message, level=logging.INFO, flag=None):
644647
if flag is None:
645648
flag = hash(message)
646649

@@ -664,7 +667,7 @@ def dataToStdout(data, forceOutput=False):
664667
warnMsg += "replacement with '?' character. Please, find "
665668
warnMsg += "proper character representation inside "
666669
warnMsg += "coresponding output files. "
667-
singleTimeLogMessage(warnMsg)
670+
singleTimeWarnMessage(warnMsg)
668671

669672
sys.stdout.write(output)
670673
else:

‎lib/request/basic.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from lib.core.common import isWindowsDriveLetterPath
2424
from lib.core.common import posixToNtSlashes
2525
from lib.core.common import sanitizeAsciiString
26-
from lib.core.common import singleTimeLogMessage
26+
from lib.core.common import singleTimeWarnMessage
2727
from lib.core.data import conf
2828
from lib.core.data import kb
2929
from lib.core.data import logger
@@ -140,7 +140,7 @@ def checkCharEncoding(encoding):
140140
except LookupError:
141141
warnMsg = "unknown web page charset '%s'. " % encoding
142142
warnMsg += "Please report by e-mail to %s." % ML
143-
singleTimeLogMessage(warnMsg, logging.WARN, encoding)
143+
singleTimeWarnMessage(warnMsg, logging.WARN, encoding)
144144
encoding = None
145145

146146
return encoding
@@ -153,7 +153,7 @@ def getHeuristicCharEncoding(page):
153153
retVal = detect(page)['encoding']
154154

155155
infoMsg = "heuristics detected web page charset '%s'" % retVal
156-
singleTimeLogMessage(infoMsg, logging.INFO, retVal)
156+
singleTimeWarnMessage(infoMsg, logging.INFO, retVal)
157157

158158
return retVal
159159

‎lib/request/connect.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from lib.core.common import parseTargetUrl
3030
from lib.core.common import readInput
3131
from lib.core.common import removeReflectiveValues
32-
from lib.core.common import singleTimeLogMessage
32+
from lib.core.common import singleTimeWarnMessage
3333
from lib.core.common import stdev
3434
from lib.core.common import urlEncodeCookieValues
3535
from lib.core.common import wasLastRequestDelayed
@@ -413,16 +413,16 @@ def getPage(**kwargs):
413413
warnMsg += "without flag T in --technique option "
414414
warnMsg += "(e.g. --flush-session --technique=BEUS) or try to "
415415
warnMsg += "lower the --time-sec value (e.g. --time-sec=2)"
416-
singleTimeLogMessage(warnMsg)
416+
singleTimeWarnMessage(warnMsg)
417417
elif kb.originalPage is None:
418418
warnMsg = "if the problem persists please try to rerun "
419419
warnMsg += "with the --random-agent switch turned on "
420420
warnMsg += "and/or try to use proxy switches (--ignore-proxy, --proxy,...)"
421-
singleTimeLogMessage(warnMsg)
421+
singleTimeWarnMessage(warnMsg)
422422
elif conf.threads > 1:
423423
warnMsg = "if the problem persists please try to lower "
424424
warnMsg += "the number of used threads (--threads)"
425-
singleTimeLogMessage(warnMsg)
425+
singleTimeWarnMessage(warnMsg)
426426

427427
time.sleep(1)
428428

‎lib/techniques/blind/inference.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from lib.core.common import readInput
2626
from lib.core.common import replaceNewlineTabs
2727
from lib.core.common import safeStringFormat
28-
from lib.core.common import singleTimeLogMessage
28+
from lib.core.common import singleTimeWarnMessage
2929
from lib.core.common import unhandledExceptionMessage
3030
from lib.core.data import conf
3131
from lib.core.data import kb
@@ -116,7 +116,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
116116
if conf.threads == 1 and not timeBasedCompare:
117117
warnMsg = "running in a single-thread mode. please consider usage of "
118118
warnMsg += "--threads option to declare higher number of threads"
119-
singleTimeLogMessage(warnMsg)
119+
singleTimeWarnMessage(warnMsg)
120120

121121
if conf.verbose in (1, 2) and not showEta:
122122
if isinstance(length, int) and conf.threads > 1:

‎lib/techniques/inband/union/test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from lib.core.common import pushValue
2525
from lib.core.common import randomStr
2626
from lib.core.common import removeReflectiveValues
27-
from lib.core.common import singleTimeLogMessage
27+
from lib.core.common import singleTimeWarnMessage
2828
from lib.core.common import stdev
2929
from lib.core.common import wasLastRequestDBMSError
3030
from lib.core.data import conf
@@ -214,7 +214,7 @@ def __unionTestByCharBruteforce(comment, place, parameter, value, prefix, suffix
214214
warnMsg = "please consider usage of --union-char option "
215215
warnMsg += "(e.g. --union-char=1) and/or try to force "
216216
warnMsg += "back-end DBMS (e.g. --dbms=mysql) to make it work"
217-
singleTimeLogMessage(warnMsg)
217+
singleTimeWarnMessage(warnMsg)
218218

219219
return validPayload, vector
220220

‎lib/techniques/inband/union/use.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from lib.core.common import listToStrValue
2626
from lib.core.common import parseUnionPage
2727
from lib.core.common import removeReflectiveValues
28-
from lib.core.common import singleTimeLogMessage
28+
from lib.core.common import singleTimeWarnMessage
2929
from lib.core.convert import safecharencode
3030
from lib.core.data import conf
3131
from lib.core.data import kb
@@ -94,7 +94,7 @@ def __oneShotUnionUse(expression, unpack=True):
9494
warnMsg = "if the problem persists with 'None' values please try to use "
9595
warnMsg += "hidden switch --no-cast (fixing problems with some collation "
9696
warnMsg += "issues)"
97-
singleTimeLogMessage(warnMsg)
97+
singleTimeWarnMessage(warnMsg)
9898

9999
return output
100100

‎plugins/dbms/mysql/filesystem.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
See the file 'doc/COPYING' for copying permission
88
"""
99

10-
from lib.core.common import singleTimeLogMessage
10+
from lib.core.common import singleTimeWarnMessage
1111
from lib.core.common import randomStr
1212
from lib.core.data import conf
1313
from lib.core.data import kb
@@ -97,7 +97,7 @@ def unionWriteFile(self, wFile, dFile, fileType, confirm=True):
9797

9898
warnMsg = "expect junk characters inside the "
9999
warnMsg += "file as a leftover from UNION query"
100-
singleTimeLogMessage(warnMsg)
100+
singleTimeWarnMessage(warnMsg)
101101

102102
def stackedWriteFile(self, wFile, dFile, fileType, confirm=True):
103103
debugMsg = "creating a support table to write the hexadecimal "

‎plugins/generic/enumeration.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from lib.core.common import readInput
3131
from lib.core.common import safeStringFormat
3232
from lib.core.common import safeSQLIdentificatorNaming
33-
from lib.core.common import singleTimeLogMessage
33+
from lib.core.common import singleTimeWarnMessage
3434
from lib.core.common import strToHex
3535
from lib.core.common import unArrayizeValue
3636
from lib.core.common import unsafeSQLIdentificatorNaming
@@ -1410,7 +1410,7 @@ def __pivotDumpTable(self, table, colList, count=None, blind=True):
14101410
if (i + 1) < conf.limitStart:
14111411
warnMsg = "skipping first %d pivot " % conf.limitStart
14121412
warnMsg += "point values"
1413-
singleTimeLogMessage(warnMsg)
1413+
singleTimeWarnMessage(warnMsg)
14141414
break
14151415
elif (i + 1) > conf.limitStop:
14161416
breakRetrieval = True

0 commit comments

Comments
 (0)