metasploit_data_models 6.0.5 → 6.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0f6a352c3f586ad9ebcd620dcf0f581006b2ea32e63588d3f17bd3933009c76
-  data.tar.gz: 350592d2f75705120a89a8893d02d8414c78704ccdf284f80ca563931659a920
+  metadata.gz: f40cd6914e210d182f683f528eb8af20e813821d9f7d6c17b0c942ad7b3f5f13
+  data.tar.gz: 036f11d4a71fc2269462be6133ad5234475d41e914e26a651ac8e2e26543b9cc
 SHA512:
-  metadata.gz: 2ea341d26e26025d795a1cad1856c965fe2cec748245da1cab188f91152a7f1c2445ab5111807f6c62a3b58070783228027778592ea0fbc59db26d0b2aa633df
-  data.tar.gz: 68394ec5e5127a4f5ef1e3c395e80c732a8e117cd4b488a5d3e98fa38f53c6a8f7f215a22857abfdb273ba2e3b2f51b5f378d8ca24c5b52b99a8b63d5e0abeb7
+  metadata.gz: 252a1fc665e44c1487479f1870a4ad0fccb8512f107b5feac8898ec6e07f3f9433be3883c5ac2e44d6f40a986bf985d4792a0a0b43a1479fb569acbc5955207e
+  data.tar.gz: bdd04378b8f40a80336790223c87a162bf2b5a9ff1dfef6d531581ef86c59459063e4562624ac7d2ddb8d5a3ac28d09e3c8bedc9e2435044a68b26ff7038f781

data/Gemfile

@@ -11,15 +11,14 @@ end
 
 # used by dummy application
 group :development, :test do
-  # Upload coverage reports to coveralls.io
-  gem 'coveralls', require: false
   # supplies factories for producing model instance for specs
   # Version 4.1.0 or newer is needed to support generate calls without the 'FactoryBot.' in factory definitions syntax.
   gem 'factory_bot'
   # auto-load factories from spec/factories
   gem 'factory_bot_rails'
 
-  gem 'rails', '~>  7.0'
+  # Enforce tests to run on 7.0.X
+  gem 'rails', '~>  7.0.0'
   gem 'net-smtp', require: false
 
   # Used to create fake data

data/README.md

@@ -1,4 +1,4 @@
-#MetasploitDataModels [![Build Status](https://travis-ci.org/rapid7/metasploit_data_models.png)](https://travis-ci.org/rapid7/metasploit_data_models)[![Code Climate](https://codeclimate.com/github/rapid7/metasploit_data_models.png)](https://codeclimate.com/github/rapid7/metasploit_data_models)[![Coverage Status](https://coveralls.io/repos/rapid7/metasploit_data_models/badge.png)](https://coveralls.io/r/rapid7/metasploit_data_models)[![Dependency Status](https://gemnasium.com/rapid7/metasploit_data_models.png)](https://gemnasium.com/rapid7/metasploit_data_models)[![Gem Version](https://badge.fury.io/rb/metasploit_data_models.png)](http://badge.fury.io/rb/metasploit_data_models)
+#MetasploitDataModels [![Build Status](https://travis-ci.org/rapid7/metasploit_data_models.png)](https://travis-ci.org/rapid7/metasploit_data_models)[![Code Climate](https://codeclimate.com/github/rapid7/metasploit_data_models.png)](https://codeclimate.com/github/rapid7/metasploit_data_models)[![Dependency Status](https://gemnasium.com/rapid7/metasploit_data_models.png)](https://gemnasium.com/rapid7/metasploit_data_models)[![Gem Version](https://badge.fury.io/rb/metasploit_data_models.png)](http://badge.fury.io/rb/metasploit_data_models)
 
 Part of Metasploit's database layer
 

data/app/models/mdm/event.rb

@@ -73,9 +73,9 @@ class Mdm::Event < ApplicationRecord
   #
   # @return [Hash]
   if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
-    serialize :info, coder: MetasploitDataModels::Base64Serializer.new
+    serialize :info, coder: MetasploitDataModels::Base64Serializer.new(coerce: true)
   else
-    serialize :info, MetasploitDataModels::Base64Serializer.new
+    serialize :info, MetasploitDataModels::Base64Serializer.new(coerce: true)
   end
 
   #

data/app/models/mdm/listener.rb

@@ -70,9 +70,9 @@ class Mdm::Listener < ApplicationRecord
   #
   # @return [Hash]
   if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
-    serialize :options, coder: MetasploitDataModels::Base64Serializer.new
+    serialize :options, coder: MetasploitDataModels::Base64Serializer.new(coerce: true)
   else
-    serialize :options, MetasploitDataModels::Base64Serializer.new
+    serialize :options, MetasploitDataModels::Base64Serializer.new(coerce: true)
   end
 
   #

data/app/models/mdm/payload.rb

@@ -92,10 +92,18 @@ class Mdm::Payload < ApplicationRecord
 
   #
   # Serializations
-  #
 
-  serialize :urls
-  serialize :build_opts
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :urls, coder: YAML
+  else
+    serialize :urls
+  end
+
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :build_opts, coder: YAML
+  else
+    serialize :build_opts
+  end
 
   public
 

data/app/models/mdm/session.rb

@@ -173,9 +173,9 @@ class Mdm::Session < ApplicationRecord
   #
 
   if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
-    serialize :datastore, coder: ::MetasploitDataModels::Base64Serializer.new
+    serialize :datastore, coder: ::MetasploitDataModels::Base64Serializer.new(coerce: true)
   else
-    serialize :datastore, ::MetasploitDataModels::Base64Serializer.new
+    serialize :datastore, ::MetasploitDataModels::Base64Serializer.new(coerce: true)
   end
 
   # Returns whether the session can be upgraded to a meterpreter session from a shell session on Windows.

data/app/models/mdm/task.rb

@@ -131,27 +131,27 @@ class Mdm::Task < ApplicationRecord
   #
   # @return [Hash]
   if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
-    serialize :options, coder: MetasploitDataModels::Base64Serializer.new
+    serialize :options, coder: MetasploitDataModels::Base64Serializer.new(coerce: true)
   else
-    serialize :options, MetasploitDataModels::Base64Serializer.new
+    serialize :options, MetasploitDataModels::Base64Serializer.new(coerce: true)
   end
 
   # Result of task running.
   #
   # @return [Hash]
   if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
-    serialize :result, coder: MetasploitDataModels::Base64Serializer.new
+    serialize :result, coder: MetasploitDataModels::Base64Serializer.new(coerce: true)
   else
-    serialize :result, MetasploitDataModels::Base64Serializer.new
+    serialize :result, MetasploitDataModels::Base64Serializer.new(coerce: true)
   end
 
   # Settings used to configure this task outside of the {#options module options}.
   #
   # @return [Hash]
   if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
-    serialize :settings, coder: MetasploitDataModels::Base64Serializer.new
+    serialize :settings, coder: MetasploitDataModels::Base64Serializer.new(coerce: true)
   else
-    serialize :settings, MetasploitDataModels::Base64Serializer.new
+    serialize :settings, MetasploitDataModels::Base64Serializer.new(coerce: true)
   end
 
   #

data/app/models/mdm/web_vuln.rb

@@ -142,9 +142,9 @@ class Mdm::WebVuln < ApplicationRecord
   #
   #   @return [Array<Array(String, String)>] Array of parameter key value pairs
   if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
-    serialize :params, coder: MetasploitDataModels::Base64Serializer.new(:default => DEFAULT_PARAMS)
+    serialize :params, coder: MetasploitDataModels::Base64Serializer.new(default: DEFAULT_PARAMS)
   else
-    serialize :params, MetasploitDataModels::Base64Serializer.new(:default => DEFAULT_PARAMS)
+    serialize :params, MetasploitDataModels::Base64Serializer.new(default: DEFAULT_PARAMS)
   end
 
   #

data/cortex.yaml

@@ -10,6 +10,8 @@ info:
   x-cortex-type: service
   x-cortex-domain-parents:
   - tag: metasploit
+  x-cortex-groups:
+  - exposure:external-ship
 openapi: 3.0.1
 servers:
 - url: "/"

data/db/migrate/20110317144932_add_session_table.rb

@@ -1,7 +1,11 @@
 class AddSessionTable < ActiveRecord::Migration[4.2]
 
 	class Event < ApplicationRecord
-		serialize :info
+		if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+			serialize :info, coder: YAML
+		else
+			serialize :info
+		end
 	end
 
 	class SessionEvent < ApplicationRecord
@@ -10,7 +14,11 @@ class AddSessionTable < ActiveRecord::Migration[4.2]
 
 	class Session < ApplicationRecord
 		has_many :events, :class_name => 'AddSessionTable::SessionEvent'
-		serialize :datastore
+		if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+			serialize :datastore, coder: YAML
+		else
+			serialize :datastore
+		end
 	end
 
 	def self.up

data/db/migrate/20110422000000_convert_binary.rb

@@ -3,11 +3,19 @@ class ConvertBinary < ActiveRecord::Migration[4.2]
 
 
 	class WebPage < ApplicationRecord
-		serialize :headers
+		if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+			serialize :headers, coder: YAML
+		else
+			serialize :headers
+		end
 	end
 
 	class WebVuln < ApplicationRecord
-		serialize :params
+		if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+			serialize :params, coder: YAML
+		else
+			serialize :params
+		end
 	end
 
 	def bfilter(str)

data/lib/metasploit_data_models/base64_serializer.rb

@@ -15,6 +15,10 @@ class MetasploitDataModels::Base64Serializer
 
   # The default for {#default}
   DEFAULT = {}
+
+  # The default for {#coerce}
+  COERCE_DEFAULT = false
+
   # Deserializers for {#load}
   # 1. Base64 decoding and then unmarshalling the value.
   # 2. Parsing the value as YAML.
@@ -47,6 +51,24 @@ class MetasploitDataModels::Base64Serializer
   end
 
   attr_writer :default
+  attr_writer :coerce
+
+  # Recursively coerce the object that has been passed in, keeping primitive types as their original type,
+  # while changing objects that cannot be serialized into a string representation of the object data.
+  def coerce_object(value)
+    case value
+    when Hash
+      value.transform_values { |v| coerce_object(v) }
+    when Array
+      value.map { |v| coerce_object(v) }
+    when File, IO
+      value.inspect
+    when String, Integer, Float, TrueClass, FalseClass, NilClass, Symbol
+      value
+    else
+      value.to_s
+    end
+  end
 
   # Serializes the value by marshalling the value and then base64 encodes the marshaled value.
   #
@@ -54,7 +76,8 @@ class MetasploitDataModels::Base64Serializer
   # @return [String]
   def dump(value)
     # Always store data back in the Marshal format
-    marshalled = Marshal.dump(value)
+    to_serialize = @coerce ? coerce_object(value) : value
+    marshalled = Marshal.dump(to_serialize)
     base64_encoded = [ marshalled ].pack('m')
 
     base64_encoded
@@ -63,9 +86,10 @@ class MetasploitDataModels::Base64Serializer
   # @param attributes [Hash] attributes
   # @option attributes [Object] :default ({}) Value to use for {#default}.
   def initialize(attributes={})
-    attributes.assert_valid_keys(:default)
+    attributes.assert_valid_keys(:default, :coerce)
 
     @default = attributes.fetch(:default, DEFAULT)
+    @coerce = attributes.fetch(:coerce, COERCE_DEFAULT)
   end
 
   # Deserializes the value by either

data/lib/metasploit_data_models/version.rb

@@ -1,6 +1,6 @@
 module MetasploitDataModels
   # VERSION is managed by GemRelease
-  VERSION = '6.0.5'
+  VERSION = '6.0.7'
 
   # @return [String]
   #

data/spec/app/models/mdm/payload_spec.rb

@@ -0,0 +1,45 @@
+RSpec.describe Mdm::Payload, type: :model do
+  it_should_behave_like 'Metasploit::Concern.run'
+
+  context 'factory' do
+    it 'should be valid' do
+      mdm_payload = FactoryBot.build(:mdm_payload)
+      expect(mdm_payload).to be_valid
+    end
+  end
+
+  context 'database' do
+
+    context 'timestamps'do
+      it { is_expected.to have_db_column(:created_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:updated_at).of_type(:datetime) }
+    end
+
+    context 'columns' do
+      it { is_expected.to have_db_column(:name).of_type(:string) }
+      it { is_expected.to have_db_column(:uuid).of_type(:string) }
+      it { is_expected.to have_db_column(:uuid_mask).of_type(:integer) }
+      it { is_expected.to have_db_column(:timestamp).of_type(:integer) }
+      it { is_expected.to have_db_column(:arch).of_type(:string) }
+      it { is_expected.to have_db_column(:platform).of_type(:string) }
+      it { is_expected.to have_db_column(:urls).of_type(:string) }
+      it { is_expected.to have_db_column(:description).of_type(:string) }
+      it { is_expected.to have_db_column(:raw_payload).of_type(:string) }
+      it { is_expected.to have_db_column(:raw_payload_hash).of_type(:string) }
+      it { is_expected.to have_db_column(:build_status).of_type(:string) }
+      it { is_expected.to have_db_column(:build_opts).of_type(:string) }
+    end
+  end
+
+  context '#destroy' do
+    it 'should successfully destroy the object' do
+      payload = FactoryBot.create(:mdm_payload)
+      expect {
+        payload.destroy
+      }.to_not raise_error
+      expect {
+        payload.reload
+      }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+  end
+end

data/spec/dummy/config/application.rb

@@ -1,5 +1,6 @@
 require File.expand_path('../boot', __FILE__)
-
+require "logger"
+require "active_support"
 require 'rails/all'
 
 Bundler.require(*Rails.groups)

data/spec/factories/mdm/payloads.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :mdm_payload, :aliases => [:payload], :class => Mdm::Payload do
+    #
+    # Associations
+    #
+  end
+end

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ Bundler.setup(:default, :test)
 # Require simplecov before loading ..dummy/config/environment.rb because it will cause metasploit_data_models/lib to
 # be loaded, which would result in Coverage not recording hits for any of the files.
 require 'simplecov'
-require 'coveralls'
 
 # if ENV['TRAVIS'] == 'true'
 #   # don't generate local report as it is inaccessible on travis-ci, which is why coveralls is being used.

metadata

@@ -1,40 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 6.0.5
+  version: 6.0.7
 platform: ruby
 authors:
 - Metasploit Hackers
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIERDCCAqygAwIBAgIBATANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBttc2Zk
-  ZXYvREM9bWV0YXNwbG9pdC9EQz1jb20wHhcNMjMxMDMwMTYwNDI1WhcNMjUxMDI5
-  MTYwNDI1WjAmMSQwIgYDVQQDDBttc2ZkZXYvREM9bWV0YXNwbG9pdC9EQz1jb20w
-  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDZN/EKv+yVjwiKWvjAVhjF
-  aWNYI0E9bJ5d1qKd29omRYX9a+OOKBCu5+394fyF5RjwU4mYGr2iopX9ixRJrWXH
-  ojs70tEvV1CmvP9rhz7JKzQQoJOkinrz4d+StIylxVxVdgm7DeiB3ruTwvl7qKUv
-  piWzhrBFiVU6XIEAwq6wNEmnv2D+Omyf4h0Tf99hc6G0QmBnU3XydqvnZ+AzUbBV
-  24RH3+NQoigLbvK4M5aOeYhk19di58hznebOw6twHzNczshrBeMFQp985ScNgsvF
-  rL+7HNNwpcpngERwZfzDNn7iYN5X3cyvTcykShtsuPMa5zXsYo42LZrsTF87DW38
-  D8sxL6Dgdqu25Mltdw9m+iD4rHSfb1KJYEoNO+WwBJLO2Y4d6G1CR66tVeWsZspb
-  zneOVC+sDuil7hOm+6a7Y2yrrRyT6IfL/07DywjPAIRUp5+Jn8ZrkWRNo2AOwWBG
-  k5gz7SfJPHuyVnPlxoMA0MTFCUnnnbyHu882TGoJGgMCAwEAAaN9MHswCQYDVR0T
-  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFIQfNa4E889ZE334cwU7eNu2hScH
-  MCAGA1UdEQQZMBeBFW1zZmRldkBtZXRhc3Bsb2l0LmNvbTAgBgNVHRIEGTAXgRVt
-  c2ZkZXZAbWV0YXNwbG9pdC5jb20wDQYJKoZIhvcNAQELBQADggGBAMfzvKcV27p7
-  pctmpW2JmIXLMrjNLyGJAxELH/t9pJueXdga7uj2fJkYQDbwGw5x4MGyFqhqJLH4
-  l/qsUF3PyAXDTSWLVaqXQVWO+IIHxecG0XjPXTNudzMU0hzqbqiBKvsW7/a3V5BP
-  SWlFzrFkoXWlPouFpoakyYMJjpW4SGdPzRv7pM4OhXtkXpHiRvx5985FrHgHlI89
-  NSIuIUbp8zqk4hP1i9MV0Lc/vTf2gOmo+RHnjqG1NiYfMCYyY/Mcd4W36kGOl468
-  I8VDTwgCufkAzFu7BJ5yCOueqtDcuq+d3YhAyU7NI4+Ja8EwazOnB+07sWhKpg7z
-  yuQ1mWYPmZfVQpoSVv1CvXsoqJYXVPBBLOacKKSj8ArVG6pPn9Bej7IOQdblaFjl
-  DgscAao7wB3xW2BWEp1KnaDWkf1x9ttgoBEYyuYwU7uatB67kBQG1PKvLt79wHvz
-  Dxs+KOjGbBRfMnPgVGYkORKVrZIwlaboHbDKxcVW5xv+oZc7KYXWGg==
-  -----END CERTIFICATE-----
-date: 2024-06-12 00:00:00.000000000 Z
+cert_chain: []
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
@@ -268,7 +242,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
 - ".github/workflows/verify.yml"
 - ".gitignore"
 - ".rspec"
@@ -544,6 +517,7 @@ files:
 - spec/app/models/mdm/module/target_spec.rb
 - spec/app/models/mdm/nexpose_console_spec.rb
 - spec/app/models/mdm/note_spec.rb
+- spec/app/models/mdm/payload_spec.rb
 - spec/app/models/mdm/profile_spec.rb
 - spec/app/models/mdm/ref_spec.rb
 - spec/app/models/mdm/route_spec.rb
@@ -662,6 +636,7 @@ files:
 - spec/factories/mdm/module/targets.rb
 - spec/factories/mdm/nexpose_consoles.rb
 - spec/factories/mdm/notes.rb
+- spec/factories/mdm/payloads.rb
 - spec/factories/mdm/refs.rb
 - spec/factories/mdm/routes.rb
 - spec/factories/mdm/services.rb
@@ -710,7 +685,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - app/models
@@ -727,8 +702,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.24
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Database code for MSF and Metasploit Pro
 test_files: []

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data.tar.gz.sig

@@ -1,2 +0,0 @@
-jUU?0��c�K��6��s�z�b�nb��7�*T7�~�v_�&~��V�;w�1,E\h�|���_��~��d���7�wt0x7���}��Ÿ��ե�q.��2��������5N��|��%X��e��� 	�AE�n��ِ<r
-��_���Hu����a��rc�����c��I!��9Ba6L�p
���

metadata.gz.sig

@@ -1,2 +0,0 @@
-�?���Ѧ"��~δ��ݮ-͍}�j軠=yE:��*dߓ��S/Ն��84�o�oh�3h�y#z�i�~O�eC��2���+�O�������&����9A�e�nU���(��Ɵ)4Qp�6��
-�3O1�m�U��n���Ig�̋S;2�t�i�\̔��X���]��C���Ʌ�J�ʬv��j�9[~��P^[��h�-N��2H�M`&��eD��}�����&]l"�z��|Y�F['D��B��Y