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

shuckins-r7 · shuckins-r7 · commit fd2a12da436a · 2014-07-17T10:55:46.000-05:00
Specs passing, no hits on Metasploit::Credential::Login::Status across all projects aside from coverage docs (3).

MSP-10730 #land
diff --git a/lib/msf/core/db.rb b/lib/msf/core/db.rb
@@ -3484,7 +3484,7 @@ def inspect_single_packet_http(pkt,wspace,args)
 
         login_data = {
             core: credential_core,
-            status: Metasploit::Credential::Login::Status::UNTRIED
+            status: Metasploit::Model::Login::Status::UNTRIED
         }
 
         login_data.merge!(service_data)
diff --git a/lib/msf/core/db_manager/import_msf_xml.rb b/lib/msf/core/db_manager/import_msf_xml.rb
@@ -377,7 +377,7 @@ def import_msf_xml(args={}, &block)
                                           port: port,
                                           protocol: proto,
                                           service_name: sname,
-                                          status: Metasploit::Credential::Login::Status::UNTRIED)
+                                          status: Metasploit::Model::Login::Status::UNTRIED)
                 end
               end
             end
diff --git a/modules/auxiliary/scanner/afp/afp_login.rb b/modules/auxiliary/scanner/afp/afp_login.rb
@@ -87,7 +87,7 @@ def run_host(ip)
         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)
 
diff --git a/modules/auxiliary/scanner/db2/db2_auth.rb b/modules/auxiliary/scanner/db2/db2_auth.rb
@@ -87,7 +87,7 @@ def run_host(ip)
         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)
 
diff --git a/modules/auxiliary/scanner/ftp/ftp_login.rb b/modules/auxiliary/scanner/ftp/ftp_login.rb
@@ -100,7 +100,7 @@ def run_host(ip)
             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)
 
diff --git a/modules/auxiliary/scanner/http/tomcat_mgr_login.rb b/modules/auxiliary/scanner/http/tomcat_mgr_login.rb
@@ -136,7 +136,7 @@ def run_host(ip)
         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)
 
diff --git a/modules/auxiliary/scanner/mssql/mssql_hashdump.rb b/modules/auxiliary/scanner/mssql/mssql_hashdump.rb
@@ -62,7 +62,7 @@ def run_host(ip)
     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 @@ def report_hashes(mssql_hashes, version_year)
 
       login_data = {
         core: credential_core,
-        status: Metasploit::Credential::Login::Status::UNTRIED
+        status: Metasploit::Model::Login::Status::UNTRIED
       }
 
       login_data.merge!(service_data)
diff --git a/modules/auxiliary/scanner/mssql/mssql_login.rb b/modules/auxiliary/scanner/mssql/mssql_login.rb
@@ -82,7 +82,7 @@ def run_host(ip)
         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)
 
diff --git a/modules/auxiliary/scanner/mysql/mysql_hashdump.rb b/modules/auxiliary/scanner/mysql/mysql_hashdump.rb
@@ -53,7 +53,7 @@ def run_host(ip)
     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 @@ def run_host(ip)
         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)
diff --git a/modules/auxiliary/scanner/mysql/mysql_login.rb b/modules/auxiliary/scanner/mysql/mysql_login.rb
@@ -80,7 +80,7 @@ def run_host(ip)
             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)
 
diff --git a/modules/auxiliary/scanner/oracle/oracle_hashdump.rb b/modules/auxiliary/scanner/oracle/oracle_hashdump.rb
@@ -126,7 +126,7 @@ def report_hashes(table, is_11g, ip, service)
 
       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))
diff --git a/modules/auxiliary/scanner/postgres/postgres_hashdump.rb b/modules/auxiliary/scanner/postgres/postgres_hashdump.rb
@@ -66,7 +66,7 @@ def run_host(ip)
       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 @@ def run_host(ip)
       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 @@ def run_host(ip)
       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)
diff --git a/modules/auxiliary/scanner/postgres/postgres_login.rb b/modules/auxiliary/scanner/postgres/postgres_login.rb
@@ -95,7 +95,7 @@ def run_host(ip)
         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)
 
diff --git a/modules/auxiliary/scanner/telnet/telnet_login.rb b/modules/auxiliary/scanner/telnet/telnet_login.rb
@@ -92,7 +92,7 @@ def run_host(ip)
         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)
 
diff --git a/modules/auxiliary/scanner/vnc/vnc_login.rb b/modules/auxiliary/scanner/vnc/vnc_login.rb
@@ -100,7 +100,7 @@ def run_host(ip)
         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)
 
diff --git a/modules/auxiliary/scanner/winrm/winrm_login.rb b/modules/auxiliary/scanner/winrm/winrm_login.rb
@@ -84,7 +84,7 @@ def run_host(ip)
           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)
diff --git a/modules/exploits/multi/http/glassfish_deployer.rb b/modules/exploits/multi/http/glassfish_deployer.rb
@@ -673,7 +673,7 @@ def log_success(user = "", pass = "")
     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
     }
 
diff --git a/modules/exploits/multi/http/tomcat_mgr_deploy.rb b/modules/exploits/multi/http/tomcat_mgr_deploy.rb
@@ -324,7 +324,7 @@ def report_tomcat_credential
         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)
diff --git a/modules/exploits/multi/http/tomcat_mgr_upload.rb b/modules/exploits/multi/http/tomcat_mgr_upload.rb
@@ -432,7 +432,7 @@ def report_tomcat_credential
         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)
diff --git a/modules/exploits/windows/smb/psexec.rb b/modules/exploits/windows/smb/psexec.rb
@@ -146,7 +146,7 @@ def exploit
           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)
diff --git a/modules/post/multi/gather/pgpass_creds.rb b/modules/post/multi/gather/pgpass_creds.rb
@@ -134,7 +134,7 @@ def parse_creds(f)
         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)
diff --git a/modules/post/windows/gather/credentials/bulletproof_ftp.rb b/modules/post/windows/gather/credentials/bulletproof_ftp.rb
@@ -215,7 +215,7 @@ def report_findings(entries)
       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))
diff --git a/modules/post/windows/gather/credentials/coreftp.rb b/modules/post/windows/gather/credentials/coreftp.rb
@@ -75,7 +75,7 @@ def run
           # 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
diff --git a/modules/post/windows/gather/credentials/enum_cred_store.rb b/modules/post/windows/gather/credentials/enum_cred_store.rb
@@ -156,7 +156,7 @@ def report_db(cred)
         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))
diff --git a/modules/post/windows/gather/credentials/epo_sql.rb b/modules/post/windows/gather/credentials/epo_sql.rb
@@ -146,7 +146,7 @@ def process_config(filename)
       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))
diff --git a/modules/post/windows/gather/credentials/filezilla_server.rb b/modules/post/windows/gather/credentials/filezilla_server.rb
@@ -167,7 +167,7 @@ def get_filezilla_creds(paths)
       # 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 @@ def get_filezilla_creds(paths)
       # 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
diff --git a/modules/post/windows/gather/credentials/flashfxp.rb b/modules/post/windows/gather/credentials/flashfxp.rb
@@ -106,7 +106,7 @@ def get_ini(filename)
         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))
diff --git a/modules/post/windows/gather/credentials/ftpnavigator.rb b/modules/post/windows/gather/credentials/ftpnavigator.rb
@@ -89,7 +89,7 @@ def run
       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))
diff --git a/modules/post/windows/gather/credentials/ftpx.rb b/modules/post/windows/gather/credentials/ftpx.rb
@@ -94,7 +94,7 @@ def parse_xml(data)
       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))
diff --git a/modules/post/windows/gather/credentials/gpp.rb b/modules/post/windows/gather/credentials/gpp.rb
@@ -335,7 +335,7 @@ def report_creds(user, pass)
     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))
diff --git a/modules/post/windows/gather/credentials/mremote.rb b/modules/post/windows/gather/credentials/mremote.rb
@@ -117,7 +117,7 @@ def parse_xml(data)
       # 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
diff --git a/modules/post/windows/gather/credentials/outlook.rb b/modules/post/windows/gather/credentials/outlook.rb
@@ -324,7 +324,7 @@ def get_registry
           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 @@ def get_registry
           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))
diff --git a/modules/post/windows/gather/credentials/smartftp.rb b/modules/post/windows/gather/credentials/smartftp.rb
@@ -131,7 +131,7 @@ def parse_xml(data)
       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)
diff --git a/modules/post/windows/gather/credentials/vnc.rb b/modules/post/windows/gather/credentials/vnc.rb
@@ -252,7 +252,7 @@ def run
         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 @@ def run
         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
diff --git a/modules/post/windows/gather/credentials/winscp.rb b/modules/post/windows/gather/credentials/winscp.rb
@@ -228,7 +228,7 @@ def winscp_store_config(config)
 
     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)
diff --git a/modules/post/windows/gather/credentials/wsftp_client.rb b/modules/post/windows/gather/credentials/wsftp_client.rb
@@ -88,7 +88,7 @@ def get_ini(filename)
       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))
diff --git a/modules/post/windows/gather/hashdump.rb b/modules/post/windows/gather/hashdump.rb
@@ -100,7 +100,7 @@ def run
         # 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
diff --git a/modules/post/windows/gather/smart_hashdump.rb b/modules/post/windows/gather/smart_hashdump.rb

Original file line number	Diff line number	Diff line change
`@@ -3484,7 +3484,7 @@ def inspect_single_packet_http(pkt,wspace,args)`
`3484`	`3484`
`3485`	`3485`	`login_data = {`
`3486`	`3486`	`core: credential_core,`
`3487`		`- status: Metasploit::Credential::Login::Status::UNTRIED`
	`3487`	`+ status: Metasploit::Model::Login::Status::UNTRIED`
`3488`	`3488`	`}`
`3489`	`3489`
`3490`	`3490`	`login_data.merge!(service_data)`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ def run_host(ip)`
`87`	`87`	`login_data = {`
`88`	`88`	`core: credential_core,`
`89`	`89`	`last_attempted_at: DateTime.now,`
`90`		`- status: Metasploit::Credential::Login::Status::SUCCESSFUL`
	`90`	`+ status: Metasploit::Model::Login::Status::SUCCESSFUL`
`91`	`91`	`}`
`92`	`92`	`login_data.merge!(service_data)`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ def run_host(ip)`
`100`	`100`	`access_level: test_ftp_access(result.credential.public, scanner),`
`101`	`101`	`core: credential_core,`
`102`	`102`	`last_attempted_at: DateTime.now,`
`103`		`- status: Metasploit::Credential::Login::Status::SUCCESSFUL`
	`103`	`+ status: Metasploit::Model::Login::Status::SUCCESSFUL`
`104`	`104`	`}`
`105`	`105`	`login_data.merge!(service_data)`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ def run_host(ip)`
`136`	`136`	`login_data = {`
`137`	`137`	`core: credential_core,`
`138`	`138`	`last_attempted_at: DateTime.now,`
`139`		`- status: Metasploit::Credential::Login::Status::SUCCESSFUL`
	`139`	`+ status: Metasploit::Model::Login::Status::SUCCESSFUL`
`140`	`140`	`}`
`141`	`141`	`login_data.merge!(service_data)`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ def run_host(ip)`
`62`	`62`	`login_data = {`
`63`	`63`	`core: credential_core,`
`64`	`64`	`last_attempted_at: DateTime.now,`
`65`		`- status: Metasploit::Credential::Login::Status::SUCCESSFUL`
	`65`	`+ status: Metasploit::Model::Login::Status::SUCCESSFUL`
`66`	`66`	`}`
`67`	`67`	`login_data.merge!(service_data)`
`68`	`68`
`@@ -143,7 +143,7 @@ def report_hashes(mssql_hashes, version_year)`
`143`	`143`
`144`	`144`	`login_data = {`
`145`	`145`	`core: credential_core,`
`146`		`- status: Metasploit::Credential::Login::Status::UNTRIED`
	`146`	`+ status: Metasploit::Model::Login::Status::UNTRIED`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`login_data.merge!(service_data)`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ def run_host(ip)`
`82`	`82`	`login_data = {`
`83`	`83`	`core: credential_core,`
`84`	`84`	`last_attempted_at: DateTime.now,`
`85`		`- status: Metasploit::Credential::Login::Status::SUCCESSFUL`
	`85`	`+ status: Metasploit::Model::Login::Status::SUCCESSFUL`
`86`	`86`	`}`
`87`	`87`	`login_data.merge!(service_data)`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ def run_host(ip)`
`80`	`80`	`login_data = {`
`81`	`81`	`core: credential_core,`
`82`	`82`	`last_attempted_at: DateTime.now,`
`83`		`- status: Metasploit::Credential::Login::Status::SUCCESSFUL`
	`83`	`+ status: Metasploit::Model::Login::Status::SUCCESSFUL`
`84`	`84`	`}`
`85`	`85`	`login_data.merge!(service_data)`
`86`	`86`