metasploit_data_models 6.0.4 → 6.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01f5880c5ba12f39dc6eeddebb5cccea705bc826fdb638f890aa56d910284e56
-  data.tar.gz: 2173e9f9c5579a0ae4e1cdfa5be1500e8b35f46c0020d65d15d337252ac9e590
+  metadata.gz: 8729f3b36a9dba01a242ef1771a411729d487ea4a46cdef91738089c9d6844dc
+  data.tar.gz: 7cf123db2f63c885f9b6ba349310a93f14ce594929975df5d83b5dc0376757b3
 SHA512:
-  metadata.gz: ebd5f964a69477d7f9073b036745b37da6bf7c00f1b99f2c107a2a29f846dac0f2fbf3d621757cf6be815c568d03bbbe300bef1649326322b1a07562c07524b6
-  data.tar.gz: 0ec664ac1662f3575c7e40de104cc9b3dba9d81438e193f70e9e791bbce62635ab3e3151ebe3ba975c2268c2298e5200cc8dde32b78b63a574e8316c33cd3385
+  metadata.gz: 27a0720202b2b0b528ad7018fedbe095432f36be5fc2a3c8f6adc3f7aead9465930fdf0a0a69d373bdf83070a824a8e10b2ce0ce812f7e3f72c801920fe14b76
+  data.tar.gz: 6c8e79021ddb0d9b9cefbd1944f2b6d1f92c2dd51866373975996a7ea4c18c058e0acfc7b4c8b6283425def448a75956bced3fa9343b4716d5c333f44da6a3e8

data/app/models/mdm/event.rb

@@ -72,7 +72,11 @@ class Mdm::Event < ApplicationRecord
   # {#name}-specific information about this event.
   #
   # @return [Hash]
-  serialize :info, coder: MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :info, coder: MetasploitDataModels::Base64Serializer.new(coerce: true)
+  else
+    serialize :info, MetasploitDataModels::Base64Serializer.new(coerce: true)
+  end
 
   #
   # Validations

data/app/models/mdm/listener.rb

@@ -69,7 +69,11 @@ class Mdm::Listener < ApplicationRecord
   # Options used to spawn this listener.
   #
   # @return [Hash]
-  serialize :options, coder: MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :options, coder: MetasploitDataModels::Base64Serializer.new(coerce: true)
+  else
+    serialize :options, MetasploitDataModels::Base64Serializer.new(coerce: true)
+  end
 
   #
   # Validations

data/app/models/mdm/loot.rb

@@ -140,7 +140,11 @@ class Mdm::Loot < ApplicationRecord
   # Serializations
   #
 
-  serialize :data, coder: MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :data, coder: MetasploitDataModels::Base64Serializer.new
+  else
+    serialize :data, MetasploitDataModels::Base64Serializer.new
+  end
 
   private
 

data/app/models/mdm/macro.rb

@@ -39,12 +39,20 @@ class Mdm::Macro < ApplicationRecord
   #
   # @return [Array<Hash{Symbol=>Object}>] Array of action hashes.  Each action hash is have key :module with value
   #   of an {Mdm::Module::Detail#fullname} and and key :options with value of options used to the run the module.
-  serialize :actions, coder: MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :actions, coder: MetasploitDataModels::Base64Serializer.new
+  else
+    serialize :actions, MetasploitDataModels::Base64Serializer.new
+  end
 
   # Preference for this macro, shared across all actions.
   #
   # @return [Hash]
-  serialize :prefs, coder: MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :prefs, coder: MetasploitDataModels::Base64Serializer.new
+  else
+    serialize :prefs, MetasploitDataModels::Base64Serializer.new
+  end
 
   # The maximum number of seconds that this macro is allowed to run.
   #

data/app/models/mdm/nexpose_console.rb

@@ -89,7 +89,11 @@ class Mdm::NexposeConsole < ApplicationRecord
   #   List of sites known to Nexpose.
   #
   #   @return [Array<String>] Array of site names.
-  serialize :cached_sites, coder: MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :cached_sites, coder: MetasploitDataModels::Base64Serializer.new
+  else
+    serialize :cached_sites, MetasploitDataModels::Base64Serializer.new
+  end
 
   #
   # Validations
@@ -113,7 +117,7 @@ class Mdm::NexposeConsole < ApplicationRecord
   #
   # @return [void]
   def strip_protocol
-    self.address.gsub!(/^http(s)*:\/\//i,'') unless self.address.nil?  
+    self.address.gsub!(/^http(s)*:\/\//i,'') unless self.address.nil?
   end
 
   Metasploit::Concern.run(self)

data/app/models/mdm/note.rb

@@ -1,6 +1,6 @@
 # Data gathered or derived from the {#host} or {#service} such as its {#ntype fingerprint}.
 class Mdm::Note < ApplicationRecord
-  
+
   #
   # Associations
   #
@@ -107,7 +107,11 @@ class Mdm::Note < ApplicationRecord
   # Serializations
   #
 
-  serialize :data, coder: ::MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :data, coder: ::MetasploitDataModels::Base64Serializer.new
+  else
+    serialize :data, ::MetasploitDataModels::Base64Serializer.new
+  end
 
   private
 

data/app/models/mdm/profile.rb

@@ -38,7 +38,11 @@ class Mdm::Profile < ApplicationRecord
   # Global settings.
   #
   # @return [Hash]
-  serialize :settings, coder: MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :settings, coder: MetasploitDataModels::Base64Serializer.new
+  else
+    serialize :settings, MetasploitDataModels::Base64Serializer.new
+  end
 
   Metasploit::Concern.run(self)
 end

data/app/models/mdm/session.rb

@@ -1,7 +1,7 @@
 # A session opened on a {#host} using an {#via_exploit exploit} and controlled through a {#via_payload payload} to
 # connect back to the local host using meterpreter or a cmd shell.
 class Mdm::Session < ApplicationRecord
-  
+
   #
   # Associations
   #
@@ -172,7 +172,11 @@ class Mdm::Session < ApplicationRecord
   # Serializations
   #
 
-  serialize :datastore, coder: ::MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :datastore, coder: ::MetasploitDataModels::Base64Serializer.new(coerce: true)
+  else
+    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

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

data/app/models/mdm/user.rb

@@ -1,7 +1,7 @@
 # A user of metasploit-framework or metasploit-pro.
 class Mdm::User < ApplicationRecord
   extend MetasploitDataModels::SerializedPrefs
-  
+
   #
   # Associations
   #
@@ -109,7 +109,11 @@ class Mdm::User < ApplicationRecord
   # Hash of user preferences
   #
   # @return [Hash]
-  serialize :prefs, coder: MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :prefs, coder: MetasploitDataModels::Base64Serializer.new
+  else
+    serialize :prefs, MetasploitDataModels::Base64Serializer.new
+  end
 
   # @!attribute time_zone
   #   User's preferred time zone.

data/app/models/mdm/web_form.rb

@@ -1,6 +1,6 @@
 # A filled-in form on a {#web_site}.
 class Mdm::WebForm < ApplicationRecord
-  
+
   #
   # Associations
   #
@@ -46,7 +46,11 @@ class Mdm::WebForm < ApplicationRecord
   # Parameters submitted in this form.
   #
   # @return [Array<Array(String, String)>>]
-  serialize :params, coder: MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :params, coder: MetasploitDataModels::Base64Serializer.new
+  else
+    serialize :params, MetasploitDataModels::Base64Serializer.new
+  end
 
   Metasploit::Concern.run(self)
 end

data/app/models/mdm/web_page.rb

@@ -81,12 +81,20 @@ class Mdm::WebPage < ApplicationRecord
   # Headers sent from server.
   #
   # @return [Hash{String => String}]
-  serialize :headers, coder: MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :headers, coder: MetasploitDataModels::Base64Serializer.new
+  else
+    serialize :headers, MetasploitDataModels::Base64Serializer.new
+  end
 
   # Cookies sent from server.
   #
   # @return [Hash{String => String}]
-  serialize :cookie, coder: MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :cookie, coder: MetasploitDataModels::Base64Serializer.new
+  else
+    serialize :cookie, MetasploitDataModels::Base64Serializer.new
+  end
   Metasploit::Concern.run(self)
 end
 

data/app/models/mdm/web_site.rb

@@ -1,6 +1,6 @@
 # A Web Site running on a {#service}.
 class Mdm::WebSite < ApplicationRecord
-  
+
   #
   # Associations
   #
@@ -60,7 +60,11 @@ class Mdm::WebSite < ApplicationRecord
 
   # @!attribute [rw] options
   #   @todo Determine format and purpose of Mdm::WebSite#options.
-  serialize :options, coder: ::MetasploitDataModels::Base64Serializer.new
+  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+    serialize :options, coder: ::MetasploitDataModels::Base64Serializer.new
+  else
+    serialize :options, ::MetasploitDataModels::Base64Serializer.new
+  end
 
   #
   # Instance Methods

data/app/models/mdm/web_vuln.rb

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.6
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -34,7 +34,7 @@ cert_chain:
   DgscAao7wB3xW2BWEp1KnaDWkf1x9ttgoBEYyuYwU7uatB67kBQG1PKvLt79wHvz
   Dxs+KOjGbBRfMnPgVGYkORKVrZIwlaboHbDKxcVW5xv+oZc7KYXWGg==
   -----END CERTIFICATE-----
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
@@ -727,7 +727,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.24
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Database code for MSF and Metasploit Pro

metadata.gz.sig

@@ -1,2 +1,4 @@
--Y��(\1�#�t{:!����r�����)#ȝ��R�[�"���3�
-�$�'U�Zho��6�YiXz�����ld��F��>�փT4�KKI�&��̜�;2�^˟8#-�#�?������١\�����`����u|��H���K�K�@ɢ��7��-��ֈ.̅_jk�CA|@�������I?�sC��n1�_lʄ8�@8�>"n(ۃ�(���Ⱦ�!cx���$�վj�%6���<0��*�d��ztyƳ��M���IY~��L�/-�N
iN�q�S1�,��I�n%������+_Y�<j�e$�ud��w���aN�Q�x#(���3��T1��������Y�,�j~Z�?ԏ�ҏ�q����˼NZ֗0�����(8�
+`�U��3uEh?�v��N>���I��&z)_	����&�(WBͭ�J�b�iNb�R�4D��>;4�6�5���4D���Z����ޤ�7�y�z���4�^N
+��
+���}R�r)�B�eo�G����5���Xw��U	���hWXefI�sOԅ���@�T{�L���>�>�b�z�ȧ�S���d�����-��k��7NXb�P�=���+w���ԭ��,G��%k;���
+T�8�\���//�r�i
>�%FE���V�����G�Սk�� g/R