sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-29 13:03:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:sqlmapproject/sqlmap

Browse Source
This commit is contained in:
Bernardo Damele 2013-02-11 18:08:04 +00:00
commit 3786541681
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/takeover/metasploit.py
View File

@ -507,6 +507,8 @@ class Metasploit:
if pwnBofCond or smbRelayCond: if pwnBofCond or smbRelayCond:
func() func()
timeout = time.time() - start_time > METASPLOIT_SESSION_TIMEOUT
if not initialized: if not initialized:
match = re.search("session ([\d]+) opened", out) match = re.search("session ([\d]+) opened", out)
@ -519,13 +521,13 @@ class Metasploit:
initialized = True initialized = True
elif time.time() - start_time > METASPLOIT_SESSION_TIMEOUT: elif timeout:
proc.kill() proc.kill()
errMsg = "timeout occurred while attempting " errMsg = "timeout occurred while attempting "
errMsg += "to open a remote session" errMsg += "to open a remote session"
raise SqlmapGenericException(errMsg) raise SqlmapGenericException(errMsg)
if conf.liveTest and time.time() - start_time > METASPLOIT_SESSION_TIMEOUT: if conf.liveTest and timeout:
if initialized: if initialized:
send_all(proc, "exit\n") send_all(proc, "exit\n")
time.sleep(2) time.sleep(2)

2
plugins/dbms/mysql/fingerprint.py
View File

@ -181,7 +181,7 @@ class Fingerprint(GenericFingerprint):
# Reference: http://bugs.mysql.com/bug.php?id=15855 # Reference: http://bugs.mysql.com/bug.php?id=15855
# Determine if it is MySQL >= 5.0.0 # Determine if it is MySQL >= 5.0.0
if inject.checkBooleanExpression("ISNULL(TIMESTAMPADD(MINUTE,[RANDNUM],[RANDNUM]))"): if inject.checkBooleanExpression("ISNULL(TIMESTAMPADD(MINUTE,[RANDNUM],0))"):
kb.data.has_information_schema = True kb.data.has_information_schema = True
Backend.setVersion(">= 5.0.0") Backend.setVersion(">= 5.0.0")
setDbms("%s 5" % DBMS.MYSQL) setDbms("%s 5" % DBMS.MYSQL)