mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-02-02 20:54:13 +03:00
Minor adjustment
This commit is contained in:
parent
f67a38dba9
commit
e81168af0f
|
@ -116,7 +116,7 @@ def tableExists(tableFile, regex=None):
|
||||||
|
|
||||||
if conf.verbose in (1, 2) and not hasattr(conf, "api"):
|
if conf.verbose in (1, 2) and not hasattr(conf, "api"):
|
||||||
clearConsoleLine(True)
|
clearConsoleLine(True)
|
||||||
infoMsg = "[%s] [INFO] retrieved: %s\r\n" % (time.strftime("%X"), unsafeSQLIdentificatorNaming(table))
|
infoMsg = "[%s] [INFO] retrieved: %s\n" % (time.strftime("%X"), unsafeSQLIdentificatorNaming(table))
|
||||||
dataToStdout(infoMsg, True)
|
dataToStdout(infoMsg, True)
|
||||||
|
|
||||||
if conf.verbose in (1, 2):
|
if conf.verbose in (1, 2):
|
||||||
|
@ -224,11 +224,11 @@ def columnExists(columnFile, regex=None):
|
||||||
|
|
||||||
if conf.verbose in (1, 2) and not hasattr(conf, "api"):
|
if conf.verbose in (1, 2) and not hasattr(conf, "api"):
|
||||||
clearConsoleLine(True)
|
clearConsoleLine(True)
|
||||||
infoMsg = "[%s] [INFO] retrieved: %s\r\n" % (time.strftime("%X"), unsafeSQLIdentificatorNaming(column))
|
infoMsg = "[%s] [INFO] retrieved: %s\n" % (time.strftime("%X"), unsafeSQLIdentificatorNaming(column))
|
||||||
dataToStdout(infoMsg, True)
|
dataToStdout(infoMsg, True)
|
||||||
|
|
||||||
if conf.verbose in (1, 2):
|
if conf.verbose in (1, 2):
|
||||||
status = '%d/%d items (%d%%)' % (threadData.shared.count, threadData.shared.limit, round(100.0 * threadData.shared.count / threadData.shared.limit))
|
status = "%d/%d items (%d%%)" % (threadData.shared.count, threadData.shared.limit, round(100.0 * threadData.shared.count / threadData.shared.limit))
|
||||||
dataToStdout("\r[%s] [INFO] tried %s" % (time.strftime("%X"), status), True)
|
dataToStdout("\r[%s] [INFO] tried %s" % (time.strftime("%X"), status), True)
|
||||||
|
|
||||||
kb.locks.io.release()
|
kb.locks.io.release()
|
||||||
|
@ -257,9 +257,9 @@ def columnExists(columnFile, regex=None):
|
||||||
result = inject.checkBooleanExpression("%s" % safeStringFormat("EXISTS(SELECT %s FROM %s WHERE ROUND(%s)=ROUND(%s))", (column, table, column, column)))
|
result = inject.checkBooleanExpression("%s" % safeStringFormat("EXISTS(SELECT %s FROM %s WHERE ROUND(%s)=ROUND(%s))", (column, table, column, column)))
|
||||||
|
|
||||||
if result:
|
if result:
|
||||||
columns[column] = 'numeric'
|
columns[column] = "numeric"
|
||||||
else:
|
else:
|
||||||
columns[column] = 'non-numeric'
|
columns[column] = "non-numeric"
|
||||||
|
|
||||||
kb.data.cachedColumns[conf.db] = {conf.tbl: columns}
|
kb.data.cachedColumns[conf.db] = {conf.tbl: columns}
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,7 @@ def dnsUse(payload, expression):
|
||||||
retVal = output
|
retVal = output
|
||||||
|
|
||||||
if kb.dnsTest is not None:
|
if kb.dnsTest is not None:
|
||||||
dataToStdout("[%s] [INFO] %s: %s\r\n" % (time.strftime("%X"), "retrieved" if count > 0 else "resumed", safecharencode(output)))
|
dataToStdout("[%s] [INFO] %s: %s\n" % (time.strftime("%X"), "retrieved" if count > 0 else "resumed", safecharencode(output)))
|
||||||
|
|
||||||
if count > 0:
|
if count > 0:
|
||||||
hashDBWrite(expression, output)
|
hashDBWrite(expression, output)
|
||||||
|
|
|
@ -322,7 +322,7 @@ def unionUse(expression, unpack=True, dump=False):
|
||||||
if len(status) > width:
|
if len(status) > width:
|
||||||
status = "%s..." % status[:width - 3]
|
status = "%s..." % status[:width - 3]
|
||||||
|
|
||||||
dataToStdout("%s\r\n" % status, True)
|
dataToStdout("%s\n" % status, True)
|
||||||
|
|
||||||
runThreads(numThreads, unionThread)
|
runThreads(numThreads, unionThread)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user