metasploit_data_models 5.0.6 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 507d624327960ae9ad2055e39b92350caa4f5c1e045f4c72885b9ed4666206d8
-  data.tar.gz: 4d4910b9e92ae2c2b245b592c145104c957212c0782f7f64dc4db51d2a099264
+  metadata.gz: f333c3459571e05e20f07d721beebdc344cb447b4c2cd6b2bcb2396e7651ce83
+  data.tar.gz: a3dfefb5d451cc212a0b0daebc67ae602177a42680e17eb234cfb7df4803f0d5
 SHA512:
-  metadata.gz: 7559d185736e6efd66db60a061eeae9f231654cf43a794fe90f14078deffcf14f353b05e40449627e2a6b207c1db5e482c59491e2876c3a90b9800f64455a38e
-  data.tar.gz: 4edb158f27af03fcdbd76b62d25497966214fdcd4a1c3a7b4a4ec25a958f2ecbe78e0265dd46f4cb138dc5695910257c37a51685015b1cbc657aa30b2876661a
+  metadata.gz: 1acd8ba4b655bba25146fcc63cd937908bafa3467b9c9d28b41d9206230690452db52e648da63bef56c8c0cab2aa809d153b6e20eb0e405bbe4d53de049c5064
+  data.tar.gz: 8f6c91d80d9e39ca666a64f0805a9a73e3a734364d82fc0b3293c0647f37d8a8cebd49d4cd3cc792448ecdbfddf78545b7ea6e13b7db79ee0e9bb852cc8781fe

data/.github/workflows/verify.yml

@@ -46,17 +46,15 @@ jobs:
       fail-fast: true
       matrix:
         ruby:
-          - 2.6
           - 2.7
           - 3.0
           - 3.1
         os:
-          - ubuntu-18.04
-          - ubuntu-22.04
+          - ubuntu-20.04
+          - ubuntu-latest
         exclude:
-          - { os: ubuntu-22.04, ruby: 2.6 }
-          - { os: ubuntu-22.04, ruby: 2.7 }
-          - { os: ubuntu-22.04, ruby: 3.0 }
+          - { os: ubuntu-latest, ruby: 2.7 }
+          - { os: ubuntu-latest, ruby: 3.0 }
 
     env:
       RAILS_ENV: test

data/Gemfile

@@ -19,7 +19,7 @@ group :development, :test do
   # auto-load factories from spec/factories
   gem 'factory_bot_rails'
 
-  gem 'rails', '~> 6.0'
+  gem 'rails'
   gem 'net-smtp', require: false
 
   # Used to create fake data

data/app/models/mdm/host_tag.rb

@@ -38,7 +38,9 @@ class Mdm::HostTag < ApplicationRecord
   # @see http://stackoverflow.com/a/11694704
   # @return [void]
   def destroy_orphan_tag
-    tag.destroy_if_orphaned
+    # ensure fresh load of tag record
+    # in theory this will always return one result safe navigation is just "extra"
+    Mdm::Tag.where(id: tag.id).first&.destroy_if_orphaned
   end
 
   # switch back to public for load hooks

data/app/models/mdm/loot.rb

@@ -31,6 +31,7 @@ class Mdm::Loot < ApplicationRecord
   #   @return [Mdm::Host]
   belongs_to :host,
              class_name: 'Mdm::Host',
+             optional: true, # allow for manually stored loot
              inverse_of: :loots
 
   # @!attribute [rw] module_run

data/app/models/mdm/tag.rb

@@ -100,7 +100,8 @@ class Mdm::Tag < ApplicationRecord
   # @return [void]
   def destroy_if_orphaned
     self.class.transaction do
-      if hosts_tags.empty?
+      # call `.count` to avoid serialization of any Mdm::HostTag that may exist
+      if hosts_tags.count == 0
         destroy
       end
     end

data/app/models/mdm/workspace.rb

@@ -18,7 +18,7 @@ class Mdm::Workspace < ApplicationRecord
 
   # Automatic exploitation match sets generated against {#hosts} and {#services} in this workspace.
   has_many :automatic_exploitation_match_sets,
-           class_name: 'MetasploitDataModels::AutomaticExploitation:MatchSet',
+           class_name: 'MetasploitDataModels::AutomaticExploitation::MatchSet',
            inverse_of: :workspace
 
 

data/lib/metasploit_data_models/engine.rb

@@ -5,7 +5,6 @@ require 'rails'
 class MetasploitDataModels::Engine < Rails::Engine
   # @see http://viget.com/extend/rails-engine-testing-with-rspec-capybara-and-factorygirl
   config.generators do |g|
-    g.assets false
     g.fixture_replacement :factory_bot, :dir => 'spec/factories'
     g.helper false
     g.test_framework :rspec, :fixture => false

data/lib/metasploit_data_models/version.rb

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

data/metasploit_data_models.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = %w{app/models app/validators lib}
 
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.7'
 
   # ---- Dependencies ----
   # documentation
@@ -33,11 +33,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
 
 
-  s.add_runtime_dependency 'activerecord', '~>6.0'
-  s.add_runtime_dependency 'activesupport', '~>6.0'
+  s.add_runtime_dependency 'activerecord', '~>7.0'
+  s.add_runtime_dependency 'activesupport', '~>7.0'
   s.add_runtime_dependency 'metasploit-concern'
   s.add_runtime_dependency 'metasploit-model', '>=3.1'
-  s.add_runtime_dependency 'railties', '~>6.0'
+  s.add_runtime_dependency 'railties', '~>7.0'
   s.add_runtime_dependency 'webrick'
 
   # os fingerprinting

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

@@ -4,7 +4,7 @@ RSpec.describe Mdm::Loot, type: :model do
   context 'associations' do
     it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
     it { is_expected.to belong_to(:service).optional.class_name('Mdm::Service') }
-    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:host).optional.class_name('Mdm::Host') }
     it { is_expected.to belong_to(:module_run).optional.class_name('MetasploitDataModels::ModuleRun') }
   end
 

data/spec/dummy/config/application.rb

@@ -56,13 +56,9 @@ module Dummy
     # 5.x change to belongs_to
     config.active_record.belongs_to_required_by_default = true
 
-    # Enable the asset pipeline
-    config.assets.enabled = false
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
-
     config.autoloader = :zeitwerk
+
+    ActiveRecord.legacy_connection_handling = false
   end
 end
 

data/spec/dummy/config/environments/development.rb

@@ -22,16 +22,6 @@ Rails.application.configure do
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
-
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 end

data/spec/dummy/config/environments/production.rb

@@ -22,18 +22,6 @@ Rails.application.configure do
   # Disable Rails's static asset server (Apache or nginx will already do this).
   config.serve_static_assets = false
 
-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
-  # config.assets.css_compressor = :sass
-
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
-
-  # Generate digests for assets URLs.
-  config.assets.digest = true
-
-  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 6.0.1
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
@@ -185,28 +185,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: metasploit-concern
   requirement: !ruby/object:Gem::Requirement
@@ -241,14 +241,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -675,7 +675,6 @@ files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/active_record_migrations.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
@@ -779,15 +778,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Database code for MSF and Metasploit Pro

data/spec/dummy/config/initializers/assets.rb

@@ -1,8 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )