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

Skip to content

Commit b6da946

Browse files
bdamelebdamele
committed
Added one new verbose level, -v 3 now shows the full injected payload.
Fixed also -d verbose output.
1 parent 27ce4b0 commit b6da946

11 files changed

Lines changed: 35 additions & 20 deletions

File tree

‎lib/core/option.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1186,8 +1186,10 @@ def __setVerbosity():
11861186
logger.setLevel(logging.DEBUG)
11871187
elif conf.verbose == 3:
11881188
logger.setLevel(9)
1189-
elif conf.verbose >= 4:
1189+
elif conf.verbose == 4:
11901190
logger.setLevel(8)
1191+
elif conf.verbose >= 5:
1192+
logger.setLevel(7)
11911193

11921194
def __mergeOptions(inputOptions):
11931195
"""

‎lib/core/settings.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
SITE = "http://sqlmap.sourceforge.net"
2323

2424
# sqlmap logger
25-
logging.addLevelName(9, "TRAFFIC OUT")
26-
logging.addLevelName(8, "TRAFFIC IN")
25+
logging.addLevelName(9, "PAYLOAD")
26+
logging.addLevelName(8, "TRAFFIC OUT")
27+
logging.addLevelName(7, "TRAFFIC IN")
2728

2829
LOGGER = logging.getLogger("sqlmapLog")
2930
LOGGER_HANDLER = logging.StreamHandler(sys.stdout)

‎lib/parse/cmdline.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def cmdLineParser():
2828

2929
try:
3030
parser.add_option("-v", dest="verbose", type="int", default=1,
31-
help="Verbosity level: 0-5 (default 1)")
31+
help="Verbosity level: 0-6 (default 1)")
3232

3333
# Target options
3434
target = OptionGroup(parser, "Target", "At least one of these "

‎lib/request/connect.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def getPage(**kwargs):
170170

171171
requestMsg += "\n"
172172

173-
logger.log(9, requestMsg)
173+
logger.log(8, requestMsg)
174174

175175
if not kb.authHeader and req.has_header("Authorization"):
176176
kb.authHeader = req.get_header("Authorization")
@@ -276,12 +276,12 @@ def getPage(**kwargs):
276276

277277
responseMsg += "(%s - %d):\n" % (status, code)
278278

279-
if conf.verbose <= 4:
279+
if conf.verbose <= 5:
280280
responseMsg += getUnicode(responseHeaders.__str__())
281-
elif conf.verbose > 4:
281+
elif conf.verbose > 5:
282282
responseMsg += "%s\n%s\n" % (responseHeaders, page)
283283

284-
logger.log(8, responseMsg)
284+
logger.log(7, responseMsg)
285285

286286
return page, responseHeaders
287287

@@ -318,8 +318,7 @@ def queryPage(value=None, place=None, content=False, getSeqMatcher=False, silent
318318

319319
value = agent.replacePayload(value, payload)
320320

321-
debugMsg = "payload: %s" % payload
322-
logger.debug(debugMsg)
321+
logger.log(9, payload)
323322

324323
if place == "Cookie" and conf.cookieUrlencode:
325324
value = agent.removePayloadDelimiters(value, False)

‎lib/request/inject.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,9 @@ def goStacked(expression, silent=False):
399399
query = agent.prefixQuery("; %s" % expression)
400400
query = agent.postfixQuery("%s;%s" % (query, comment))
401401

402+
debugMsg = "query: %s" % query
403+
logger.debug(debugMsg)
404+
402405
payload = agent.payload(newValue=query)
403406
page, _ = Request.queryPage(payload, content=True, silent=silent)
404407

‎lib/techniques/blind/inference.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
7575
else:
7676
expressionUnescaped = unescaper.unescape(expression)
7777

78+
debugMsg = "query: %s" % expressionUnescaped
79+
logger.debug(debugMsg)
80+
7881
if length and not isinstance(length, int) and length.isdigit():
7982
length = int(length)
8083

‎lib/techniques/error/use.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ def errorUse(expression, returnPayload=False):
6464

6565
forgedQuery = safeStringFormat(query, (logic, randInt, startLimiter, expressionUnescaped, endLimiter))
6666

67+
debugMsg = "query: %s" % forgedQuery
68+
logger.debug(debugMsg)
69+
6770
payload = agent.payload(newValue=forgedQuery)
6871
result = Request.queryPage(payload, content=True)
6972
match = re.search('%s(?P<result>.*?)%s' % (ERROR_START_CHAR, ERROR_END_CHAR), result[0], re.DOTALL | re.IGNORECASE)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,9 @@ def unionUse(expression, direct=False, unescape=True, resetCounter=False, nullCh
197197
query = agent.forgeInbandQuery(expression, nullChar=nullChar)
198198
payload = agent.payload(newValue=query)
199199

200+
debugMsg = "query: %s" % query
201+
logger.debug(debugMsg)
202+
200203
# Perform the request
201204
resultPage, _ = Request.queryPage(payload, content=True)
202205
reqCount += 1

‎lib/utils/google.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def search(self, googleDork):
9999

100100
requestMsg = "HTTP request:\nGET %s" % url
101101
requestMsg += " %s" % httplib.HTTPConnection._http_vsn_str
102-
logger.log(9, requestMsg)
102+
logger.log(8, requestMsg)
103103

104104
page = conn.read()
105105
code = conn.code
@@ -114,7 +114,7 @@ def search(self, googleDork):
114114
elif conf.verbose > 4:
115115
responseMsg += "%s\n%s\n" % (responseHeaders, page)
116116

117-
logger.log(8, responseMsg)
117+
logger.log(7, responseMsg)
118118
except urllib2.HTTPError, e:
119119
try:
120120
page = e.read()

‎lib/utils/timeout.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def run(self):
2121
try:
2222
self.result = func(*args, **kwargs)
2323
except Exception, msg:
24-
logger.log(8, msg)
24+
logger.log(7, msg)
2525
self.result = default
2626

2727
thread = InterruptableThread()

0 commit comments

Comments
 (0)