Multiple changes to console:

[console] Fixed bug in displaying browser info in console
[console] Added zombie IDs to console messages
[console] Added browser type to zombie info
[console] Added menu support for selecting multiple zombies (incomplete)

core/main/handlers/browserdetails.rb

@@ -279,7 +279,7 @@ module BeEF
           end
 
           # log a few info of newly hooked zombie in the console
-          print_info "New Hooked Browser [ip:#{zombie.ip}, type:#{browser_name}-#{browser_version}, os:#{os_name}], hooked domain [#{log_zombie_domain}:#{log_zombie_port.to_s}]"
+          print_info "New Hooked Browser [id:#{zombie.id}, ip:#{zombie.ip}, type:#{browser_name}-#{browser_version}, os:#{os_name}], hooked domain [#{log_zombie_domain}:#{log_zombie_port.to_s}]"
 
 
           # Call autorun modules

core/main/handlers/modules/command.rb

@@ -82,7 +82,7 @@ module BeEF
             # @note prints the event to the console
             if BeEF::Settings.console?
               name = command_module.friendlyname || kclass
-              print_info "Hooked browser #{hooked_browser.ip} has been sent instructions from command module '#{name}'"
+              print_info "Hooked browser [id:#{hooked_browser.id}, ip:#{hooked_browser.ip}] has been sent instructions from command module '#{name}'"
             end
 
             # @note flag that the command has been sent to the hooked browser

core/main/models/command.rb

@@ -65,11 +65,11 @@ module Models
       command.save
 
       # @note log that the result was returned
-      BeEF::Core::Logger.instance.register('Command', "Hooked browser #{hooked_browser.ip} has executed instructions from command module '#{command_friendly_name}'", hooked_browser_id)
+      BeEF::Core::Logger.instance.register('Command', "Hooked browser [id:#{hooked_browser.id}, ip:#{hooked_browser.ip}] has executed instructions from command module '#{command_friendly_name}'", hooked_browser_id)
 
       # @note prints the event into the console
       if BeEF::Settings.console?
-        print_info "Hooked browser #{hooked_browser.ip} has executed instructions from command module '#{command_friendly_name}'"
+        print_info "Hooked browser [id:#{hooked_browser.id}, ip:#{hooked_browser.ip}] has executed instructions from command module '#{command_friendly_name}'"
       end
     end
 

extensions/console/lib/command_dispatcher/core.rb

@@ -47,10 +47,14 @@ class Core
   end
   
   def cmd_back(*args)
-	  if (driver.current_dispatcher.name == 'Command')
-	    driver.remove_dispatcher('Command')
-	    driver.interface.clearcommand #TODO: TIDY THIS UP
-	    driver.update_prompt("(%bld%red"+driver.interface.targetip+"%clr) ["+driver.interface.targetid.to_s+"] ")
+	if (driver.current_dispatcher.name == 'Command')
+	  driver.remove_dispatcher('Command')
+	  driver.interface.clearcommand #TODO: TIDY THIS UP
+      if driver.interface.targetid.length > 1
+        driver.update_prompt("(%bld%redMultiple%clr) ["+driver.interface.targetid.join(",")+"] ")
+      else
+        driver.update_prompt("(%bld%red"+driver.interface.targetip+"%clr) ["+driver.interface.targetid.first.to_s+"] ")
+      end
     elsif (driver.current_dispatcher.name == 'Target')
       driver.remove_dispatcher('Target')
       driver.interface.cleartarget
@@ -147,11 +151,12 @@ class Core
         [
           'Id',
           'IP',
+          'Browser',
           'OS'
         ])
     
     BeEF::Core::Models::HookedBrowser.all(:lastseen.gte => (Time.new.to_i - 30)).each do |zombie|
-      tbl << [zombie.id,zombie.ip,beef_logo_to_os(BeEF::Core::Models::BrowserDetails.os_icon(zombie.session))]
+      tbl << [zombie.id,zombie.ip,BeEF::Core::Models::BrowserDetails.get(zombie.session, 'BrowserName')+"-"+BeEF::Core::Models::BrowserDetails.get(zombie.session, 'BrowserVersion'),BeEF::Core::Models::BrowserDetails.get(zombie.session, 'OsName')]
     end
     
     puts "\n"
@@ -178,11 +183,12 @@ class Core
         [
           'Id',
           'IP',
+          'Browser',
           'OS'
         ])
     
     BeEF::Core::Models::HookedBrowser.all(:lastseen.lt => (Time.new.to_i - 30)).each do |zombie|
-      tbl << [zombie.id,zombie.ip,beef_logo_to_os(BeEF::Core::Models::BrowserDetails.os_icon(zombie.session))]
+      tbl << [zombie.id,zombie.ip,BeEF::Core::Models::BrowserDetails.get(zombie.session, 'BrowserName')+"-"+BeEF::Core::Models::BrowserDetails.get(zombie.session, 'BrowserVersion'),BeEF::Core::Models::BrowserDetails.get(zombie.session, 'OsName')]
     end
     
     puts "\n"
@@ -213,23 +219,30 @@ class Core
     BeEF::Core::Models::HookedBrowser.all(:lastseen.gt => (Time.new.to_i - 30)).each do |zombie|
       onlinezombies << zombie.id
     end
-    
-    if not onlinezombies.include?(args[0].to_i)
-      print_status("Browser does not appear to be online..")
-      return false
-    end
-    
-    if not driver.interface.settarget(args[0]).nil?
+
+	targets = args[0].split(',')
+	targets.each {|t|
+        if not onlinezombies.include?(t.to_i)
+          print_status("Browser [id:"+t.to_s+"] does not appear to be online.")
+          return false
+        end
+		#print_status("Adding browser [id:"+t.to_s+"] to target list.")
+    }
+ 
+    if not driver.interface.settarget(targets).nil?
     
       if (driver.dispatcher_stack.size > 1 and
 	      driver.current_dispatcher.name != 'Core')
-
 	      driver.destack_dispatcher
-        driver.update_prompt('')
+          driver.update_prompt('')
       end
-    
+
       driver.enstack_dispatcher(Target)
-      driver.update_prompt("(%bld%red"+driver.interface.targetip+"%clr) ["+driver.interface.targetid.to_s+"] ")
+      if driver.interface.targetid.length > 1
+        driver.update_prompt("(%bld%redMultiple%clr) ["+driver.interface.targetid.join(",")+"] ")
+      else
+        driver.update_prompt("(%bld%red"+driver.interface.targetip+"%clr) ["+driver.interface.targetid.first.to_s+"] ")
+      end
     end
   end
   
@@ -287,13 +300,16 @@ class Core
     if not driver.interface.setofflinetarget(args[0]).nil?
       if (driver.dispatcher_stack.size > 1 and
 	      driver.current_dispatcher.name != 'Core')
-
 	      driver.destack_dispatcher
-        driver.update_prompt('')
+          driver.update_prompt('')
       end
     
       driver.enstack_dispatcher(Target)
-      driver.update_prompt("(%bld%red"+driver.interface.targetip+"%clr) ["+driver.interface.targetid.to_s+"] ")
+      if driver.interface.targetid.length > 1
+        driver.update_prompt("(%bld%redMultiple%clr) ["+driver.interface.targetid.join(",")+"] ")
+      else
+        driver.update_prompt("(%bld%red"+driver.interface.targetip+"%clr) ["+driver.interface.targetid.first.to_s+"] ")
+      end
     end  
     
   end
@@ -381,4 +397,4 @@ class Core
   
 end
 
-end end end end
+end end end end

extensions/console/lib/command_dispatcher/target.rb

@@ -159,7 +159,12 @@ class Target
     
     driver.enstack_dispatcher(Command) if driver.dispatched_enstacked(Command) == false
     
-    driver.update_prompt("(%bld%red"+driver.interface.targetip+"%clr) ["+driver.interface.targetid.to_s+"] / "+driver.interface.cmd['Name']+" ")
+    if driver.interface.targetid.length > 1
+      driver.update_prompt("(%bld%redMultiple%clr) ["+driver.interface.targetid.join(",")+"] / "+driver.interface.cmd['Name']+" ")
+    else
+      driver.update_prompt("(%bld%red"+driver.interface.targetip+"%clr) ["+driver.interface.targetid.first.to_s+"] / "+driver.interface.cmd['Name']+" ")
+    end
+
   end
   
   def cmd_select_help(*args)

extensions/console/lib/shellinterface.rb

@@ -336,7 +336,7 @@ class ShellInterface
 
       page_name_row = {
         'category' => 'Host',
-        'data' => encoded_date_stamp,
+        'data' => encoded_date_stamp_hash,
         'from' => 'Initialization'
       }