metasploit-credential 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8c662ab01206eb5505e4547ea2d0d092ef9a5dcd53b3e3d7a3f0e24080bc080
-  data.tar.gz: 412d0c389cd2157da7e1594b4ed4f71cd97cd212673b52027a07fbb5dabbe266
+  metadata.gz: f619d2601985401f78215f264a5ca6b35e30395e76e118f00fbb2a19ff0be1d6
+  data.tar.gz: b85fbfcc6cb48a360b0baff638f79573c307cb1e6efd81f82ed8d2eb505fc998
 SHA512:
-  metadata.gz: cf857bc495a3084d6d092bcd47bcefc77774e40a681d299ab6e9f63249f1095dfb8c8c5938663bbf060720ad0fac7716bd30536581b821801e8278c3c618c7ba
-  data.tar.gz: b1296d879cfec2c95064f0fc38f46ab513cc7de077bfaeebd1c63a4b16383ec6b26a04a384eb95f180a4b419523e19a6864345c78cbd605f2901942fd68be97c
+  metadata.gz: e4b97eda489cf82ea347c190bb152aa04a33760bcfb2c77c898b82d378beadb3ad5ece4306acdc9b7c305b01a7c2ef25aed233eb46621a8e2495adb2d49b67de
+  data.tar.gz: 93ef61cbb0e3735e39dff2e91d21c8d28f09d0d9261150f199c38288fd5c66114966194db54a14386096b1db7b1ef735fd9c225ee8a2f9392daee646993f8526

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.4'
+    VERSION = '5.0.5'
 
     # @return [String]
     #

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
 

metadata

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