sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-06-08 23:23:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

implemented retrieved items info for partial union too

Browse Source
This commit is contained in:
Miroslav Stampar 2011-04-13 14:33:15 +00:00
parent f5f2201bbc
commit d06ae9cd47
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/core/settings.py
View File

@ -301,6 +301,3 @@ HASH_MOD_ITEM_DISPLAY = 1117
# Maximum integer value # Maximum integer value
MAX_INT = sys.maxint MAX_INT = sys.maxint
# Length of entry info for partial inband technique
PARTIAL_INBAND_STATUS_LENGTH = 10

11
lib/techniques/inband/union/use.py
View File

@ -17,6 +17,7 @@ from lib.core.common import clearConsoleLine
from lib.core.common import dataToStdout from lib.core.common import dataToStdout
from lib.core.common import extractRegexResult from lib.core.common import extractRegexResult
from lib.core.common import filterStringValue from lib.core.common import filterStringValue
from lib.core.common import getConsoleWidth
from lib.core.common import getUnicode from lib.core.common import getUnicode
from lib.core.common import initTechnique from lib.core.common import initTechnique
from lib.core.common import isNumPosStrValue from lib.core.common import isNumPosStrValue
@ -31,7 +32,6 @@ from lib.core.enums import DBMS
from lib.core.enums import PAYLOAD from lib.core.enums import PAYLOAD
from lib.core.exception import sqlmapSyntaxException from lib.core.exception import sqlmapSyntaxException
from lib.core.settings import FROM_TABLE from lib.core.settings import FROM_TABLE
from lib.core.settings import PARTIAL_INBAND_STATUS_LENGTH
from lib.core.unescaper import unescaper from lib.core.unescaper import unescaper
from lib.request.connect import Connect as Request from lib.request.connect import Connect as Request
from lib.utils.resume import resume from lib.utils.resume import resume
@ -124,6 +124,7 @@ def unionUse(expression, unpack=True, dump=False):
test = True test = True
value = "" value = ""
reqCount = 0 reqCount = 0
width = getConsoleWidth()
start = time.time() start = time.time()
_, _, _, _, _, expressionFieldsList, expressionFields, _ = agent.getFields(origExpr) _, _, _, _, _, expressionFieldsList, expressionFields, _ = agent.getFields(origExpr)
@ -251,11 +252,11 @@ def unionUse(expression, unpack=True, dump=False):
value += output value += output
if conf.verbose == 1: if conf.verbose == 1:
length = stopLimit - startLimit
count = num - startLimit + 1
items = output.replace(kb.misc.start, "").replace(kb.misc.stop, "").split(kb.misc.delimiter) items = output.replace(kb.misc.start, "").replace(kb.misc.stop, "").split(kb.misc.delimiter)
status = '%d/%d entries (%d%s) [%s...]' % (count, length, round(100.0*count/length), '%', ",".join(items)[:PARTIAL_INBAND_STATUS_LENGTH].ljust(PARTIAL_INBAND_STATUS_LENGTH, '.')) status = "[%s] [INFO] retrieved: %s\n" % (time.strftime("%X"), ",".join(map(lambda x: "\"%s\"" % x, items)))
dataToStdout("\r[%s] [INFO] retrieved: %s" % (time.strftime("%X"), status), True) if len(status) > width:
status = "%s..." % status[:width - 3]
dataToStdout(status, True)
if conf.verbose == 1: if conf.verbose == 1:
clearConsoleLine(True) clearConsoleLine(True)

1
plugins/generic/enumeration.py
View File

@ -16,7 +16,6 @@ from lib.core.common import Backend
from lib.core.common import dataToStdout from lib.core.common import dataToStdout
from lib.core.common import getRange from lib.core.common import getRange
from lib.core.common import getCompiledRegex from lib.core.common import getCompiledRegex
from lib.core.common import getConsoleWidth
from lib.core.common import getFileItems from lib.core.common import getFileItems
from lib.core.common import Backend from lib.core.common import Backend
from lib.core.common import getUnicode from lib.core.common import getUnicode