metasploit-credential 5.0.3 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c30255adfe87ad5c2e2ff459e86629696de47102735fdc9ba94263d686e6d37
-  data.tar.gz: fa2a50d36ab8cf89240765b1bf4ec7d43aa05bdd98ea3a95db49259254798727
+  metadata.gz: 86a500eec0075de53cd66a150f8ac92c5ff93cb7a86deba97d7232704ad61683
+  data.tar.gz: 73e8dae5337c8608070417445ec99fb4b5e1de340baab42a8d723a7ecb262a61
 SHA512:
-  metadata.gz: c23dd9a56fe58ba521f4aef6e084fde11c636d8574a29eb4a2c5b36caa3dddaff4aab3427c27a9069abf4ad738918c0274fd2a4297722b649a5a7f7fab1785e6
-  data.tar.gz: d0fcdb1ad1641688a44ba55e5b6170b534e6881677c482973587facff9460098cfeeb30b48b0262b194f9e90fa572ea673ad93a39462d00cee3442b9ba2d00da
+  metadata.gz: 1cca1af29a6b39d79be942d49f21377f127f881c344b9827765f1d54da2d41e16a94b8d706ff5234bf47d65cc9c8058fd2367f3c0731db19f1383b319882ec07
+  data.tar.gz: 6f1ee1774ce0215d50af37b9e861fdedc41bf056c9e47621cd21b3c3914fa8044515227112a12802f1e5b1c4a80ab61f714b073c7f92aa2fd0681650e9be2618

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

data/spec/dummy/config/database.yml

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

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.3
+  version: 5.0.6
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-concern