metasploit_data_models 6.0.15 → 6.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d011d8005f59d1f1f2395ec7bd72aeffcb88fcd8a6e701b05ae4150f822a1a
-  data.tar.gz: f0e9c11fdd9167932491e4d9c97b877e82ff296d30b45c60c771f15e60cab87c
+  metadata.gz: bb10f71e1dda20e0a39241b92a614f34719763bc62215cbab6de65c34fde35e5
+  data.tar.gz: 17caf774dd9c225b97e6d0d341aa8e359dd57917b330b06cca78a49f9f98ff13
 SHA512:
-  metadata.gz: 980eb17b3a2fa52fd7410cd06e015e0cc3263de2791b622a2b8a46a4c83e19672cfdc53e6fcd28c6ecda05cefbe0cf094113c5d0b1586de4eb2a1a5f9ed919d6
-  data.tar.gz: 4e7f6dc83030e7520a3c3349ed8513163074bfa2efee28c66e486c79795c5ff1cc82023adfd06a080b45dc9c06b8b338457c3c33b0d7f781967e8dc1f67a69b7
+  metadata.gz: f50617796d4d29b27c4fbca2ed78e2f29051e5c08aed412a9162f2a88d58fb78f27f594007f0da20534b0df97c05427d69d6ffd801fd8a9052de00c5a9939b9d
+  data.tar.gz: 19f59a7cc28c07f5906cf18f14695863914bad154c2a134d47ca775179b2e571312c50297b1decfd27dc2ba3c11c12b7911ee9ec5149e172616d35e20e59e396

data/Gemfile

@@ -3,12 +3,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in metasploit_data_models.gemspec
 gemspec
 
-group :development do
-  #gem 'metasploit-erd'
-  # embed ERDs on index, namespace Module and Class<ApplicationRecord> pages
-  #gem 'yard-metasploit-erd'
-end
-
 # used by dummy application
 group :development, :test do
   # supplies factories for producing model instance for specs
@@ -17,8 +11,8 @@ group :development, :test do
   # auto-load factories from spec/factories
   gem 'factory_bot_rails'
 
-  # Enforce tests to run on 7.0.X
-  gem 'rails', '~>  7.0.0'
+  # Allow Rails 7.0 through 8.0 for upgrade compatibility
+  gem 'rails', '>= 7.0', '< 8.1'
   gem 'net-smtp', require: false
 
   # Used to create fake data

data/app/models/mdm/event.rb

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

data/app/models/mdm/listener.rb

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

data/app/models/mdm/loot.rb

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

data/app/models/mdm/macro.rb

@@ -39,7 +39,7 @@ 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.
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :actions, coder: MetasploitDataModels::Base64Serializer.new
   else
     serialize :actions, MetasploitDataModels::Base64Serializer.new
@@ -48,7 +48,7 @@ class Mdm::Macro < ApplicationRecord
   # Preference for this macro, shared across all actions.
   #
   # @return [Hash]
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :prefs, coder: MetasploitDataModels::Base64Serializer.new
   else
     serialize :prefs, MetasploitDataModels::Base64Serializer.new

data/app/models/mdm/nexpose_console.rb

@@ -89,7 +89,7 @@ class Mdm::NexposeConsole < ApplicationRecord
   #   List of sites known to Nexpose.
   #
   #   @return [Array<String>] Array of site names.
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :cached_sites, coder: MetasploitDataModels::Base64Serializer.new
   else
     serialize :cached_sites, MetasploitDataModels::Base64Serializer.new

data/app/models/mdm/note.rb

@@ -107,7 +107,7 @@ class Mdm::Note < ApplicationRecord
   # Serializations
   #
 
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :data, coder: ::MetasploitDataModels::Base64Serializer.new
   else
     serialize :data, ::MetasploitDataModels::Base64Serializer.new

data/app/models/mdm/payload.rb

@@ -93,13 +93,13 @@ class Mdm::Payload < ApplicationRecord
   #
   # Serializations
 
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (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
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :build_opts, coder: YAML
   else
     serialize :build_opts

data/app/models/mdm/profile.rb

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

data/app/models/mdm/session.rb

@@ -198,7 +198,7 @@ class Mdm::Session < ApplicationRecord
   # Serializations
   #
 
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :datastore, coder: ::MetasploitDataModels::Base64Serializer.new(coerce: true)
   else
     serialize :datastore, ::MetasploitDataModels::Base64Serializer.new(coerce: true)

data/app/models/mdm/task.rb

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

data/app/models/mdm/user.rb

@@ -114,7 +114,7 @@ class Mdm::User < ApplicationRecord
   # Hash of user preferences
   #
   # @return [Hash]
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :prefs, coder: MetasploitDataModels::Base64Serializer.new
   else
     serialize :prefs, MetasploitDataModels::Base64Serializer.new

data/app/models/mdm/web_form.rb

@@ -46,7 +46,7 @@ class Mdm::WebForm < ApplicationRecord
   # Parameters submitted in this form.
   #
   # @return [Array<Array(String, String)>>]
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :params, coder: MetasploitDataModels::Base64Serializer.new
   else
     serialize :params, MetasploitDataModels::Base64Serializer.new

data/app/models/mdm/web_page.rb

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

data/app/models/mdm/web_site.rb

@@ -60,7 +60,7 @@ class Mdm::WebSite < ApplicationRecord
 
   # @!attribute [rw] options
   #   @todo Determine format and purpose of Mdm::WebSite#options.
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :options, coder: ::MetasploitDataModels::Base64Serializer.new
   else
     serialize :options, ::MetasploitDataModels::Base64Serializer.new

data/app/models/mdm/web_vuln.rb

@@ -141,7 +141,7 @@ class Mdm::WebVuln < ApplicationRecord
   #   Parameters sent as part of request
   #
   #   @return [Array<Array(String, String)>] Array of parameter key value pairs
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (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)

data/db/migrate/20110317144932_add_session_table.rb

@@ -1,7 +1,7 @@
 class AddSessionTable < ActiveRecord::Migration[4.2]
 
 	class Event < ApplicationRecord
-		if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+		if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
 			serialize :info, coder: YAML
 		else
 			serialize :info
@@ -14,7 +14,7 @@ class AddSessionTable < ActiveRecord::Migration[4.2]
 
 	class Session < ApplicationRecord
 		has_many :events, :class_name => 'AddSessionTable::SessionEvent'
-		if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+		if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
 			serialize :datastore, coder: YAML
 		else
 			serialize :datastore

data/db/migrate/20110422000000_convert_binary.rb

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

data/lib/metasploit_data_models/version.rb

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

data/metasploit_data_models.gemspec

@@ -33,11 +33,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
 
 
-  s.add_runtime_dependency 'activerecord', '~>7.0'
-  s.add_runtime_dependency 'activesupport', '~>7.0'
+  # Rails 8.0 upgrade: widened from '~> 7.0' (which means >= 7.0, < 8.0) to
+  # '>= 7.0', '< 8.1' so this gem resolves with both Rails 7.x and 8.0.
+  # The old pessimistic constraint hard-blocked Bundler from pulling Rails 8.
+  s.add_runtime_dependency 'activerecord', '>= 7.0', '< 8.1'
+  s.add_runtime_dependency 'activesupport', '>= 7.0', '< 8.1'
   s.add_runtime_dependency 'metasploit-concern'
-  s.add_runtime_dependency 'metasploit-model', '~>5.0.4'
-  s.add_runtime_dependency 'railties', '~>7.0'
+  s.add_runtime_dependency 'metasploit-model', '>= 5.0.4'
+  s.add_runtime_dependency 'railties', '>= 7.0', '< 8.1'
   s.add_runtime_dependency 'webrick'
 
   # os fingerprinting

data/spec/dummy/config/application.rb

@@ -53,11 +53,6 @@ module Dummy
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types
     config.active_record.schema_format = :sql
-
-    # 5.x change to belongs_to
-    config.active_record.belongs_to_required_by_default = true
-
-    config.autoloader = :zeitwerk
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 6.0.15
+  version: 6.0.16
 platform: ruby
 authors:
 - Metasploit Hackers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-05 00:00:00.000000000 Z
+date: 2026-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
@@ -98,30 +98,42 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: metasploit-concern
   requirement: !ruby/object:Gem::Requirement
@@ -140,30 +152,36 @@ dependencies:
   name: metasploit-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement