metasploit-credential 6.0.24 → 6.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9e7598b0e2092c89cf53906e4f4a1095d8ab1a0db16909c7b6dfdb34f36126
-  data.tar.gz: 05d85b467d16961cd74ddca8d91b9a556917796d063e9220790ebbab5a8fdebf
+  metadata.gz: a24d66b6c06687dd8a034334c4456ae7734f390cac037bdc256a54fed0404e1b
+  data.tar.gz: 42ec665f5eb4d410c2da7b20a6a8bb288e0510febf87c97c03224ca5d085f74e
 SHA512:
-  metadata.gz: 29e2ef10c016b40770b87a09b91102717c8e65e47592c3774953f804ed95558020aef18abc8556218f413802afbd56798d2f5253e109b5e618de5b35cdaf0f0f
-  data.tar.gz: 9b66948b98ed071ddfe1942e73f5454ae9c9f718b352028e344aec532fa9b27f730f62024dde594174f5176d8f6dd3bb54f10649b0f90da148d13f20c8a73804
+  metadata.gz: 2e9edb1ebc543d6da43c265bd5cd5dcf1e69e30a6152808c4b113ace8977b129bbcdb90fd18c0625d8f33dcbffa179810f3b435c812298e77945568d3115397e
+  data.tar.gz: 9903ec677370e44cecd5bba7b75936d6f3dfade5baa2946d80147788da71d293f2cb32596fa38bd33e98489a628a2b540f8b3e0bddffd07c42601c01a66452ba

data/lib/metasploit/credential/creation.rb

@@ -617,16 +617,74 @@ module Metasploit::Credential::Creation
     service_name     = opts.fetch(:service_name)
     protocol         = opts.fetch(:protocol)
     workspace_id     = opts.fetch(:workspace_id)
+    resource         = opts[:resource] || {}
 
     host_object    = Mdm::Host.where(address: address, workspace_id: workspace_id).first_or_create
     service_object = Mdm::Service.where(host_id: host_object.id, port: port, proto: protocol, name: service_name).first_or_initialize
 
+    parents = process_service_chain(host_object, opts.delete(:parents)) if opts[:parents]
+    if parents
+      parents.each do |parent|
+        service_object.parents << parent if parent && !service_object.parents.include?(parent)
+      end
+    end
+
+    service_object.resource = resource
     service_object.state = "open"
     service_object.save!
 
     service_object
   end
 
+  # This is copy-pasted from Metasploit Framework (with small tweaks right now to lalow for :name and :service_name, and :proto/:protocol):
+  # https://github.com/rapid7/metasploit-framework/blob/2dcfb985ea68ba2384f5309afdc9ec1a17cb80b9/lib/msf/core/db_manager/service.rb#L193
+  # In the future, we can potentially migrate this AND the Metasploit Framework code to metasploit_data_models, so that
+  # both Framework and Credential have access to the shared code.
+  def process_service_chain(host, services)
+    return unless host.is_a?(Mdm::Host)
+
+    return if services.nil?
+
+    services = [services] unless services.is_a?(Array)
+    services.map do |service|
+      case service
+      when ::Mdm::Service
+        service_obj = service
+      when ::Hash
+        next if service[:port].nil? || service[:proto].nil?
+
+        parents = nil
+        if service[:parents]&.any?
+          parents = process_service_chain(host, service[:parents])
+        end
+
+        service_info = {
+          port: service[:port].to_i,
+          proto: service[:proto].to_s.downcase,
+        }
+        service_info[:name] = service[:name].downcase if service[:name]
+        service_info[:resource] = service[:resource] if service[:resource]
+        service_obj = host.services.find_or_create_by(service_info)
+        if service_obj.id.nil?
+          # elog("Failed to create service #{service_info.inspect} for host #{host.name} (#{host.address})")
+          return
+        end
+        service_obj.state ||= 'open'
+        service_obj.info = service[:info] ? service[:info] : ''
+
+        if parents
+          parents.each do |parent|
+            service_obj.parents << parent if parent && !service_obj.parents.include?(parent)
+          end
+        end
+      else
+        next
+      end
+
+      service_obj
+    end.compact
+  end
+
   # This method checks to see if a {Metasploit::Credential::Login} exists for a given
   # set of details. If it does exists, we then appropriately set the status to one of our
   # failure statuses.

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

@@ -211,7 +211,7 @@ class Metasploit::Credential::Exporter::Core
   def render_zip
     zip_dir_path = Pathname.new(output_final_directory_path)
 
-    Zip::File.open(output_zipfile_path, Zip::File::CREATE) do |zipfile|
+    Zip::File.open(output_zipfile_path, create: true) do |zipfile|
       Dir[File.join(output_final_directory_path, '**', '**')].each do |file|
         file_path = Pathname.new(file)
         path_in_zip = file_path.relative_path_from(zip_dir_path)

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

@@ -57,7 +57,7 @@ class Metasploit::Credential::Importer::Zip
   def import!
     ::Zip::File.open(input.path) do |zip_file|
       zip_file.each do |entry|
-        entry.extract(File.join(extracted_zip_directory, entry.name))
+        entry.extract(destination_directory: File.join(extracted_zip_directory))
       end
     end
 
@@ -80,7 +80,7 @@ class Metasploit::Credential::Importer::Zip
   # @return [void]
   def input_is_well_formed
     begin
-      Zip::File.open input.path do |archive|
+      ::Zip::File.open(input.path) do |archive|
         glob_check  = archive.glob("**#{File::SEPARATOR}#{MANIFEST_FILE_NAME}")
         if glob_check.present?
           true

data/lib/metasploit/credential/version.rb

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

data/spec/dummy/tmp/local_secret.txt

@@ -1 +1 @@
-a40adeaa65852477620cc75a2031e3330751540828be89231cc907bc82edda8d4d9f438dcf88844adc06d119dd172b75ceca305d75b355c4e8cb7532a6e7114a
+d35473b1badc957901eab5af80c9922037aa331ffa8df42e2f0287d5447dbb159cefe2b044bdcf047b03c2e3e5838bcd4c86f56e98a5ecc7735ee3c4bb63d74b

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

@@ -57,7 +57,7 @@ FactoryBot.define do
 
     # Write out zip file
     zip_location = "#{path}.zip"
-    ::Zip::File.open(zip_location, ::Zip::File::CREATE) do |zipfile|
+    ::Zip::File.open(zip_location, create: true) do |zipfile|
       Dir[File.join(path, '**', '**')].each do |file|
         zipfile.add(file.sub(path + '/', ''), file)
       end
@@ -98,7 +98,7 @@ FactoryBot.define do
 
     # Write out zip file
     zip_location = "#{path}.zip"
-    ::Zip::File.open(zip_location, ::Zip::File::CREATE) do |zipfile|
+    ::Zip::File.open(zip_location, create: true) do |zipfile|
       Dir[File.join(path, '**', '**')].each do |file|
         zipfile.add(file.sub(path + '/', ''), file)
       end
@@ -140,7 +140,7 @@ FactoryBot.define do
 
     # Write out zip file
     zip_location = "#{path}.zip"
-    ::Zip::File.open(zip_location, ::Zip::File::CREATE) do |zipfile|
+    ::Zip::File.open(zip_location, create: true) do |zipfile|
       Dir[File.join(path, '**', '**')].each do |file|
         zipfile.add(file.sub(path + '/', ''), file)
       end

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

@@ -99,13 +99,15 @@ RSpec.describe Metasploit::Credential::Migrator do
 
         context "when Cred#pass points to a file system path" do
 
-          let(:path_to_ssh_key) do
+          let(:ssh_key_tempfile) do
             t = Tempfile.new('ssh')
             t.write(ssh_key_content)
             t.close
-            t.path
+            t
           end
 
+          let(:path_to_ssh_key) { ssh_key_tempfile.path }
+
           let(:cred) do
             FactoryBot.create(:mdm_cred,
                              service: service,
@@ -114,6 +116,10 @@ RSpec.describe Metasploit::Credential::Migrator do
             )
           end
 
+          after(:example) do
+            ssh_key_tempfile.unlink
+          end
+
           before(:example) do
             migrator.convert_creds_in_workspace(cred.service.host.workspace)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-credential
 version: !ruby/object:Gem::Version
-  version: 6.0.24
+  version: 6.0.26
 platform: ruby
 authors:
 - Metasploit Hackers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-11 00:00:00.000000000 Z
+date: 2026-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-concern
@@ -84,16 +84,22 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rex-socket
   requirement: !ruby/object:Gem::Requirement