minor update

This commit is contained in:
Miroslav Stampar 2012-01-13 21:01:58 +00:00
parent 23117e72ca
commit 6634c4ac20

View File

@ -48,7 +48,7 @@ def direct(query, content=True):
start = time.time() start = time.time()
if not select: if not select:
output = timeout(func=conf.dbmsConnector.execute, args=(query,), duration=conf.timeout, default=None) _ = timeout(func=conf.dbmsConnector.execute, args=(query,), duration=conf.timeout, default=None)
elif conf.hostname in kb.resumedQueries and query in kb.resumedQueries[conf.hostname] and "sqlmapoutput" not in query and "sqlmapfile" not in query: elif conf.hostname in kb.resumedQueries and query in kb.resumedQueries[conf.hostname] and "sqlmapoutput" not in query and "sqlmapfile" not in query:
try: try:
output = base64unpickle(kb.resumedQueries[conf.hostname][query][:-1]) output = base64unpickle(kb.resumedQueries[conf.hostname][query][:-1])
@ -62,9 +62,7 @@ def direct(query, content=True):
output = timeout(func=conf.dbmsConnector.select, args=(query,), duration=conf.timeout, default=None) output = timeout(func=conf.dbmsConnector.select, args=(query,), duration=conf.timeout, default=None)
threadData.lastQueryDuration = calculateDeltaSeconds(start) threadData.lastQueryDuration = calculateDeltaSeconds(start)
if isinstance(output, bool): if not select or output is None or len(output) == 0:
return output
elif output is None or len(output) == 0:
return None return None
elif content: elif content:
if conf.hostname not in kb.resumedQueries or ( conf.hostname in kb.resumedQueries and query not in kb.resumedQueries[conf.hostname] ): if conf.hostname not in kb.resumedQueries or ( conf.hostname in kb.resumedQueries and query not in kb.resumedQueries[conf.hostname] ):