metasploit-credential 2.0.14 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b12edd32b89a8ab5c21d6d91785ffce7af8db261
-  data.tar.gz: 12d251ace48a0a59c4891a4048a595f0ec01283a
+  metadata.gz: 950ddd91d6906dedbf6f98c7a30cfa16a04f5e25
+  data.tar.gz: 7f3b132fdddba7305aa0287bbc667e1df710fe48
 SHA512:
-  metadata.gz: 1f3fccee78faf5a28d5e48d112ce5c01085b11de53c43175654992f4e923f1260519b64bc66e37e9b757df0d44bcd31873623035784f7951f1afedef5cb72d47
-  data.tar.gz: 4147945ccfe7f8ac5c0ea0335854b861d96c67c51ace00b6ecb601eedb0b23a62da869e5c3a705bfca712fe0d9069332df4892950bf2621def377e83dad1cd5b
+  metadata.gz: 464d1f60fd21a66c76d2c10a6eccd27600bfa03678c4e4a7e1209d4af28c113982207cd16f50d8190d41d9ee19dec28e80f249f5d56c2b0da87412258f2b0f68
+  data.tar.gz: bc40e57d9df8fb61cacc60c37039d9e3e1deea35bab29091809415a84c8e162f5717149650bb4878cdd786ed5b3c95a760a3ddf95d76539bc8934180a2e43cb5

data/lib/metasploit/credential/engine.rb

@@ -29,12 +29,12 @@ class Metasploit::Credential::Engine < Rails::Engine
               after: 'factory_girl.set_factory_paths',
               # before metasploit_data_models because it prepends
               before: 'metasploit_data_models.prepend_factory_path' do
-    if defined? FactoryGirl
+    if defined? FactoryBot
       relative_definition_file_path = config.generators.options[:factory_girl][:dir]
       definition_file_path = root.join(relative_definition_file_path)
 
       # unshift so that projects that use metasploit-credential can modify metasploit_credential_* factories
-      FactoryGirl.definition_file_paths.unshift definition_file_path
+      FactoryBot.definition_file_paths.unshift definition_file_path
     end
   end
 end

data/lib/metasploit/credential/version.rb

@@ -3,13 +3,13 @@
 module Metasploit
   module Credential
     # VERSION is managed by GemRelease
-    VERSION = '2.0.14'
-  
+    VERSION = '3.0.0'
+
     # @return [String]
     #
     # returns the VERSION
     #
-  
+
     def self.version
       VERSION
     end

data/spec/dummy/config/database.yml

@@ -1,6 +1,6 @@
 development: &pgsql
   adapter: postgresql
-  database: metasploit-credential_development1
+  database: metasploit-credential_development0
   username: msf
   password: pass123
   host: localhost
@@ -10,4 +10,4 @@ development: &pgsql
   min_messages: warning
 test:
   <<: *pgsql
-  database: metasploit-credential_test1
+  database: metasploit-credential_test0

data/spec/factories/metasploit/credential/blank_usernames.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_blank_username,
           class: Metasploit::Credential::BlankUsername do
     initialize_with { Metasploit::Credential::BlankUsername.where(username: "").first_or_create }

data/spec/factories/metasploit/credential/cores.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_core,
           class: Metasploit::Credential::Core do
     transient do
@@ -9,20 +9,20 @@ FactoryGirl.define do
 
     association :public, factory: :metasploit_credential_public
 
-    origin { FactoryGirl.build(origin_factory) }
-    private { FactoryGirl.build(private_factory) }
-    realm { FactoryGirl.build(realm_factory) }
+    origin { FactoryBot.build(origin_factory) }
+    private { FactoryBot.build(private_factory) }
+    realm { FactoryBot.build(realm_factory) }
 
     workspace {
       case origin
         when Metasploit::Credential::Origin::Import
-          FactoryGirl.build(:mdm_workspace)
+          FactoryBot.build(:mdm_workspace)
         when Metasploit::Credential::Origin::Manual
           user = origin.user
 
           # an admin can use workspaces it is not a member of
           if user.admin
-            FactoryGirl.build(:mdm_workspace)
+            FactoryBot.build(:mdm_workspace)
           else
             origin.user.workspaces.sample
           end

data/spec/factories/metasploit/credential/importer/cores.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   long_form_headers  = 'username,private_type,private_data,realm_key,realm_value,host_address,service_port,service_name,service_protocol,status,access_level,last_attempted_at'
   short_form_headers = 'username,private_data'
   login_status       = Metasploit::Model::Login::Status::ALL.select {|x| x != Metasploit::Model::Login::Status::UNTRIED }.sample
@@ -7,7 +7,7 @@ FactoryGirl.define do
 
   factory :metasploit_credential_core_importer,
           class: Metasploit::Credential::Importer::Core do
-            origin { FactoryGirl.build :metasploit_credential_origin_import }
+            origin { FactoryBot.build :metasploit_credential_origin_import }
             input  { generate(:well_formed_csv_compliant_header) }
   end
 

data/spec/factories/metasploit/credential/importer/pwdumps.rb

@@ -1,9 +1,9 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_importer_pwdump,
           class: Metasploit::Credential::Importer::Pwdump do
     filename "pwdump-import-#{Time.now.to_i}"
-    origin {FactoryGirl.build :metasploit_credential_origin_import }
-    input { FactoryGirl.generate(:wellformed_pwdump) }
+    origin {FactoryBot.build :metasploit_credential_origin_import }
+    input { FactoryBot.generate(:wellformed_pwdump) }
   end
 
   # Represents a file that should do an error-free import

data/spec/factories/metasploit/credential/importer/zips.rb

@@ -4,11 +4,11 @@
 
 require 'zip'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_importer_zip,
           class: Metasploit::Credential::Importer::Zip do
     input { generate :metasploit_credential_importer_zip_file }
-    origin {FactoryGirl.build :metasploit_credential_origin_import }
+    origin {FactoryBot.build :metasploit_credential_origin_import }
   end
 
 
@@ -29,12 +29,12 @@ FactoryGirl.define do
 
     # Create keys
     key_data = 5.times.collect do
-      FactoryGirl.build(:metasploit_credential_ssh_key).data
+      FactoryBot.build(:metasploit_credential_ssh_key).data
     end
 
     # associate keys with usernames
     csv_hash = key_data.inject({}) do |hash, data|
-      username = FactoryGirl.generate(:metasploit_credential_public_username)
+      username = FactoryBot.generate(:metasploit_credential_public_username)
       hash[username] = data
       hash
     end
@@ -77,12 +77,12 @@ FactoryGirl.define do
 
     # Create keys
     key_data = 5.times.collect do
-      FactoryGirl.build(:metasploit_credential_ssh_key).data
+      FactoryBot.build(:metasploit_credential_ssh_key).data
     end
 
     # associate keys with usernames
     csv_hash = key_data.inject({}) do |hash, data|
-      username = FactoryGirl.generate(:metasploit_credential_public_username)
+      username = FactoryBot.generate(:metasploit_credential_public_username)
       hash[username] = data
       hash
     end
@@ -121,12 +121,12 @@ FactoryGirl.define do
 
     # Create keys
     key_data = 5.times.collect do
-      FactoryGirl.build(:metasploit_credential_ssh_key).data
+      FactoryBot.build(:metasploit_credential_ssh_key).data
     end
 
     # associate keys with usernames
     csv_hash = key_data.inject({}) do |hash, data|
-      username = FactoryGirl.generate(:metasploit_credential_public_username)
+      username = FactoryBot.generate(:metasploit_credential_public_username)
       hash[username] = data
       hash
     end

data/spec/factories/metasploit/credential/logins.rb

@@ -1,9 +1,9 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_login,
           class: Metasploit::Credential::Login do
     transient do
       host {
-        FactoryGirl.build(
+        FactoryBot.build(
           :mdm_host, workspace: workspace
         )
       }
@@ -20,7 +20,7 @@ FactoryGirl.define do
       end
     }
     service {
-      FactoryGirl.build(
+      FactoryBot.build(
           :mdm_service,
           host: host
       )

data/spec/factories/metasploit/credential/nonreplayable_hashes.rb

@@ -1,6 +1,6 @@
 require 'digest/sha1'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_nonreplayable_hash,
           class: Metasploit::Credential::NonreplayableHash,
           parent: :metasploit_credential_password_hash do

data/spec/factories/metasploit/credential/ntlm_hashes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   klass = Metasploit::Credential::NTLMHash
 
   factory :metasploit_credential_ntlm_hash,

data/spec/factories/metasploit/credential/origin/imports.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_origin_import,
           class: Metasploit::Credential::Origin::Import do
     association :task, factory: :mdm_task

data/spec/factories/metasploit/credential/origin/manuals.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_origin_manual,
           class: Metasploit::Credential::Origin::Manual do
     association :user, factory: :mdm_user

data/spec/factories/metasploit/credential/origin/services.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_origin_service,
           class: Metasploit::Credential::Origin::Service do
     transient do

data/spec/factories/metasploit/credential/origin/sessions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_origin_session,
           class: Metasploit::Credential::Origin::Session do
     association :session, factory: :mdm_session

data/spec/factories/metasploit/credential/password_hashes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_password_hash,
           # no need to declare metasploit_credential_private as the :parent because :metasploit_credential_password_hash
           # uses its own data sequence to differentiate password hashes from other private data and #type is

data/spec/factories/metasploit/credential/passwords.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_password,
           # no need to declare metasploit_credential_private as the :parent because :metasploit_credential_password uses
           # its own data sequence to differentiate passwords from other private data and #type is automatically

data/spec/factories/metasploit/credential/postgres_md5.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   klass = Metasploit::Credential::PostgresMD5
 
   factory :metasploit_credential_postgres_md5,

data/spec/factories/metasploit/credential/privates.rb

@@ -1,5 +1,5 @@
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_private,
           class: Metasploit::Credential::Private do
     data { generate :metasploit_credential_private_data }

data/spec/factories/metasploit/credential/publics.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_public,
           class: Metasploit::Credential::Username do
     transient do
@@ -17,7 +17,7 @@ FactoryGirl.define do
       }
     end
 
-    initialize_with { FactoryGirl.build(public_factory, username: username) }
+    initialize_with { FactoryBot.build(public_factory, username: username) }
   end
 
   sequence :metasploit_credential_public_username do |n|

data/spec/factories/metasploit/credential/realms.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :metasploit_credential_realm,
           class: Metasploit::Credential::Realm do

data/spec/factories/metasploit/credential/replayable_hashes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_replayable_hash,
           class: Metasploit::Credential::ReplayableHash,
           parent: :metasploit_credential_password_hash

data/spec/factories/metasploit/credential/ssh_keys.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_ssh_key,
           class: Metasploit::Credential::SSHKey do
     transient do

data/spec/factories/metasploit/credential/usernames.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :metasploit_credential_username,
           class: Metasploit::Credential::Username do
     username { generate :metasploit_credential_public_username }

data/spec/lib/metasploit/credential/creation_spec.rb

@@ -6,20 +6,20 @@ RSpec.describe Metasploit::Credential::Creation do
     end
   }
 
-  let(:session) { FactoryGirl.create(:mdm_session) }
+  let(:session) { FactoryBot.create(:mdm_session) }
 
-  let(:task) { FactoryGirl.create(:mdm_task, workspace: workspace)}
+  let(:task) { FactoryBot.create(:mdm_task, workspace: workspace)}
 
-  let(:user) { FactoryGirl.create(:mdm_user)}
+  let(:user) { FactoryBot.create(:mdm_user)}
 
-  let(:workspace) { FactoryGirl.create(:mdm_workspace) }
+  let(:workspace) { FactoryBot.create(:mdm_workspace) }
 
   subject(:test_object) { dummy_class.new }
-  
+
   context '#create_credential' do
-    let(:workspace) { FactoryGirl.create(:mdm_workspace) }
-    let(:service) { FactoryGirl.create(:mdm_service, host: FactoryGirl.create(:mdm_host, workspace: workspace)) }
-    let(:task) { FactoryGirl.create(:mdm_task, workspace: workspace) }
+    let(:workspace) { FactoryBot.create(:mdm_workspace) }
+    let(:service) { FactoryBot.create(:mdm_service, host: FactoryBot.create(:mdm_host, workspace: workspace)) }
+    let(:task) { FactoryBot.create(:mdm_task, workspace: workspace) }
     {
       cracked_password: Metasploit::Credential::Origin::CrackedPassword,
       import: Metasploit::Credential::Origin::Import,
@@ -28,26 +28,26 @@ RSpec.describe Metasploit::Credential::Creation do
       session: Metasploit::Credential::Origin::Session
     }.each_pair do |origin_type, origin_class|
       context "Origin[#{origin_type}], Public[Username], Private[Password]" do
-        let(:service) { FactoryGirl.create(:mdm_service) }
+        let(:service) { FactoryBot.create(:mdm_service) }
         let!(:origin_data) {{
           cracked_password: {
-            originating_core_id: FactoryGirl.create(
+            originating_core_id: FactoryBot.create(
               :metasploit_credential_core, workspace: workspace, origin_factory: :metasploit_credential_origin_manual).id
           },
           import: {
-            filename: FactoryGirl.generate(:metasploit_credential_origin_import_filename)
+            filename: FactoryBot.generate(:metasploit_credential_origin_import_filename)
           },
           manual: {user_id: user.id},
           service: {
-            module_fullname: "exploit/" + FactoryGirl.generate(:metasploit_credential_origin_service_reference_name),
+            module_fullname: "exploit/" + FactoryBot.generate(:metasploit_credential_origin_service_reference_name),
             address: service.host.address,
             port: service.port,
             service_name: service.name,
             protocol: service.proto
           },
           session: {
-            session_id: FactoryGirl.create(:mdm_session, workspace: workspace, host: service.host),
-            post_reference_name: FactoryGirl.generate(:metasploit_credential_origin_session_post_reference_name)
+            session_id: FactoryBot.create(:mdm_session, workspace: workspace, host: service.host),
+            post_reference_name: FactoryBot.generate(:metasploit_credential_origin_session_post_reference_name)
           }
         }}
         let(:credential_data) {{
@@ -129,7 +129,7 @@ RSpec.describe Metasploit::Credential::Creation do
         it 'creates a Public with username \'username\'' do
           expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Public.where(type: public_type).count }.by(1)
         end
-      end 
+      end
     end
     {
       password: "Metasploit::Credential::Password",
@@ -170,14 +170,14 @@ RSpec.describe Metasploit::Credential::Creation do
         it 'creates a Public with username \'username\'' do
           expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Public.where(username: 'admin').count }.by(1)
         end
-      end 
+      end
     end
   end
-  
+
   context '#create_credential_and_login' do
-    let(:workspace) { FactoryGirl.create(:mdm_workspace) }
-    let(:service) { FactoryGirl.create(:mdm_service, host: FactoryGirl.create(:mdm_host, workspace: workspace)) }
-    let(:task) { FactoryGirl.create(:mdm_task, workspace: workspace) }
+    let(:workspace) { FactoryBot.create(:mdm_workspace) }
+    let(:service) { FactoryBot.create(:mdm_service, host: FactoryBot.create(:mdm_host, workspace: workspace)) }
+    let(:task) { FactoryBot.create(:mdm_task, workspace: workspace) }
     {
       cracked_password: Metasploit::Credential::Origin::CrackedPassword,
       import: Metasploit::Credential::Origin::Import,
@@ -188,23 +188,23 @@ RSpec.describe Metasploit::Credential::Creation do
       context "Origin[#{origin_type}], Public[Username], Private[Password]" do
         let!(:origin_data) {{
           cracked_password: {
-            originating_core_id: FactoryGirl.create(
+            originating_core_id: FactoryBot.create(
               :metasploit_credential_core, workspace: workspace, origin_factory: :metasploit_credential_origin_manual).id
           },
           import: {
-            filename: FactoryGirl.generate(:metasploit_credential_origin_import_filename)
+            filename: FactoryBot.generate(:metasploit_credential_origin_import_filename)
           },
           manual: {user_id: user.id},
           service: {
-            module_fullname: "exploit/" + FactoryGirl.generate(:metasploit_credential_origin_service_reference_name),
+            module_fullname: "exploit/" + FactoryBot.generate(:metasploit_credential_origin_service_reference_name),
             address: service.host.address,
             port: service.port,
             service_name: service.name,
             protocol: service.proto
           },
           session: {
-            session_id: FactoryGirl.create(:mdm_session, workspace: workspace, host: service.host),
-            post_reference_name: FactoryGirl.generate(:metasploit_credential_origin_session_post_reference_name)
+            session_id: FactoryBot.create(:mdm_session, workspace: workspace, host: service.host),
+            post_reference_name: FactoryBot.generate(:metasploit_credential_origin_session_post_reference_name)
           }
         }}
         let(:login_data) {{
@@ -281,7 +281,7 @@ RSpec.describe Metasploit::Credential::Creation do
         end
       end
     end
-    
+
     {
       "Metasploit::Credential::Username" => 'admin',
       "Metasploit::Credential::BlankUsername" => ''
@@ -314,7 +314,7 @@ RSpec.describe Metasploit::Credential::Creation do
         it 'creates a Login with status for the service' do
           expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Login.where(service_id: service.id, status: login_data[:status]).count }.by(1)
         end
-      end 
+      end
     end
     {
       password: "Metasploit::Credential::Password",
@@ -364,19 +364,19 @@ RSpec.describe Metasploit::Credential::Creation do
         it 'creates a Login with status for the service' do
           expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Login.where(service_id: service.id, status: login_data[:status]).count }.by(1)
         end
-      end 
+      end
     end
   end
 
   context '#create_cracked_credential' do
-    let(:public) { FactoryGirl.create(:metasploit_credential_public) }
-    let(:hash) { FactoryGirl.create(:metasploit_credential_nonreplayable_hash) }
-    let(:origin) { FactoryGirl.create(:metasploit_credential_origin_manual) }
+    let(:public) { FactoryBot.create(:metasploit_credential_public) }
+    let(:hash) { FactoryBot.create(:metasploit_credential_nonreplayable_hash) }
+    let(:origin) { FactoryBot.create(:metasploit_credential_origin_manual) }
     let(:password) { "omgwtfbbq" }
-    let(:realm) { FactoryGirl.create(:metasploit_credential_realm) }
+    let(:realm) { FactoryBot.create(:metasploit_credential_realm) }
 
     let!(:old_core) do
-      FactoryGirl.create(:metasploit_credential_core, public: public, private: hash, realm: realm, workspace: workspace, origin: origin)
+      FactoryBot.create(:metasploit_credential_core, public: public, private: hash, realm: realm, workspace: workspace, origin: origin)
     end
 
     it 'creates a Core' do
@@ -403,11 +403,11 @@ RSpec.describe Metasploit::Credential::Creation do
     end
 
     context 'when previous core has logins' do
-      let(:host) { FactoryGirl.create(:mdm_host, workspace: workspace) }
-      let(:service) { FactoryGirl.create(:mdm_service, host: host) }
+      let(:host) { FactoryBot.create(:mdm_host, workspace: workspace) }
+      let(:service) { FactoryBot.create(:mdm_service, host: host) }
 
       before do
-        FactoryGirl.create(:metasploit_credential_login,
+        FactoryBot.create(:metasploit_credential_login,
                            service: service,
                            core: old_core,
                            status: Metasploit::Model::Login::Status::UNTRIED
@@ -545,7 +545,7 @@ RSpec.describe Metasploit::Credential::Creation do
             workspace_id: workspace.id,
             origin_type: :service
         }
-        FactoryGirl.create(:mdm_host, address: opts[:address], workspace_id: opts[:workspace_id])
+        FactoryBot.create(:mdm_host, address: opts[:address], workspace_id: opts[:workspace_id])
         expect { test_object.create_credential_origin_service(opts)}.to_not change{Mdm::Host.count }
       end
     end
@@ -576,8 +576,8 @@ RSpec.describe Metasploit::Credential::Creation do
             workspace_id: workspace.id,
             origin_type: :service
         }
-        host = FactoryGirl.create(:mdm_host, address: opts[:address], workspace_id: opts[:workspace_id])
-        FactoryGirl.create(:mdm_service, host_id: host.id, port: opts[:port], proto: opts[:protocol])
+        host = FactoryBot.create(:mdm_host, address: opts[:address], workspace_id: opts[:workspace_id])
+        FactoryBot.create(:mdm_service, host_id: host.id, port: opts[:port], proto: opts[:protocol])
         expect { test_object.create_credential_origin_service(opts)}.to_not change{Mdm::Service.count }
       end
     end
@@ -822,12 +822,12 @@ RSpec.describe Metasploit::Credential::Creation do
   end
 
   context '#create_credential_core' do
-    let(:origin)    { FactoryGirl.create(:metasploit_credential_origin_service) }
-    let(:public)    { FactoryGirl.create(:metasploit_credential_public)}
-    let(:private)   { FactoryGirl.create(:metasploit_credential_password)}
-    let(:realm)     { FactoryGirl.create(:metasploit_credential_realm)}
+    let(:origin)    { FactoryBot.create(:metasploit_credential_origin_service) }
+    let(:public)    { FactoryBot.create(:metasploit_credential_public)}
+    let(:private)   { FactoryBot.create(:metasploit_credential_password)}
+    let(:realm)     { FactoryBot.create(:metasploit_credential_realm)}
     let(:workspace) { origin.service.host.workspace }
-    let(:task)      { FactoryGirl.create(:mdm_task, workspace: workspace) }
+    let(:task)      { FactoryBot.create(:mdm_task, workspace: workspace) }
 
     it 'raises a KeyError if any required option is missing' do
       opts = {}
@@ -865,10 +865,10 @@ RSpec.describe Metasploit::Credential::Creation do
   end
 
   context '#create_credential_login' do
-    let(:workspace) { FactoryGirl.create(:mdm_workspace) }
-    let(:service) { FactoryGirl.create(:mdm_service, host: FactoryGirl.create(:mdm_host, workspace: workspace)) }
-    let(:task) { FactoryGirl.create(:mdm_task, workspace: workspace) }
-    let(:credential_core) { FactoryGirl.create(:metasploit_credential_core_manual, workspace: workspace) }
+    let(:workspace) { FactoryBot.create(:mdm_workspace) }
+    let(:service) { FactoryBot.create(:mdm_service, host: FactoryBot.create(:mdm_host, workspace: workspace)) }
+    let(:task) { FactoryBot.create(:mdm_task, workspace: workspace) }
+    let(:credential_core) { FactoryBot.create(:metasploit_credential_core_manual, workspace: workspace) }
 
     it 'creates a Metasploit::Credential::Login' do
       login_data = {
@@ -905,7 +905,7 @@ RSpec.describe Metasploit::Credential::Creation do
   context '#invalidate_login' do
 
     context 'when an untried login exists' do
-      let(:untried_login) { FactoryGirl.create(:metasploit_credential_login, status: Metasploit::Model::Login::Status::UNTRIED)}
+      let(:untried_login) { FactoryBot.create(:metasploit_credential_login, status: Metasploit::Model::Login::Status::UNTRIED)}
 
       let(:opts) {{
         address: untried_login.service.host.address.to_s,
@@ -928,16 +928,16 @@ RSpec.describe Metasploit::Credential::Creation do
 
       context 'when a login exists on the same service for a different credential' do
         let(:other_origin) {
-          FactoryGirl.create(:metasploit_credential_origin_manual)
+          FactoryBot.create(:metasploit_credential_origin_manual)
         }
         let(:other_core) {
-          FactoryGirl.create(:metasploit_credential_core,
+          FactoryBot.create(:metasploit_credential_core,
             workspace: untried_login.core.workspace,
             origin: other_origin
           )
         }
         let(:other_login) {
-          FactoryGirl.create(:metasploit_credential_login,
+          FactoryBot.create(:metasploit_credential_login,
             status: Metasploit::Model::Login::Status::UNTRIED,
             service: untried_login.service,
             core: other_core