Merge pull request #115 from rapid7/bug/MSP-10730/finish-login-status-move

Specs passing, no hits on Metasploit::Credential::Login::Status across all projects aside from coverage docs (3).

MSP-10730 #land

lib/msf/core/db.rb

@@ -3484,7 +3484,7 @@ class DBManager
 
         login_data = {
             core: credential_core,
-            status: Metasploit::Credential::Login::Status::UNTRIED
+            status: Metasploit::Model::Login::Status::UNTRIED
         }
 
         login_data.merge!(service_data)

lib/msf/core/db_manager/import_msf_xml.rb

@@ -377,7 +377,7 @@ module Msf
                                           port: port,
                                           protocol: proto,
                                           service_name: sname,
-                                          status: Metasploit::Credential::Login::Status::UNTRIED)
+                                          status: Metasploit::Model::Login::Status::UNTRIED)
                 end
               end
             end

modules/auxiliary/scanner/afp/afp_login.rb

@@ -87,7 +87,7 @@ class Metasploit3 < Msf::Auxiliary
         login_data = {
             core: credential_core,
             last_attempted_at: DateTime.now,
-            status: Metasploit::Credential::Login::Status::SUCCESSFUL
+            status: Metasploit::Model::Login::Status::SUCCESSFUL
         }
         login_data.merge!(service_data)
 

modules/auxiliary/scanner/db2/db2_auth.rb

@@ -87,7 +87,7 @@ class Metasploit3 < Msf::Auxiliary
         login_data = {
             core: credential_core,
             last_attempted_at: DateTime.now,
-            status: Metasploit::Credential::Login::Status::SUCCESSFUL
+            status: Metasploit::Model::Login::Status::SUCCESSFUL
         }
         login_data.merge!(service_data)
 

modules/auxiliary/scanner/ftp/ftp_login.rb

@@ -100,7 +100,7 @@ class Metasploit3 < Msf::Auxiliary
             access_level: test_ftp_access(result.credential.public, scanner),
             core: credential_core,
             last_attempted_at: DateTime.now,
-            status: Metasploit::Credential::Login::Status::SUCCESSFUL
+            status: Metasploit::Model::Login::Status::SUCCESSFUL
         }
         login_data.merge!(service_data)
 

modules/auxiliary/scanner/http/tomcat_mgr_login.rb

@@ -136,7 +136,7 @@ class Metasploit3 < Msf::Auxiliary
         login_data = {
             core: credential_core,
             last_attempted_at: DateTime.now,
-            status: Metasploit::Credential::Login::Status::SUCCESSFUL
+            status: Metasploit::Model::Login::Status::SUCCESSFUL
         }
         login_data.merge!(service_data)
 

modules/auxiliary/scanner/mssql/mssql_hashdump.rb

@@ -62,7 +62,7 @@ class Metasploit3 < Msf::Auxiliary
     login_data = {
         core: credential_core,
         last_attempted_at: DateTime.now,
-        status: Metasploit::Credential::Login::Status::SUCCESSFUL
+        status: Metasploit::Model::Login::Status::SUCCESSFUL
     }
     login_data.merge!(service_data)
 
@@ -143,7 +143,7 @@ class Metasploit3 < Msf::Auxiliary
 
       login_data = {
         core: credential_core,
-        status: Metasploit::Credential::Login::Status::UNTRIED
+        status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       login_data.merge!(service_data)

modules/auxiliary/scanner/mssql/mssql_login.rb

@@ -82,7 +82,7 @@ class Metasploit3 < Msf::Auxiliary
         login_data = {
             core: credential_core,
             last_attempted_at: DateTime.now,
-            status: Metasploit::Credential::Login::Status::SUCCESSFUL
+            status: Metasploit::Model::Login::Status::SUCCESSFUL
         }
         login_data.merge!(service_data)
 

modules/auxiliary/scanner/mysql/mysql_hashdump.rb

@@ -53,7 +53,7 @@ class Metasploit3 < Msf::Auxiliary
     login_data = {
         core: credential_core,
         last_attempted_at: DateTime.now,
-        status: Metasploit::Credential::Login::Status::SUCCESSFUL
+        status: Metasploit::Model::Login::Status::SUCCESSFUL
     }
     login_data.merge!(service_data)
 
@@ -91,7 +91,7 @@ class Metasploit3 < Msf::Auxiliary
         credential_core = create_credential(credential_data)
         login_data = {
             core: credential_core,
-            status: Metasploit::Credential::Login::Status::UNTRIED
+            status: Metasploit::Model::Login::Status::UNTRIED
         }
         login_data.merge!(service_data)
         create_credential_login(login_data)

modules/auxiliary/scanner/mysql/mysql_login.rb

@@ -80,7 +80,7 @@ class Metasploit3 < Msf::Auxiliary
             login_data = {
                 core: credential_core,
                 last_attempted_at: DateTime.now,
-                status: Metasploit::Credential::Login::Status::SUCCESSFUL
+                status: Metasploit::Model::Login::Status::SUCCESSFUL
             }
             login_data.merge!(service_data)
 

modules/auxiliary/scanner/oracle/oracle_hashdump.rb

@@ -126,7 +126,7 @@ class Metasploit3 < Msf::Auxiliary
 
       login_data = {
         core: credential_core,
-        status: Metasploit::Credential::Login::Status::UNTRIED
+        status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       create_credential_login(login_data.merge(service_data))

modules/auxiliary/scanner/postgres/postgres_hashdump.rb

@@ -66,7 +66,7 @@ class Metasploit3 < Msf::Auxiliary
       login_data = {
           core: credential_core,
           last_attempted_at: DateTime.now,
-          status: Metasploit::Credential::Login::Status::SUCCESSFUL
+          status: Metasploit::Model::Login::Status::SUCCESSFUL
       }
       login_data.merge!(service_data)
       create_credential_login(login_data)
@@ -84,7 +84,7 @@ class Metasploit3 < Msf::Auxiliary
       login_data = {
           core: credential_core,
           last_attempted_at: DateTime.now,
-          status: Metasploit::Credential::Login::Status::SUCCESSFUL
+          status: Metasploit::Model::Login::Status::SUCCESSFUL
       }
       login_data.merge!(service_data)
       # We know the credentials worked and have admin access because we got the hashes
@@ -130,7 +130,7 @@ class Metasploit3 < Msf::Auxiliary
       credential_core = create_credential(credential_data)
       login_data = {
           core: credential_core,
-          status: Metasploit::Credential::Login::Status::UNTRIED
+          status: Metasploit::Model::Login::Status::UNTRIED
       }
       login_data.merge!(service_data)
       create_credential_login(login_data)

modules/auxiliary/scanner/postgres/postgres_login.rb

@@ -95,7 +95,7 @@ class Metasploit3 < Msf::Auxiliary
         login_data = {
             core: credential_core,
             last_attempted_at: DateTime.now,
-            status: Metasploit::Credential::Login::Status::SUCCESSFUL
+            status: Metasploit::Model::Login::Status::SUCCESSFUL
         }
         login_data.merge!(service_data)
 

modules/auxiliary/scanner/telnet/telnet_login.rb

@@ -92,7 +92,7 @@ class Metasploit3 < Msf::Auxiliary
         login_data = {
             core: credential_core,
             last_attempted_at: DateTime.now,
-            status: Metasploit::Credential::Login::Status::SUCCESSFUL
+            status: Metasploit::Model::Login::Status::SUCCESSFUL
         }
         login_data.merge!(service_data)
 

modules/auxiliary/scanner/vnc/vnc_login.rb

@@ -100,7 +100,7 @@ class Metasploit3 < Msf::Auxiliary
         login_data = {
             core: credential_core,
             last_attempted_at: DateTime.now,
-            status: Metasploit::Credential::Login::Status::SUCCESSFUL
+            status: Metasploit::Model::Login::Status::SUCCESSFUL
         }
         login_data.merge!(service_data)
 

modules/auxiliary/scanner/winrm/winrm_login.rb

@@ -84,7 +84,7 @@ class Metasploit3 < Msf::Auxiliary
           access_level: 'Admin',
           core: credential_core,
           last_attempted_at: DateTime.now,
-          status: Metasploit::Credential::Login::Status::SUCCESSFUL
+          status: Metasploit::Model::Login::Status::SUCCESSFUL
         }.merge(service_data)
 
         create_credential_login(login_data)

modules/exploits/multi/http/glassfish_deployer.rb

@@ -673,7 +673,7 @@ class Metasploit3 < Msf::Exploit::Remote
     login_data = {
       core: credential_core,
       access_level: "Admin",
-      status: Metasploit::Credential::Login::Status::SUCCESSFUL,
+      status: Metasploit::Model::Login::Status::SUCCESSFUL,
       last_attempted_at: DateTime.now
     }
 

modules/exploits/multi/http/tomcat_mgr_deploy.rb

@@ -324,7 +324,7 @@ class Metasploit3 < Msf::Exploit::Remote
         access_level: 'Admin',
         core: credential_core,
         last_attempted_at: DateTime.now,
-        status: Metasploit::Credential::Login::Status::SUCCESSFUL
+        status: Metasploit::Model::Login::Status::SUCCESSFUL
     }
     login_data.merge!(service_data)
     create_credential_login(login_data)

modules/exploits/multi/http/tomcat_mgr_upload.rb

@@ -432,7 +432,7 @@ class Metasploit3 < Msf::Exploit::Remote
         access_level: 'Admin',
         core: credential_core,
         last_attempted_at: DateTime.now,
-        status: Metasploit::Credential::Login::Status::SUCCESSFUL
+        status: Metasploit::Model::Login::Status::SUCCESSFUL
     }
     login_data.merge!(service_data)
     create_credential_login(login_data)

modules/exploits/windows/smb/psexec.rb

@@ -146,7 +146,7 @@ class Metasploit3 < Msf::Exploit::Remote
           access_level: 'Admin',
           core: credential_core,
           last_attempted_at: DateTime.now,
-          status: Metasploit::Credential::Login::Status::SUCCESSFUL
+          status: Metasploit::Model::Login::Status::SUCCESSFUL
       }
 
       login_data.merge!(service_data)

modules/post/multi/gather/pgpass_creds.rb

@@ -134,7 +134,7 @@ class Metasploit3 < Msf::Post
         service_name: "postgres",
         core: credential_core,
         access_level: "User",
-        status: Metasploit::Credential::Login::Status::UNTRIED,
+        status: Metasploit::Model::Login::Status::UNTRIED,
         workspace_id: myworkspace_id
       }
       create_credential_login(login_data)

modules/post/windows/gather/credentials/bulletproof_ftp.rb

@@ -215,7 +215,7 @@ class Metasploit3 < Msf::Post
       login_data = {
         core: credential_core,
         access_level: "User",
-        status: Metasploit::Credential::Login::Status::UNTRIED
+        status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       create_credential_login(login_data.merge(service_data))

modules/post/windows/gather/credentials/coreftp.rb

@@ -75,7 +75,7 @@ class Metasploit3 < Msf::Post
           # Assemble the options hash for creating the Metasploit::Credential::Login object
           login_data ={
               core: credential_core,
-              status: Metasploit::Credential::Login::Status::UNTRIED
+              status: Metasploit::Model::Login::Status::UNTRIED
           }
 
           # Merge in the service data and create our Login

modules/post/windows/gather/credentials/enum_cred_store.rb

@@ -156,7 +156,7 @@ class Metasploit3 < Msf::Post
         login_data = {
           core: credential_core,
           access_level: "User",
-          status: Metasploit::Credential::Login::Status::UNTRIED
+          status: Metasploit::Model::Login::Status::UNTRIED
         }
 
         create_credential_login(login_data.merge(service_data))

modules/post/windows/gather/credentials/epo_sql.rb

@@ -146,7 +146,7 @@ class Metasploit3 < Msf::Post
       login_data = {
         core: credential_core,
         access_level: "User",
-        status: Metasploit::Credential::Login::Status::UNTRIED
+        status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       create_credential_login(login_data.merge(service_data))

modules/post/windows/gather/credentials/filezilla_server.rb

@@ -167,7 +167,7 @@ class Metasploit3 < Msf::Post
       # Assemble the options hash for creating the Metasploit::Credential::Login object
       login_data ={
           core: credential_core,
-          status: Metasploit::Credential::Login::Status::UNTRIED
+          status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       # Merge in the service data and create our Login
@@ -227,7 +227,7 @@ class Metasploit3 < Msf::Post
       # Assemble the options hash for creating the Metasploit::Credential::Login object
       login_data ={
           core: credential_core,
-          status: Metasploit::Credential::Login::Status::UNTRIED
+          status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       # Merge in the service data and create our Login

modules/post/windows/gather/credentials/flashfxp.rb

@@ -106,7 +106,7 @@ class Metasploit3 < Msf::Post
         login_data = {
           core: credential_core,
           access_level: "User",
-          status: Metasploit::Credential::Login::Status::UNTRIED
+          status: Metasploit::Model::Login::Status::UNTRIED
         }
 
         create_credential_login(login_data.merge(service_data))

modules/post/windows/gather/credentials/ftpnavigator.rb

@@ -89,7 +89,7 @@ class Metasploit3 < Msf::Post
       login_data = {
         core: credential_core,
         access_level: "User",
-        status: Metasploit::Credential::Login::Status::UNTRIED
+        status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       create_credential_login(login_data.merge(service_data))

modules/post/windows/gather/credentials/ftpx.rb

@@ -94,7 +94,7 @@ class Metasploit3 < Msf::Post
       login_data = {
         core: credential_core,
         access_level: "User",
-        status: Metasploit::Credential::Login::Status::UNTRIED
+        status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       create_credential_login(login_data.merge(service_data))

modules/post/windows/gather/credentials/gpp.rb

@@ -335,7 +335,7 @@ class Metasploit3 < Msf::Post
     login_data = {
       core: credential_core,
       access_level: "User",
-      status: Metasploit::Credential::Login::Status::UNTRIED
+      status: Metasploit::Model::Login::Status::UNTRIED
     }
 
     create_credential_login(login_data.merge(service_data))

modules/post/windows/gather/credentials/mremote.rb

@@ -117,7 +117,7 @@ class Metasploit3 < Msf::Post
       # Assemble the options hash for creating the Metasploit::Credential::Login object
       login_data ={
           core: credential_core,
-          status: Metasploit::Credential::Login::Status::UNTRIED
+          status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       # Merge in the service data and create our Login

modules/post/windows/gather/credentials/outlook.rb

@@ -324,7 +324,7 @@ class Metasploit3 < Msf::Post
           login_data = {
             core: credential_core,
             access_level: "User",
-            status: Metasploit::Credential::Login::Status::UNTRIED
+            status: Metasploit::Model::Login::Status::UNTRIED
           }
 
           create_credential_login(login_data.merge(service_data))
@@ -353,7 +353,7 @@ class Metasploit3 < Msf::Post
           login_data = {
             core: credential_core,
             access_level: "User",
-            status: Metasploit::Credential::Login::Status::UNTRIED
+            status: Metasploit::Model::Login::Status::UNTRIED
           }
 
           create_credential_login(login_data.merge(service_data))

modules/post/windows/gather/credentials/smartftp.rb

@@ -131,7 +131,7 @@ class Metasploit3 < Msf::Post
       credential_core = create_credential(credential_data)
       login_data ={
           core: credential_core,
-          status: Metasploit::Credential::Login::Status::UNTRIED
+          status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       login_data.merge!(service_data)

modules/post/windows/gather/credentials/vnc.rb

@@ -252,7 +252,7 @@ class Metasploit3 < Msf::Post
         login_data ={
             access_level: 'interactive',
             core: credential_core,
-            status: Metasploit::Credential::Login::Status::UNTRIED
+            status: Metasploit::Model::Login::Status::UNTRIED
         }
 
         # Merge in the service data and create our Login
@@ -290,7 +290,7 @@ class Metasploit3 < Msf::Post
         login_data ={
             access_level: 'view_only',
             core: credential_core,
-            status: Metasploit::Credential::Login::Status::UNTRIED
+            status: Metasploit::Model::Login::Status::UNTRIED
         }
 
         # Merge in the service data and create our Login

modules/post/windows/gather/credentials/winscp.rb

@@ -228,7 +228,7 @@ class Metasploit3 < Msf::Post
 
     login_data = {
       core: credential_core,
-      status: Metasploit::Credential::Login::Status::UNTRIED
+      status: Metasploit::Model::Login::Status::UNTRIED
     }.merge(service_data)
 
     create_credential_login(login_data)

modules/post/windows/gather/credentials/wsftp_client.rb

@@ -88,7 +88,7 @@ class Metasploit3 < Msf::Post
       login_data = {
         core: credential_core,
         access_level: "User",
-        status: Metasploit::Credential::Login::Status::UNTRIED
+        status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       create_credential_login(login_data.merge(service_data))

modules/post/windows/gather/hashdump.rb

@@ -100,7 +100,7 @@ class Metasploit3 < Msf::Post
         # Assemble the options hash for creating the Metasploit::Credential::Login object
         login_data ={
           core: credential_core,
-          status: Metasploit::Credential::Login::Status::UNTRIED
+          status: Metasploit::Model::Login::Status::UNTRIED
         }
 
         # Merge in the service data and create our Login

modules/post/windows/gather/smart_hashdump.rb

@@ -273,7 +273,7 @@ class Metasploit3 < Msf::Post
         # Assemble the options hash for creating the Metasploit::Credential::Login object
         login_data ={
             core: credential_core,
-            status: Metasploit::Credential::Login::Status::UNTRIED
+            status: Metasploit::Model::Login::Status::UNTRIED
         }
 
         # Merge in the service data and create our Login
@@ -355,7 +355,7 @@ class Metasploit3 < Msf::Post
         # Assemble the options hash for creating the Metasploit::Credential::Login object
         login_data ={
             core: credential_core,
-            status: Metasploit::Credential::Login::Status::UNTRIED
+            status: Metasploit::Model::Login::Status::UNTRIED
         }
 
         # Merge in the service data and create our Login