minor cosmetics for partial inband retrieval

This commit is contained in:
Miroslav Stampar 2011-04-13 11:25:42 +00:00
parent c193b896be
commit f5f2201bbc
2 changed files with 11 additions and 6 deletions

View File

@ -287,17 +287,20 @@ REFLECTED_VALUE_MARKER = '__REFLECTED_VALUE__'
# Regular expression used for marking non-alphanum characters # Regular expression used for marking non-alphanum characters
REFLECTED_NON_ALPHA_NUM_REGEX = r'[^<>\\r\\n]+?' REFLECTED_NON_ALPHA_NUM_REGEX = r'[^<>\\r\\n]+?'
# chars which can be used as a failsafe values in case of too long URL encoding value # Chars which can be used as a failsafe values in case of too long URL encoding value
URLENCODE_FAILSAFE_CHARS = '()|,' URLENCODE_FAILSAFE_CHARS = '()|,'
# maximum length of urlencoded value after which failsafe procedure takes away # Maximum length of urlencoded value after which failsafe procedure takes away
URLENCODE_CHAR_LIMIT = 2000 URLENCODE_CHAR_LIMIT = 2000
# default schema for Microsoft SQL Server DBMS # Default schema for Microsoft SQL Server DBMS
DEFAULT_MSSQL_SCHEMA = 'dbo' DEFAULT_MSSQL_SCHEMA = 'dbo'
# display hash attack info every mod number of items # Display hash attack info every mod number of items
HASH_MOD_ITEM_DISPLAY = 1117 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

View File

@ -31,6 +31,7 @@ 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
@ -252,7 +253,8 @@ def unionUse(expression, unpack=True, dump=False):
if conf.verbose == 1: if conf.verbose == 1:
length = stopLimit - startLimit length = stopLimit - startLimit
count = num - startLimit + 1 count = num - startLimit + 1
status = '%d/%d entries (%d%s)' % (count, length, round(100.0*count/length), '%') 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, '.'))
dataToStdout("\r[%s] [INFO] retrieved: %s" % (time.strftime("%X"), status), True) dataToStdout("\r[%s] [INFO] retrieved: %s" % (time.strftime("%X"), status), True)
if conf.verbose == 1: if conf.verbose == 1: