Land rapid7#2095, go_pro fix for Kali

Author: wvu

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

@@ -34,7 +34,7 @@ class Core
 
 	# Session command options
 	@@sessions_opts = Rex::Parser::Arguments.new(
-		"-c" => [ true,  "Run a command on the session given with -i, or all" ],
+		"-c" => [ true,  "Run a command on the session given with -i, or all"],
 		"-h" => [ false, "Help banner"                                    ],
 		"-i" => [ true,  "Interact with the supplied session ID"          ],
 		"-l" => [ false, "List all active sessions"                       ],
@@ -43,23 +43,23 @@ class Core
 		"-d" => [ true,  "Detach an interactive session"                  ],
 		"-k" => [ true,  "Terminate session"                              ],
 		"-K" => [ false, "Terminate all sessions"                         ],
-		"-s" => [ true,  "Run a script on the session given with -i, or all"  ],
+		"-s" => [ true,  "Run a script on the session given with -i, or all"],
 		"-r" => [ false, "Reset the ring buffer for the session given with -i, or all"],
 		"-u" => [ true,  "Upgrade a win32 shell to a meterpreter session" ])
 
 	@@jobs_opts = Rex::Parser::Arguments.new(
 		"-h" => [ false, "Help banner."                                   ],
 		"-k" => [ true,  "Terminate the specified job name."              ],
 		"-K" => [ false, "Terminate all running jobs."                    ],
-		"-i" => [ true, "Lists detailed information about a running job." ],
+		"-i" => [ true,  "Lists detailed information about a running job."],
 		"-l" => [ false, "List all running jobs."                         ],
 		"-v" => [ false, "Print more detailed info.  Use with -i and -l"  ])
 
 	@@threads_opts = Rex::Parser::Arguments.new(
 		"-h" => [ false, "Help banner."                                   ],
 		"-k" => [ true,  "Terminate the specified thread ID."             ],
 		"-K" => [ false, "Terminate all non-critical threads."            ],
-		"-i" => [ true, "Lists detailed information about a thread."      ],
+		"-i" => [ true,  "Lists detailed information about a thread."     ],
 		"-l" => [ false, "List all background threads."                   ],
 		"-v" => [ false, "Print more detailed info.  Use with -i and -l"  ])
 
@@ -81,10 +81,10 @@ class Core
 		"-i" => [ false, "Ignore case."                                   ],
 		"-m" => [ true,  "Stop after arg matches."                        ],
 		"-v" => [ false, "Invert match."                                  ],
-		"-A" => [ true, "Show arg lines of output After a match."         ],
-		"-B" => [ true, "Show arg lines of output Before a match."        ],
-		"-s" => [ true, "Skip arg lines of output before attempting match."],
-		"-k" => [ true, "Keep (include) arg lines at start of output."    ],
+		"-A" => [ true,  "Show arg lines of output After a match."        ],
+		"-B" => [ true,  "Show arg lines of output Before a match."       ],
+		"-s" => [ true,  "Skip arg lines of output before attempting match."],
+		"-k" => [ true,  "Keep (include) arg lines at start of output."   ],
 		"-c" => [ false, "Only print a count of matching lines."          ])
 
 	@@search_opts = Rex::Parser::Arguments.new(
@@ -388,9 +388,9 @@ def cmd_banner(*args)
 				"Large pentest? List, sort, group, tag and search your hosts and services\nin Metasploit Pro -- type 'go_pro' to launch it now.",
 				"Frustrated with proxy pivoting? Upgrade to layer-2 VPN pivoting with\nMetasploit Pro -- type 'go_pro' to launch it now.",
 				"Save your shells from AV! Upgrade to advanced AV evasion using dynamic\nexe templates with Metasploit Pro -- type 'go_pro' to launch it now.",
-				"Easy phishing: Set up email templates, landing pages and listeners\nin Metasploit Pro’s wizard -- type 'go_pro' to launch it now.",
+				"Easy phishing: Set up email templates, landing pages and listeners\nin Metasploit Pro's wizard -- type 'go_pro' to launch it now.",
 				"Using notepad to track pentests? Have Metasploit Pro report on hosts,\nservices, sessions and evidence -- type 'go_pro' to launch it now.",
-				"Tired of typing ‘set RHOSTS’? Click & pwn with Metasploit Pro\n-- type 'go_pro' to launch it now."
+				"Tired of typing 'set RHOSTS'? Click & pwn with Metasploit Pro\n-- type 'go_pro' to launch it now."
 			]
 			banner << content.sample # Ruby 1.9-ism!
 			banner << "\n\n"
@@ -1455,10 +1455,10 @@ def cmd_search(*args)
 
 	end
 
-  # Prints table of modules matching the search_string.
-  #
-  # @param (see Msf::DBManager#search_modules)
-  # @return [void]
+	# Prints table of modules matching the search_string.
+	#
+	# @param (see Msf::DBManager#search_modules)
+	# @return [void]
 	def search_modules_sql(search_string)
 		tbl = generate_module_table("Matching Modules")
 		framework.db.search_modules(search_string).each do |o|
@@ -2889,8 +2889,7 @@ def cmd_go_pro(*args)
 			end
 		end
 		unless is_apt
-			print_line " This command is only available on deb package installations,"
-			print_line " such as Kali Linux."
+			print_warning "This command is only available on deb package installations, such as Kali Linux."
 			return false
 		end
 		unless is_metasploit_debian_package_installed
@@ -2932,15 +2931,18 @@ def launch_metasploit_browser
 			return false
 		end
 		svc_log = File.expand_path(File.join(msfbase_dir, ".." , "engine", "prosvc_stdout.log"))
-		return unless ::File.readable_real? svc_log
+		unless ::File.readable_real? svc_log
+			print_error "Unable to access log file: #{svc_log}"
+			return false
+		end
 		really_started = false
 		# This method is a little lame but it's a short enough file that it
 		# shouldn't really matter that we open and close it a few times.
 		timeout = 0
 		until really_started
 			select(nil,nil,nil,3)
 			log_data = ::File.open(svc_log, "rb") {|f| f.read f.stat.size}
-			really_started = log_data =~ /^\[\*\] Ready/ # This is webserver ready
+			really_started = log_data =~ /Ready/ # This is webserver ready
 			if really_started
 				print_line
 				print_good "Metasploit Community / Pro is up and running, connecting now."
@@ -2953,7 +2955,7 @@ def launch_metasploit_browser
 				print_line
 				print_warning "For some reason, Community / Pro didn't start in a timely fashion."
 				print_warning "You might want to restart the Metasploit services by typing"
-				print_warning "'service metasploit restart' . Sorry it didn't work out."
+				print_warning "'service metasploit restart'. Sorry it didn't work out."
 				return false
 			else
 				print "."