infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #5500 by checking for session.respond_to?(:response_timeout)

bug/bundler_fix
HD Moore 2015-06-06 17:07:03 -05:00
parent d4ddc53856
commit bd36908383
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/msf/ui/console/command_dispatcher/core.rb
View File

@ -1778,8 +1778,8 @@ class Core
end
ensure
# Restore timeout for each session
if session.respond_to?(:response_timeout)
session.response_timeout = last_known_timeout if last_known_timeout
if session.respond_to?(:response_timeout) && last_known_timeout
session.response_timeout = last_known_timeout
end
end
# If the session isn't a meterpreter or shell type, it
@ -1801,7 +1801,9 @@ class Core
begin
session.kill
ensure
session.response_timeout = last_known_timeout if last_known_timeout
if session.respond_to?(:response_timeout) && last_known_timeout
session.response_timeout = last_known_timeout
end
end
else
print_error("Invalid session identifier: #{sess_id}")
@ -1819,7 +1821,9 @@ class Core
begin
session.kill
ensure
session.response_timeout = last_known_timeout if last_known_timeout
if session.respond_to?(:response_timeout) && last_known_timeout
session.response_timeout = last_known_timeout
end
end
end
end
@ -1837,7 +1841,9 @@ class Core
begin
session.detach
ensure
session.response_timeout = last_known_timeout if last_known_timeout
if session.respond_to?(:response_timeout) && last_known_timeout
session.response_timeout = last_known_timeout
end
end
end
end
@ -1855,7 +1861,9 @@ class Core
self.active_session = nil
driver.input.reset_tab_completion if driver.input.supports_readline
ensure
session.response_timeout = last_known_timeout if last_known_timeout
if session.respond_to?(:response_timeout) && last_known_timeout
session.response_timeout = last_known_timeout
end
end
end
when 'scriptall'
@ -1893,7 +1901,9 @@ class Core
end
end
ensure
session.response_timeout = last_known_timeout if last_known_timeout
if session.respond_to?(:response_timeout) && last_known_timeout
session.response_timeout = last_known_timeout
end
end
else
print_error("Invalid session identifier: #{sess_id}")
@ -1919,7 +1929,9 @@ class Core
next
end
ensure
session.response_timeout = last_known_timeout if last_known_timeout
if session.respond_to?(:response_timeout) && last_known_timeout
session.response_timeout = last_known_timeout
end
end
end