Fix various typos

g0tmi1k · g0tmi1k · commit 772bec23a1e1 · 2017-07-21T07:40:08.000-07:00
diff --git a/modules/auxiliary/admin/vmware/tag_vm.rb b/modules/auxiliary/admin/vmware/tag_vm.rb
@@ -40,23 +40,23 @@ def run
         result = vim_log_event_vm(vm_ref, datastore['MSG'])
         case result
         when :noresponse
-          print_error "Recieved no Response"
+          print_error "Received no response"
         when :expired
           print_error "The login session appears to have expired"
         when :error
-          print_error "An error occured"
+          print_error "An error occurred"
         else
-          print_good "User Event logged"
+          print_good "User Event Logged"
         end
       when :noresponse
-        print_error "Recieved no Response"
+        print_error "Received no response"
       when :expired
         print_error "The login session appears to have expired"
       when :error
         print_error @vim_soap_error
       end
     else
-      print_error "Login Failure on #{datastore['RHOST']}"
+      print_error "Login failure on #{datastore['RHOST']}"
       return
     end
   end
diff --git a/modules/auxiliary/gather/avtech744_dvr_accounts.rb b/modules/auxiliary/gather/avtech744_dvr_accounts.rb
@@ -39,7 +39,7 @@ def run
     end
 
     unless res.code == 200
-      fail_with(Failure::Unknown, 'An unknown error occured')
+      fail_with(Failure::Unknown, 'An unknown error occurred')
     end
 
     raw_collection = extract_data(res.body)
diff --git a/modules/auxiliary/gather/shodan_honeyscore.rb b/modules/auxiliary/gather/shodan_honeyscore.rb
@@ -86,7 +86,7 @@ def run
     elsif score == 1.0
       print_good("#{tgt} is definitely a honeypot")
     else  # We shouldn't ever get here as the previous checks should catch an unexpected response
-      print_error('An unexpected error occured.')
+      print_error('An unexpected error occurred.')
       return
     end
     print_score(score)
diff --git a/modules/auxiliary/scanner/oracle/oracle_hashdump.rb b/modules/auxiliary/scanner/oracle/oracle_hashdump.rb
@@ -32,7 +32,7 @@ def run_host(ip)
     ver = prepare_exec(query)
 
     if ver.nil?
-      print_error("An Error has occured, check your OPTIONS")
+      print_error("An Error has occurred, check your OPTIONS")
       return
     end
 
@@ -84,7 +84,7 @@ def run_host(ip)
 
       end
     rescue => e
-      print_error("An error occured. The supplied credentials may not have proper privs")
+      print_error("An error occurred. The supplied credentials may not have proper privs")
       return
     end
     print_status("Hash table :\n #{tbl}")
@@ -131,7 +131,4 @@ def report_hashes(table, is_11g, ip, service)
     print_good("Hash Table has been saved")
   end
 
-
-
-
 end
diff --git a/modules/auxiliary/scanner/postgres/postgres_hashdump.rb b/modules/auxiliary/scanner/postgres/postgres_hashdump.rb
@@ -53,7 +53,7 @@ def run_host(ip)
     # Error handling routine here, borrowed heavily from todb
     case res.keys[0]
     when :conn_error
-      print_error("A Connection Error occured")
+      print_error("A Connection Error Occurred")
       return
     when :sql_error
       # We know the credentials worked but something else went wrong
@@ -135,6 +135,4 @@ def run_host(ip)
 
   end
 
-
-
 end
diff --git a/modules/auxiliary/scanner/postgres/postgres_schemadump.rb b/modules/auxiliary/scanner/postgres/postgres_schemadump.rb
@@ -92,7 +92,7 @@ def smart_query(query_string)
     # Error handling routine here, borrowed heavily from todb
     case res.keys[0]
     when :conn_error
-      print_error("A Connection Error occured")
+      print_error("A Connection Error Occurred")
       return
     when :sql_error
       case res[:sql_error]
diff --git a/modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb b/modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb
@@ -40,11 +40,11 @@ def run_host(ip)
       esx_roles = vim_get_roles
       case esx_roles
       when :noresponse
-        print_error "Recieved no Response from #{ip}"
+        print_error "Received no response from #{ip}"
       when :expired
         print_error "The login session appears to have expired on #{ip}"
       when :error
-        print_error "An error occured while trying to enumerate the roles on #{ip}"
+        print_error "An error occurred while trying to enumerate the roles on #{ip}"
       else
         esx_roles.each do |role|
           role_map[role['roleId']] = {
@@ -58,11 +58,11 @@ def run_host(ip)
       esx_permissions = vim_get_all_permissions
       case esx_permissions
       when :noresponse
-        print_error "Recieved no Response from #{ip}"
+        print_error "Received no response from #{ip}"
       when :expired
         print_error "The login session appears to have expired on #{ip}"
       when :error
-        print_error "An error occured while trying to enumerate the permissions on #{ip}"
+        print_error "An error occurred while trying to enumerate the permissions on #{ip}"
       else
         tmp_perms = Rex::Text::Table.new(
             'Header'  => "Permissions for VMWare #{ip}",
@@ -80,7 +80,7 @@ def run_host(ip)
         vprint_good("Permission info stored in: #{f}")
       end
     else
-      print_error "Login Failure on #{ip}"
+      print_error "Login failure on #{ip}"
       return
     end
   end
diff --git a/modules/auxiliary/scanner/vmware/vmware_enum_sessions.rb b/modules/auxiliary/scanner/vmware/vmware_enum_sessions.rb
@@ -37,11 +37,11 @@ def run_host(ip)
       vim_sessions = vim_get_session_list
       case vim_sessions
       when :noresponse
-        print_error "Connection Error - Recieved No Reply from #{ip}"
+        print_error "Connection error - Received no reply from #{ip}"
       when :error
-        print_error "An error has occured"
+        print_error "An error has occurred"
       when :expired
-        print_error "The Session is no longer Authenticated"
+        print_error "The session is no longer authenticated"
       else
         output = ''
         vim_sessions.each do |vsession|
@@ -66,7 +66,7 @@ def run_host(ip)
         end
       end
     else
-      print_error "Login Failure on #{ip}"
+      print_error "Login failure on #{ip}"
       return
     end
   end
diff --git a/modules/auxiliary/scanner/vmware/vmware_enum_users.rb b/modules/auxiliary/scanner/vmware/vmware_enum_users.rb
@@ -50,11 +50,11 @@ def run_host(ip)
       unless user_list.nil?
         case user_list
         when :noresponse
-          print_error "Recieved no Response from #{ip}"
+          print_error "Received no response from #{ip}"
         when :expired
           print_error "The login session appears to have expired on #{ip}"
         when :error
-          print_error "An error occured while trying to enumerate the users for #{domain} on #{ip}"
+          print_error "An error occurred while trying to enumerate the users for #{domain} on #{ip}"
         else
           user_list.each do |obj|
             if obj['group'] == 'true'
@@ -74,11 +74,11 @@ def run_host(ip)
       esx_domains = vim_get_domains
       case esx_domains
       when :noresponse
-        print_error "Recieved no Response from #{ip}"
+        print_error "Received no response from #{ip}"
       when :expired
         print_error "The login session appears to have expired on #{ip}"
       when :error
-        print_error "An error occured while trying to enumerate the domains on #{ip}"
+        print_error "An error occurred while trying to enumerate the domains on #{ip}"
       else
         # Enumerate Domain Users and Groups
         esx_domains.each do |domain|
@@ -99,11 +99,11 @@ def run_host(ip)
           when nil
             next
           when :noresponse
-            print_error "Recieved no Response from #{ip}"
+            print_error "Received no response from #{ip}"
           when :expired
             print_error "The login session appears to have expired on #{ip}"
           when :error
-            print_error "An error occured while trying to enumerate the users for #{domain} on #{ip}"
+            print_error "An error occurred while trying to enumerate the users for #{domain} on #{ip}"
           else
             user_list.each do |obj|
               if obj['group'] == 'true'
@@ -123,7 +123,7 @@ def run_host(ip)
         end
       end
     else
-      print_error "Login Failure on #{ip}"
+      print_error "Login failure on #{ip}"
       return
     end
   end
diff --git a/modules/exploits/linux/http/linksys_wrt110_cmd_exec.rb b/modules/exploits/linux/http/linksys_wrt110_cmd_exec.rb
@@ -55,7 +55,7 @@ def check
         'uri' => '/HNAP1/'
       })
     rescue ::Rex::ConnectionError
-      vprint_error("A connection error has occured")
+      vprint_error("A connection error has occurred")
       return Exploit::CheckCode::Unknown
     end
 
diff --git a/modules/exploits/linux/http/tr064_ntpserver_cmdinject.rb b/modules/exploits/linux/http/tr064_ntpserver_cmdinject.rb
@@ -111,7 +111,7 @@ def check
         'uri' => '/globe'
       })
     rescue ::Rex::ConnectionError
-      vprint_error("#{peer} - A connection error has occured")
+      vprint_error("#{peer} - A connection error has occurred")
       return Exploit::CheckCode::Unknown
     end
 
diff --git a/modules/exploits/linux/http/trendmicro_sps_exec.rb b/modules/exploits/linux/http/trendmicro_sps_exec.rb
@@ -164,11 +164,11 @@ def login
   def exploit
     opts = login
     if opts
-      print_good("Successfully logged in.")
+      print_good("Successfully logged in")
       print_status("Exploiting...")
       execute_cmdstager(opts=opts)
     else
-      print_error("An error occured while loggin in.")
+      print_error("An error occurred while logged in")
     end
   end
 end
diff --git a/modules/exploits/linux/pop3/cyrus_pop3d_popsubfolders.rb b/modules/exploits/linux/pop3/cyrus_pop3d_popsubfolders.rb
@@ -13,7 +13,7 @@ def initialize(info = {})
       'Name'           => 'Cyrus IMAPD pop3d popsubfolders USER Buffer Overflow',
       'Description'    => %q{
           This exploit takes advantage of a stack based overflow.  Once the stack
-        corruption has occured it is possible to overwrite a pointer which is
+        corruption has occurred it is possible to overwrite a pointer which is
         later used for a memcpy. This gives us a write anything anywhere condition
         similar to a format string vulnerability.
 
diff --git a/modules/exploits/multi/php/php_unserialize_zval_cookie.rb b/modules/exploits/multi/php/php_unserialize_zval_cookie.rb
@@ -398,12 +398,12 @@ def brute_exploit(target_addrs)
       print_status("Received a response: #{res.code} #{res.message}")
 
       if (res.code != 200)
-        print_error("The server returned a non-200 response, indicating that the exploit failed.")
+        print_error("The server returned a non-200 response, indicating that the exploit failed")
         failed = true
       end
 
       if (not failed and (res.body and res.body.length > 0))
-        print_error("The server returned a real response, indicating that the exploit failed.")
+        print_error("The server returned a real response, indicating that the exploit failed")
         failed = true
       end
 
diff --git a/modules/exploits/windows/http/sap_configservlet_exec_noauth.rb b/modules/exploits/windows/http/sap_configservlet_exec_noauth.rb
@@ -63,7 +63,7 @@ def check
     begin
       res = send_evil_request(uri, "whoami", 20)
     rescue
-      vprint_error("An error has occured while sending the malicious request")
+      vprint_error("An error has occurred while sending the malicious request")
       return Exploit::CheckCode::Unknown
     end
     if !res
@@ -118,20 +118,20 @@ def send_evil_request(uri, cmd, timeout)
         }, timeout)
 
       if !res
-        fail_with(Failure::Unknown, "#{rhost}:#{rport} - Exploit failed.")
+        fail_with(Failure::Unknown, "#{rhost}:#{rport} - Exploit failed")
       end
 
       if res.code != 200
         vprint_error("#{rhost}:#{rport} - Output: #{res.body}")
-        fail_with(Failure::UnexpectedReply, "#{rhost}:#{rport} - Exploit failed.")
+        fail_with(Failure::UnexpectedReply, "#{rhost}:#{rport} - Exploit failed")
       end
     rescue ::Rex::ConnectionError
-      fail_with(Failure::Unreachable, "#{rhost}:#{rport} - Failed to connect to the server.")
+      fail_with(Failure::Unreachable, "#{rhost}:#{rport} - Failed to connect to the server")
     end
 
     if not res.body.include?("Process created")
       vprint_error("#{rhost}:#{rport} - Output: #{res.body}")
-      fail_with(Failure::PayloadFailed, "#{rhost}:#{rport} - Exploit failed.")
+      fail_with(Failure::PayloadFailed, "#{rhost}:#{rport} - Exploit failed")
     end
     return res
   end
diff --git a/modules/exploits/windows/ssh/sysax_ssh_username.rb b/modules/exploits/windows/ssh/sysax_ssh_username.rb
@@ -79,7 +79,7 @@ def check
         return Exploit::CheckCode::Appears
       end
     rescue
-      vprint_error("An error has occured while trying to read a response from target")
+      vprint_error("An error has occurred while trying to read a response from target")
       return Exploit::CheckCode::Unknown
     end
 
diff --git a/modules/exploits/windows/winrm/winrm_script_exec.rb b/modules/exploits/windows/winrm/winrm_script_exec.rb
@@ -185,7 +185,7 @@ def powershell2?
       return false
     end
     unless streams.class == Hash
-      print_error "Recieved error while running check"
+      print_error "Received error while running check"
       return false
     end
     if streams['stderr'].include? "not recognized"
@@ -196,7 +196,7 @@ def powershell2?
       next unless line.start_with? "Version"
       major_version = line.match(/\d(?=\.)/)[0]
       if major_version == "1"
-        print_error "The target is running an older version of powershell"
+        print_error "The target is running an older version of Powershell"
         return false
       end
     end
@@ -215,7 +215,7 @@ def powershell2?
       return false
     end
     unless streams.class == Hash
-      print_error "Recieved error while running check"
+      print_error "Received error while running check"
       return false
     end
     streams = winrm_run_cmd("#{@invoke_powershell} Get-ExecutionPolicy")
diff --git a/modules/post/windows/gather/credentials/meebo.rb b/modules/post/windows/gather/credentials/meebo.rb
@@ -94,7 +94,7 @@ def parse_txt(file)
       end
 
     rescue ::Exception => e
-      print_error("An error has occured: #{e.to_s}")
+      print_error("An error has occurred: #{e.to_s}")
     end
   end
 
diff --git a/modules/post/windows/gather/credentials/trillian.rb b/modules/post/windows/gather/credentials/trillian.rb
@@ -82,7 +82,7 @@ def get_ini(file)
       print_good("Trillian Instant Messenger user credentials saved in: #{path}")
 
     rescue ::Exception => e
-      print_error("An error has occured: #{e.to_s}")
+      print_error("An error has occurred: #{e.to_s}")
     end
   end
 
diff --git a/modules/post/windows/gather/screen_spy.rb b/modules/post/windows/gather/screen_spy.rb
@@ -137,7 +137,7 @@ def migrate_explorer
           print_good("Migration successful")
           return p['pid']
         rescue
-          print_bad("Migration failed.")
+          print_bad("Migration failed")
           return nil
         end
       end
diff --git a/modules/post/windows/wlan/wlan_bss_list.rb b/modules/post/windows/wlan/wlan_bss_list.rb
@@ -168,7 +168,7 @@ def wlan_get_networks(wlan_handle,guid)
           bss['physical'] = "Unknown Association Type"
       end
 
-      #Get the Recieved Signal Strength Indicator
+      #Get the Received Signal Strength Indicator
       pointer = (pointer + 4)
       rssi = @host_process.memory.read(pointer,4)
       rssi = getle_signed_int(rssi)
