Support for killing sessions from the UI and killing all running jobs with jobs -a

git-svn-id: file:///home/svn/framework3/trunk@4361 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/core/session.rb

@@ -185,6 +185,14 @@ module Session
 		false
 	end
 
+
+	#
+	# Allow the user to terminate this session
+	#
+	def kill
+		framework.sessions.deregister(self)
+	end
+
 	#
 	# The framework instance that created this session.
 	# 

lib/msf/core/session/interactive.rb

@@ -56,6 +56,16 @@ module Interactive
 	def run_cmd(cmd)
 	end
 	
+	#
+	# Terminate the session
+	#
+	def kill
+		self.interacting = false if self.interactive?
+		self.reset_ui
+		self.cleanup
+		super()
+	end
+	
 	#
 	# Closes rstream.
 	#

lib/msf/ui/console/command_dispatcher/core.rb

@@ -25,11 +25,13 @@ class Core
 		"-h" => [ false, "Help banner."                                   ],
 		"-l" => [ false, "List all active sessions."                      ],
 		"-v" => [ false, "List verbose fields."                           ],
-		"-q" => [ false, "Quiet mode."                                    ])
+		"-q" => [ false, "Quiet mode."                                    ],
+		"-k" => [  true, "Terminate session."                             ])
 
 	@@jobs_opts = Rex::Parser::Arguments.new(
 		"-h" => [ false, "Help banner."                                   ],
 		"-k" => [ true,  "Terminate the specified job name."              ],
+		"-a" => [ false, "Terminate all running jobs."                    ],
 		"-l" => [ false, "List all running jobs."                         ])
 	
 	@@persist_opts = Rex::Parser::Arguments.new(
@@ -226,8 +228,13 @@ class Core
 				# Terminate the supplied job name
 				when "-k"
 					print_line("Stopping job: #{val}...")
-
 					framework.jobs.stop_job(val)
+					
+				when "-a"
+					print_line("Stopping all jobs...")
+					framework.jobs.each_key do |i|
+						framework.jobs.stop_job(i)
+					end
 
 				when "-h"
 					print(
@@ -600,6 +607,10 @@ class Core
 				when "-l"
 					method = 'list'
 
+				when "-k"
+					method = 'kill'
+					sid = val
+					
 				# Display help banner
 				when "-h"
 					print(
@@ -612,6 +623,12 @@ class Core
 	
 		# Now, perform the actual method
 		case method
+		
+			when 'kill'
+				if ((session = framework.sessions.get(sid)))
+					session.kill
+				end
+			
 			when 'interact'
 				if ((session = framework.sessions.get(sid)))
 					if (session.interactive?)

lib/rex/ui/interactive.rb

@@ -71,11 +71,9 @@ module Interactive
 	#
 	# Whether or not the session is currently being interacted with
 	#
-	attr_reader   :interacting
+	attr_accessor   :interacting
 
 protected
-
-	attr_writer   :interacting # :nodoc:
 	
 	#
 	# The original suspend proc.