metasploit-credential 6.0.20 → 6.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29eb2adae3e354efa557b14938b7e85b7eeb44ea3bd98fdb69bbc7b8bc6efdf3
-  data.tar.gz: 425f101cb90ce6620e61bbed4e786f7e750e1d823ede8e2c0ab55362f836f162
+  metadata.gz: 8812bdc403724cf3a31080fa3de9e8c2ff95a1d8b792c29c047d1ba693c40286
+  data.tar.gz: 203337f164044196d492582a5d99b498d31a5afc0b17b6eb72fa5c55c48b3e52
 SHA512:
-  metadata.gz: 11b80697bd98c100da4d8208db64d4a111afa01bfd33f9c68e821caf5232317aa44828073648ac1a03f806afc07759f36be594306a13a6552687bbbb13696754
-  data.tar.gz: ce6337b1cdcdef9cab14d9f37b15fee1d7515cc503b57ad2d39febd02ad1177c54d997ee8bbd967a3a33a7382ff0df87030e357aaa499a98bbbbd3c02770027d
+  metadata.gz: a47718c56eef2fbfff45374bd73cb1f83026476c9a6aa77178aedfa05ee3cfe0c78d05e39cbc619d6f25bf33d845f07b39d4ce15f6e60c56268f26a48c9a8c3c
+  data.tar.gz: c7c22d92745f28b54226f47f11c91dcfdb2a893698228b3e96620cf324d514e2a38d26ddbba620148ecb6135511a55f252ca3ee06f124bd7ff5e1b2a3ad25671

data/lib/metasploit/credential/creation.rb

@@ -413,6 +413,8 @@ module Metasploit::Credential::Creation
   # If there is not a matching `Mdm::Host` it will create it. If there is not a matching
   # `Mdm::Service` it will create that too.
   #
+  # @option opts [Mdm::Service] :service The service to use instead of creating one
+  # @option opts [Fixnum] :service_id The ID of the `Mdm::Service` to link this Origin to
   # @option opts [String] :address The address of the `Mdm::Host` to link this Origin to
   # @option opts [Fixnum] :port The port number of the `Mdm::Service` to link this Origin to
   # @option opts [String] :service_name The service name to use for the `Mdm::Service`
@@ -423,8 +425,13 @@ module Metasploit::Credential::Creation
   # @return [Metasploit::Credential::Origin::Service] The created {Metasploit::Credential::Origin::Service} object
   def create_credential_origin_service(opts={})
     return nil unless active_db?
+
     module_fullname  = opts.fetch(:module_fullname)
-    service_object = create_credential_service(opts)
+    if (service_id = opts[:service_id] || opts[:service].try(:id))
+      service_object = Mdm::Service.where(id: service_id).first
+    else
+      service_object = create_credential_service(opts)
+    end
     return nil if service_object.nil?
 
     retry_transaction do

data/lib/metasploit/credential/version.rb

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

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

@@ -652,6 +652,49 @@ RSpec.describe Metasploit::Credential::Creation do
         expect{ test_object.create_credential_origin_service(opts)}.to raise_error KeyError
       end
     end
+
+    context 'when :service is provided' do
+      it 'uses the given service object and does not create a new Mdm::Service' do
+        host = FactoryBot.create(:mdm_host, workspace: workspace)
+        existing_service = FactoryBot.create(:mdm_service, host: host)
+        opts = {
+          service: existing_service,
+          module_fullname: 'auxiliary/scanner/smb/smb_login',
+          origin_type: :service
+        }
+        expect { test_object.create_credential_origin_service(opts) }.to_not change { Mdm::Service.count }
+        origin = test_object.create_credential_origin_service(opts)
+        expect(origin.service_id).to eq(existing_service.id)
+      end
+    end
+
+    context 'when :service_id is provided' do
+      context 'and the ID corresponds to an existing Mdm::Service' do
+        it 'uses that service and does not create a new Mdm::Service' do
+          host = FactoryBot.create(:mdm_host, workspace: workspace)
+          existing_service = FactoryBot.create(:mdm_service, host: host)
+          opts = {
+            service_id: existing_service.id,
+            module_fullname: 'auxiliary/scanner/smb/smb_login',
+            origin_type: :service
+          }
+          expect { test_object.create_credential_origin_service(opts) }.to_not change { Mdm::Service.count }
+          origin = test_object.create_credential_origin_service(opts)
+          expect(origin.service_id).to eq(existing_service.id)
+        end
+      end
+
+      context 'and the ID does not correspond to an existing Mdm::Service' do
+        it 'returns nil' do
+          opts = {
+            service_id: 0,
+            module_fullname: 'auxiliary/scanner/smb/smb_login',
+            origin_type: :service
+          }
+          expect(test_object.create_credential_origin_service(opts)).to be_nil
+        end
+      end
+    end
   end
 
   context '#create_credential_origin_session' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-credential
 version: !ruby/object:Gem::Version
-  version: 6.0.20
+  version: 6.0.21
 platform: ruby
 authors:
 - Metasploit Hackers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-09 00:00:00.000000000 Z
+date: 2026-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-concern