Land rapid7#7858, Make shell_command_token time out again

wwebb-r7 · wwebb-r7 · commit 5d08e0b24e0e · 2017-01-21T13:18:37.000-06:00
diff --git a/lib/msf/core/session/provider/single_command_shell.rb b/lib/msf/core/session/provider/single_command_shell.rb
@@ -43,6 +43,8 @@ def shell_close()
   # Read data until we find the token
   #
   def shell_read_until_token(token, wanted_idx=0, timeout=10)
+    return if timeout.to_i == 0
+
     if (wanted_idx == 0)
       parts_needed = 2
     else

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ def shell_close()`
`43`	`43`	`# Read data until we find the token`
`44`	`44`	`#`
`45`	`45`	`def shell_read_until_token(token, wanted_idx=0, timeout=10)`
	`46`	`+ return if timeout.to_i == 0`
	`47`	`+`
`46`	`48`	`if (wanted_idx == 0)`
`47`	`49`	`parts_needed = 2`
`48`	`50`	`else`