Added command to launch msfproxy from console

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

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

@@ -48,6 +48,7 @@ module Wmap
 				"wmap_reports" => "List all reported results",
 				"wmap_sql" => "Query the database",
 				"wmap_run"  => "Automatically test/exploit everything",
+				"wmap_proxy" => "Run mitm proxy",
 			}
 		end
 
@@ -1232,6 +1233,30 @@ module Wmap
 		# EOM
 		end
 		
+		#
+		# Run msf proxy
+		#
+
+		def cmd_wmap_proxy(*args)			
+			cmdline = "ruby " + File.join(Msf::Config.install_root,"tools", "msfproxy.rb")
+			defaultopts = ""
+		
+			proxyopts = defaultopts + " " + args.join(" ")
+			
+			tpid = 0
+			proxypid = Process.fork
+			if proxypid.nil?
+				exec cmdline + " " + proxyopts
+			else
+				tpid = proxypid
+				Process.detach(proxypid)
+			end
+			print_status("Cmd: #{cmdline}")
+			print_status("Options: #{proxyopts}")
+			print_status("Executing proxy. pid: #{tpid}")
+			print_status("Done.")
+		end
+	
 
 		#
 		# Load website structure into a tree

tools/msfproxy.rb

@@ -42,7 +42,7 @@ $tssl = false
 $printcon = false
 $printreq = false
 $printres = false
-$printstatus = true
+$printstatus = false
 
 $modulepname =  nil
 
@@ -322,7 +322,7 @@ $args = Rex::Parser::Arguments.new(
 	"-a" => [ false, "Print requests: Default false" ],
 	"-b" => [ false, "Print responses: Default false" ],
 	"-c" => [ false, "Print connection message: Default false"],
-	"-u" => [ false, "Print status: Default true"],
+	"-u" => [ false, "Print status: Default false"],
 	"-v" => [ false, "Print requests and responses: Default false" ],	
 	"-i" => [ true,  "Listening IP address. Default 0.0.0.0" ],
 	"-p" => [ true,  "Listening proxy port. Default 8080"    ],