Backport miscellaneous fixes to my modules

modules/auxiliary/gather/nis_bootparamd_domain.rb

@@ -84,7 +84,7 @@ def run
     end
 
     unless res
-      fail_with(Failure::Unknown, 'No response from server')
+      fail_with(Failure::Unreachable, 'No response from server')
     end
 
     bootparams = begin

modules/exploits/linux/http/cisco_ucs_cloupia_script_rce.rb

@@ -7,8 +7,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
   Rank = ExcellentRanking
 
-  include Msf::Exploit::Remote::HttpClient
   prepend Msf::Exploit::Remote::AutoCheck
+  include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::CmdStager
 
   def initialize(info = {})
@@ -109,7 +109,7 @@ def check
     )
 
     unless res
-      return CheckCode::Unknown('Target did not respond to check request.')
+      return CheckCode::Unknown('Target did not respond to check.')
     end
 
     unless res.code == 200 && res.body.include?('Cisco UCS Director')
@@ -173,7 +173,7 @@ def create_exports_dir(*path_parts)
     )
 
     unless res
-      fail_with(Failure::Unknown, "Target did not respond to #{__method__}")
+      fail_with(Failure::Unreachable, "Target did not respond to #{__method__}")
     end
 
     # It will always return 200, even on error
@@ -213,7 +213,7 @@ def leak_api_key(*path_parts)
     )
 
     unless res
-      fail_with(Failure::Unknown, "Target did not respond to #{__method__}")
+      fail_with(Failure::Unreachable, "Target did not respond to #{__method__}")
     end
 
     # It will always return 200, even on error
@@ -257,7 +257,7 @@ def execute_command(cmd, _opts = {})
     )
 
     unless res
-      fail_with(Failure::Unknown, "Target did not respond to #{__method__}")
+      fail_with(Failure::Unreachable, "Target did not respond to #{__method__}")
     end
 
     # It will always return 200, even on error

modules/exploits/linux/http/f5_bigip_tmui_rce.rb

@@ -103,7 +103,7 @@ def check
     )
 
     unless res
-      return CheckCode::Unknown('Target did not respond to check request.')
+      return CheckCode::Unknown('Target did not respond to check.')
     end
 
     unless res.code == 200 && /BIG-IP release (?<version>[\d.]+)/ =~ res.body

modules/exploits/linux/http/netsweeper_webadmin_unixlogin.rb

@@ -7,8 +7,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
   Rank = ExcellentRanking
 
-  include Msf::Exploit::Remote::HttpClient
   prepend Msf::Exploit::Remote::AutoCheck
+  include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
     super(
@@ -74,7 +74,7 @@ def check
     )
 
     unless res
-      return CheckCode::Unknown('Target did not respond to check request.')
+      return CheckCode::Unknown('Target did not respond to check.')
     end
 
     unless res.code == 200

modules/exploits/linux/http/nexus_repo_manager_el_injection.rb

@@ -7,8 +7,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
   Rank = ExcellentRanking
 
-  include Msf::Exploit::Remote::HttpClient
   prepend Msf::Exploit::Remote::AutoCheck
+  include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::CmdStager
 
   def initialize(info = {})
@@ -79,7 +79,7 @@ def check
     )
 
     unless res
-      return CheckCode::Unknown('Target did not respond to check request.')
+      return CheckCode::Unknown('Target did not respond to check.')
     end
 
     unless res.headers['Server']
@@ -125,7 +125,7 @@ def login(username, password)
     }, 3.5)
 
     unless res
-      fail_with(Failure::Unknown, 'Target did not respond to login request')
+      fail_with(Failure::Unreachable, "Target did not respond to #{__method__}")
     end
 
     cookie = res.get_cookies
@@ -154,7 +154,7 @@ def execute_command(cmd, opts = {})
     )
 
     unless res
-      fail_with(Failure::Unknown, 'Target did not respond to payload request')
+      fail_with(Failure::Unreachable, "Target did not respond to #{__method__}")
     end
 
     unless res.code == 400 && res.body.match(/java\.lang\.UNIXProcess@\h+/)

modules/exploits/multi/http/liferay_java_unmarshalling.rb

@@ -7,9 +7,9 @@ class MetasploitModule < Msf::Exploit::Remote
 
   Rank = ExcellentRanking
 
+  prepend Msf::Exploit::Remote::AutoCheck
   include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::Remote::Java::HTTP::ClassLoader
-  prepend Msf::Exploit::Remote::AutoCheck
 
   def initialize(info = {})
     super(
@@ -66,7 +66,7 @@ def check
     )
 
     unless res
-      return CheckCode::Unknown('Target did not respond to check request.')
+      return CheckCode::Unknown('Target did not respond to check.')
     end
 
     unless res.headers['Liferay-Portal']

modules/exploits/unix/local/opensmtpd_oob_read_lpe.rb

@@ -8,9 +8,9 @@ class MetasploitModule < Msf::Exploit::Local
   # smtpd(8) may crash on a malformed message
   Rank = AverageRanking
 
+  prepend Msf::Exploit::Remote::AutoCheck
   include Msf::Exploit::Remote::TcpServer
   include Msf::Exploit::Remote::Expect
-  prepend Msf::Exploit::Remote::AutoCheck
 
   def initialize(info = {})
     super(update_info(info,

modules/exploits/unix/smtp/opensmtpd_mail_from_rce.rb

@@ -7,9 +7,9 @@ class MetasploitModule < Msf::Exploit::Remote
 
   Rank = ExcellentRanking
 
+  prepend Msf::Exploit::Remote::AutoCheck
   include Msf::Exploit::Remote::Tcp
   include Msf::Exploit::Remote::Expect
-  prepend Msf::Exploit::Remote::AutoCheck
 
   def initialize(info = {})
     super(

modules/exploits/unix/webapp/thinkphp_rce.rb

@@ -7,8 +7,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
   Rank = ExcellentRanking
 
-  include Msf::Exploit::Remote::HttpClient
   prepend Msf::Exploit::Remote::AutoCheck
+  include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::CmdStager
 
   def initialize(info = {})
@@ -119,7 +119,7 @@ def check
     )
 
     unless res
-      return CheckCode::Unknown('Target did not respond to check request.')
+      return CheckCode::Unknown('Target did not respond to check.')
     end
 
     unless res.code == 404 && res.body.match(/copyright.*ThinkPHP/m)

modules/exploits/unix/webapp/wp_infinitewp_auth_bypass.rb

@@ -7,8 +7,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
   Rank = ManualRanking
 
-  include Msf::Exploit::Remote::HTTP::Wordpress
   prepend Msf::Exploit::Remote::AutoCheck
+  include Msf::Exploit::Remote::HTTP::Wordpress
 
   def initialize(info = {})
     super(update_info(info,

modules/exploits/windows/http/desktopcentral_deserialization.rb

@@ -7,8 +7,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
   Rank = ExcellentRanking
 
-  include Msf::Exploit::Remote::HttpClient
   prepend Msf::Exploit::Remote::AutoCheck
+  include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::CmdStager
   include Msf::Exploit::Powershell
   include Msf::Exploit::FileDropper
@@ -99,7 +99,7 @@ def check
     )
 
     unless res
-      return CheckCode::Unknown('Target did not respond to check request.')
+      return CheckCode::Unknown('Target did not respond to check.')
     end
 
     unless res.code == 200 && res.body.include?('ManageEngine Desktop Central')

modules/exploits/windows/http/plesk_mylittleadmin_viewstate.rb

@@ -20,8 +20,8 @@ class MetasploitModule < Msf::Exploit::Remote
     "\x20\x7f\xc5\xfc\xe6\x2d\x1a\x5a\x4f\x6d\x24\x10\x72\x22\x61\xe6\xa3\x3e" \
     "\x77\xe0\x62\x8b\x17\xaa\x92\x80\x39\xbf".freeze
 
-  include Msf::Exploit::Remote::HttpClient
   prepend Msf::Exploit::Remote::AutoCheck
+  include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::ViewState
   include Msf::Exploit::CmdStager
   include Msf::Exploit::Powershell
@@ -121,7 +121,7 @@ def check
     )
 
     unless res
-      return CheckCode::Unknown('Target did not respond to check request.')
+      return CheckCode::Unknown('Target did not respond to check.')
     end
 
     unless res.code == 200 && res.body.include?('myLittleAdmin for SQL Server')