metasploit-credential 5.0.1 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b932c2f8d79211f33e2c9bd9f2a204ec7125643c947b7c12a421ee109ca1e59f
-  data.tar.gz: fef429c0afa6ff9e3a26687f807818b8f81960c10355d30d2dc06393b307abc2
+  metadata.gz: f619d2601985401f78215f264a5ca6b35e30395e76e118f00fbb2a19ff0be1d6
+  data.tar.gz: b85fbfcc6cb48a360b0baff638f79573c307cb1e6efd81f82ed8d2eb505fc998
 SHA512:
-  metadata.gz: 17f14fb888f0c03a0241238b9a2163e4ca4b5541d113177129039c6854571049e888770e8365eb70d372e0bee44d1a63ce8001dbf3d4b3e45332cef1ac552d17
-  data.tar.gz: e196fb2ec75ef16e337d80fde2a589d12c86c425e63b38561624650441941d68c548b7fbd95159e4939aa6cdfffe1ea816cc44ca8fde78130b25a20cc539aaef
+  metadata.gz: e4b97eda489cf82ea347c190bb152aa04a33760bcfb2c77c898b82d378beadb3ad5ece4306acdc9b7c305b01a7c2ef25aed233eb46621a8e2495adb2d49b67de
+  data.tar.gz: 93ef61cbb0e3735e39dff2e91d21c8d28f09d0d9261150f199c38288fd5c66114966194db54a14386096b1db7b1ef735fd9c225ee8a2f9392daee646993f8526

data/app/models/metasploit/credential/core.rb

@@ -52,6 +52,7 @@ class Metasploit::Credential::Core < ApplicationRecord
   #   @return [Metasploit::Credential::Private, nil]
   belongs_to :private,
              class_name: 'Metasploit::Credential::Private',
+             optional: true,
              inverse_of: :cores
 
   # @!attribute public
@@ -60,6 +61,7 @@ class Metasploit::Credential::Core < ApplicationRecord
   #   @return [Metasploit::Credential::Public, nil]
   belongs_to :public,
              class_name: 'Metasploit::Credential::Public',
+             optional: true,
              inverse_of: :cores
 
   # @!attribute realm
@@ -69,6 +71,7 @@ class Metasploit::Credential::Core < ApplicationRecord
   #   @return [Metasploit::Credential::Realm, nil]
   belongs_to :realm,
              class_name: 'Metasploit::Credential::Realm',
+             optional: true,
              inverse_of: :cores
 
   # @!attribute workspace
@@ -205,7 +208,7 @@ class Metasploit::Credential::Core < ApplicationRecord
   scope :originating_host_id, ->(host_id) {
     where(
       Metasploit::Credential::Core[:id].in(
-        Metasploit::Credential::Core.cores_from_host(host_id)
+        self.cores_from_host(host_id)
       )
     )
   }

data/app/models/metasploit/credential/origin/import.rb

@@ -19,6 +19,7 @@ class Metasploit::Credential::Origin::Import < ApplicationRecord
   #   @return [Mdm::Task]
   belongs_to :task,
              class_name: 'Mdm::Task',
+             optional: true,
              inverse_of: :import_credential_origins
 
   #

data/app/models/metasploit/credential/ssh_key.rb

@@ -110,7 +110,7 @@ class Metasploit::Credential::SSHKey < Metasploit::Credential::Private
       begin
         openssl_pkey_pkey
       rescue ArgumentError, OpenSSL::PKey::PKeyError => error
-        errors[:data] << "#{error.class} #{error}"
+        errors.add(:data, "#{error.class} #{error}")
       end
     end
   end

data/lib/metasploit/credential/importer/core.rb

@@ -224,7 +224,7 @@ class Metasploit::Credential::Importer::Core
       end
       if all_creds_valid
         core_opts.each do |item|
-          if Metasploit::Credential::Core.where(public: item[:public], private: item[:private]).blank?
+          if Metasploit::Credential::Core.where(origin: item[:origin], workspace_id: item[:workspace_id], public: item[:public], private: item[:private]).blank?
             create_credential_core(item)
           end
         end

data/lib/metasploit/credential/version.rb

@@ -3,7 +3,7 @@
 module Metasploit
   module Credential
     # VERSION is managed by GemRelease
-    VERSION = '5.0.1'
+    VERSION = '5.0.5'
 
     # @return [String]
     #

data/spec/dummy/config/database.yml

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

data/spec/lib/metasploit/credential/importer/core_spec.rb

@@ -215,6 +215,31 @@ RSpec.describe Metasploit::Credential::Importer::Core do
           expect{core_csv_importer.import!}.to change(Metasploit::Credential::Core, :count).from(1).to(2)
         end
       end
+
+      describe "when the data in the CSV contains a duplicate from another workspace" do
+        let(:preexisting_cred_data) do
+          core_csv_importer.csv_object.gets
+          row = core_csv_importer.csv_object.first
+          core_csv_importer.csv_object.rewind
+          {
+            username: row['username'],
+            private_data: row['private_data'],
+          }
+        end
+
+        before(:example) do
+          core         = Metasploit::Credential::Core.new
+          core.public  = FactoryBot.create(:metasploit_credential_username, username: preexisting_cred_data[:username])
+          core.private = FactoryBot.create(:metasploit_credential_password, data: preexisting_cred_data[:private_data])
+          core.origin  = FactoryBot.create(:metasploit_credential_origin_import)
+          core.workspace = FactoryBot.create(:mdm_workspace)
+          core.save!
+        end
+
+        it 'should create a new Metasploit::Credential::Core for each row in the import' do
+          expect{core_csv_importer.import!}.to change(Metasploit::Credential::Core, :count).from(1).to(3)
+        end
+      end
     end
   end
 

data/spec/models/metasploit/credential/core_spec.rb

@@ -72,9 +72,9 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
     it { is_expected.to have_and_belong_to_many(:tasks).class_name('Mdm::Task') }
     it { is_expected.to have_many(:logins).class_name('Metasploit::Credential::Login').dependent(:destroy) }
     it { is_expected.to belong_to(:origin) }
-    it { is_expected.to belong_to(:private).class_name('Metasploit::Credential::Private') }
-    it { is_expected.to belong_to(:public).class_name('Metasploit::Credential::Public') }
-    it { is_expected.to belong_to(:realm).class_name('Metasploit::Credential::Realm') }
+    it { is_expected.to belong_to(:private).optional.class_name('Metasploit::Credential::Private') }
+    it { is_expected.to belong_to(:public).optional.class_name('Metasploit::Credential::Public') }
+    it { is_expected.to belong_to(:realm).optional.class_name('Metasploit::Credential::Realm') }
     it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
   end
 

data/spec/models/metasploit/credential/origin/import_spec.rb

@@ -3,7 +3,7 @@ RSpec.describe Metasploit::Credential::Origin::Import, type: :model do
 
   context 'associations' do
     it { is_expected.to have_many(:cores).class_name('Metasploit::Credential::Core').dependent(:destroy) }
-    it { is_expected.to belong_to(:task).class_name('Mdm::Task') }
+    it { is_expected.to belong_to(:task).optional.class_name('Mdm::Task') }
   end
 
   context 'database' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-credential
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.5
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-concern