From 7c06a937e57d565e1d33dd77e4d9452c3f8b1480 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Sat, 9 Feb 2013 20:21:17 +0100 Subject: [PATCH] Minor refactoring --- lib/takeover/metasploit.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py index 10bef42ab..c4ce3cf41 100644 --- a/lib/takeover/metasploit.py +++ b/lib/takeover/metasploit.py @@ -507,6 +507,8 @@ class Metasploit: if pwnBofCond or smbRelayCond: func() + timeout = time.time() - start_time > METASPLOIT_SESSION_TIMEOUT + if not initialized: match = re.search("session ([\d]+) opened", out) @@ -519,13 +521,13 @@ class Metasploit: initialized = True - elif time.time() - start_time > METASPLOIT_SESSION_TIMEOUT: + elif timeout: proc.kill() errMsg = "timeout occurred while attempting " errMsg += "to open a remote session" raise SqlmapGenericException(errMsg) - if conf.liveTest and time.time() - start_time > METASPLOIT_SESSION_TIMEOUT: + if conf.liveTest and timeout: if initialized: send_all(proc, "exit\n") time.sleep(2)