mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2026-01-23 06:39:02 +00:00
more update
This commit is contained in:
@@ -26,6 +26,7 @@ from lib.core.agent import agent
|
||||
from lib.core.data import conf
|
||||
from lib.core.data import kb
|
||||
from lib.core.settings import SQL_STATEMENTS
|
||||
from lib.utils.timeout import timeout
|
||||
|
||||
def direct(query, content=True):
|
||||
output = None
|
||||
@@ -42,9 +43,9 @@ def direct(query, content=True):
|
||||
break
|
||||
|
||||
if select:
|
||||
output = conf.dbmsConnector.select(query)
|
||||
output = timeout(func=conf.dbmsConnector.select, args = query, duration=conf.timeout, default=None)
|
||||
else:
|
||||
output = conf.dbmsConnector.execute(query)
|
||||
output = timeout(func=conf.dbmsConnector.execute, args = query, duration=conf.timeout, default=None)
|
||||
|
||||
if output is None or len(output) == 0:
|
||||
return None
|
||||
|
||||
@@ -7,14 +7,12 @@ def timeout(func, args=(), kwargs={}, duration=1, default=None):
|
||||
def __init__(self):
|
||||
threading.Thread.__init__(self)
|
||||
self.exceeded = False
|
||||
self.exceptionMsg = None
|
||||
self.result = None
|
||||
|
||||
def run(self):
|
||||
try:
|
||||
self.result = func(*args, **kwargs)
|
||||
except Exception, msg:
|
||||
self.exceptionMsg = msg
|
||||
except:
|
||||
self.result = default
|
||||
|
||||
thread = InterruptableThread()
|
||||
|
||||
Reference in New Issue
Block a user