metasploit_data_models 4.1.2 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4113ef1cf55d49c2bf1a1d381759fede35bf155c70769ffc27690c86202c59
-  data.tar.gz: 12b492eff901a960ec9f2ae4223cfdef9e8f96705a21e826061c20b3ca4eddbf
+  metadata.gz: 232b057420ed2ce662db4ebc490d34ef13bbb0ac57e2e35e516f886b7dfb9e0b
+  data.tar.gz: 644cade6aa4791d599c6405d61581bba496a8ae07c6d0b1d69579fc2d2867fc2
 SHA512:
-  metadata.gz: 7395cc9909026f5778cf27c3c2d67d4d768d5c25f151cff9b5f60529e3702331274f030943d8e8f529e4c57cd47f83c21e5867fc5e3c7c39a27b7735ca227c6c
-  data.tar.gz: 3324390bc1f7e734ea14dfe68a8a47a762cbebc8e808564545a64fcdb4156e7f822c53d939387cf499fc35d3fb26ee95fc6e2b795d931002f2c906b39635d30c
+  metadata.gz: ee21837a8af1f62fdfdec43615eb5dba2d62edc5bbc521627d97cd59d69fd78b06b13f1c94ca693810871ec24e0f0401449176fc53ca0ec3ea65ccabefc31e68
+  data.tar.gz: 0b95c36f7521b2e2cd503df6ad05d49b355550f102eec2df2ac9df03d8ec150575770561e0cba34297ab649bc987219b4eed9059a8445056e3ac4ce57a0b88d9

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-�9�y�YӸ~١�|��n�%b,��5���~�vSe�FZ�ͽ�Ʉ?@C8�]^�x�'�_��0�R[�PA?}�Vjj���f���mo@ZL5`47�����/a��&�\L�&������'��/�1
N��=te�[1�G��[i9OE�e����T�M��������"�H�9fRn|��B����v��9�MN�0U֯��Ç�*^��-�anC9c�սly�O����uA�ɟ_r��|�N3�=�2�sy
+���M}�͝�ʊ�}��N�!�1
+��DO�6u�7)X�c����o��w���Nd�U� �C�n��2���B�����V��	��>�p���Z���}&+-�q5&��b�sBP����~f�Q �hA).S���$ڄ9k��b���
@�|ک��{��s!s��

data.tar.gz.sig

@@ -1,2 +1 @@
-Z�����)Tg^�ϛ��E��v��`Os����d�o����y���ۗ�4�\^[;�F��%��x"�ڕ�ƶ;�0����gY�P]�{�T��,��iAt��Z�{l	/:ഛ-,�;y(�Z2���\޸ԙ��g�����	���?������d.B�	"������-0I@P5�ȷ�����H
-�{z�T�{��i9�M�*\sT��2�.&���3~�l�j}�6q�.5d
+�������!��;6�6�λ�����o�m<j���^j��.�n�̴qa7�K�<��
���L9��$3���Z{i����&�l��*X�,�
R8W���,�u�{@gn���y7�t�y"��<�������p�zў;���O��ۈ�i�w�-ᤧ8�D��?��r8:�2�Y��=��Hn�V�sQL�'��a1��S[��z�ӓ��J�<���R&ؽ0�'����ݎ&�N�iib�3�zK�����csQC�

data/.github/workflows/verify.yml

@@ -30,7 +30,10 @@ jobs:
       fail-fast: true
       matrix:
         ruby:
+          - 2.5
+          - 2.6
           - 2.7
+          - 3.0
 
     env:
       RAILS_ENV: test
@@ -49,19 +52,12 @@ jobs:
 
       - name: Setup bundler
         run: |
-          gem install bundler
-
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
+          gem install bundler:2.1.4
 
       - name: Bundle install
         run: |
           bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          bundle _2.1.4_ install --jobs 4 --retry 3
 
       - name: Test
         run: |

data/Gemfile

@@ -27,8 +27,6 @@ group :development, :test do
   # bound to 0.20 for Activerecord 4.2.8 deprecation warnings:
   # https://github.com/ged/ruby-pg/commit/c90ac644e861857ae75638eb6954b1cb49617090
   gem 'pg'
-
-  gem 'pry'
 end
 
 group :test do

data/README.md

@@ -41,6 +41,14 @@ different `on_load` name, which is just the class name converted to an underscor
 
     require 'metasploit_data_models/engine'
 
+`ArelHelper` classes must also be included in your applications `app/models/application_record.rb` class:
+
+    class ApplicationRecord < ActiveRecord::Base
+      self.abstract_class = true
+      include ArelHelpers::ArelTable
+      include ArelHelpers::JoinAssociation
+    end
+
 ### Metasploit Framework
 
 In Metasploit Framework, `MetasploitDataModels::Engine` is loaded, but the data models are only if the user wants to use

data/app/models/mdm/event.rb

@@ -11,12 +11,14 @@ class Mdm::Event < ApplicationRecord
   # @return [nil] if event did not occur on a host.
   belongs_to :host,
              class_name: 'Mdm::Host',
+             optional: true,
              inverse_of: :events
 
   # {Mdm::Workspace} in which this event occured.  If {#host} is present, then this will match
   # {Mdm::Host#workspace `host.workspace`}.
   belongs_to :workspace,
              class_name: 'Mdm::Workspace',
+             optional: true,
              inverse_of: :events
   
   #

data/app/models/mdm/exploit_attempt.rb

@@ -18,6 +18,7 @@ class Mdm::ExploitAttempt < ApplicationRecord
   # @return [Mdm::Loot, nil]
   belongs_to :loot,
              class_name: 'Mdm::Loot',
+             optional: true,
              inverse_of: :exploit_attempt
 
   # The service being exploited on {#host}.
@@ -25,6 +26,7 @@ class Mdm::ExploitAttempt < ApplicationRecord
   # @return [Mdm::Service, nil]
   belongs_to :service,
              class_name: 'Mdm::Service',
+             optional: true,
              inverse_of: :exploit_attempts
 
   # The session that was established when this attempt was successful.
@@ -33,6 +35,7 @@ class Mdm::ExploitAttempt < ApplicationRecord
   # @return [nil] if session was not established.
   belongs_to :session,
              class_name: 'Mdm::Session',
+             optional: true,
              inverse_of: :exploit_attempt
 
   # The vulnerability that was attempted to be exploited.
@@ -40,6 +43,7 @@ class Mdm::ExploitAttempt < ApplicationRecord
   # @return [Mdm::Vuln, nil]
   belongs_to :vuln,
              class_name: 'Mdm::Vuln',
+             optional: true,
              inverse_of: :exploit_attempts
 
   #

data/app/models/mdm/loot.rb

@@ -40,6 +40,7 @@ class Mdm::Loot < ApplicationRecord
   belongs_to :module_run,
              class_name: 'MetasploitDataModels::ModuleRun',
              foreign_key: :module_run_id,
+             optional: true, # allow for manually stored loot?
              inverse_of: :loots
 
   # @!attribute [rw] service
@@ -48,6 +49,7 @@ class Mdm::Loot < ApplicationRecord
   #   @return [Mdm::Service]
   belongs_to :service,
              class_name: 'Mdm::Service',
+             optional: true,
              inverse_of: :loots
 
   # @!attribute vuln_attempt

data/app/models/mdm/note.rb

@@ -13,6 +13,7 @@ class Mdm::Note < ApplicationRecord
   belongs_to :host,
              class_name: 'Mdm::Host',
              counter_cache: :note_count,
+             optional: true,
              inverse_of: :notes
 
   # @!attribute [rw] service
@@ -22,6 +23,7 @@ class Mdm::Note < ApplicationRecord
   #   @return [nil] if not is attached to an {Mdm::Host}.
   belongs_to :service,
              class_name: 'Mdm::Service',
+             optional: true,
              inverse_of: :notes
 
   # @!attribute [rw] vuln
@@ -31,6 +33,7 @@ class Mdm::Note < ApplicationRecord
   #   @return [nil] if not is attached to an {Mdm::Host}.
   belongs_to :vuln,
              class_name: 'Mdm::Vuln',
+             optional: true,
              inverse_of: :notes
 
   # @!attribute [rw] workspace

data/app/models/mdm/session.rb

@@ -47,6 +47,7 @@ class Mdm::Session < ApplicationRecord
   #   @return [MetasploitDataModels::ModuleRun]
   belongs_to :originating_module_run,
            class_name: 'MetasploitDataModels::ModuleRun',
+           optional: true, # no code currently generates a module_run
            foreign_key: :module_run_id,
            inverse_of: :spawned_session
 

data/app/models/mdm/tag.rb

@@ -15,6 +15,7 @@ class Mdm::Tag < ApplicationRecord
   # User that created this tag.
   belongs_to :user,
              class_name: 'Mdm::User',
+             optional: true, # no tags have ever actually had user set.
              inverse_of: :tags
 
   #

data/app/models/mdm/vuln.rb

@@ -20,6 +20,7 @@ class Mdm::Vuln < ApplicationRecord
   belongs_to :host,
              class_name: 'Mdm::Host',
              counter_cache: :vuln_count,
+             optional: true,
              inverse_of: :vulns
 
   # @!attribute [rw] matches
@@ -36,6 +37,7 @@ class Mdm::Vuln < ApplicationRecord
   #   @return [Mdm::Service]
   belongs_to :service,
              class_name: 'Mdm::Service',
+             optional: true,
              inverse_of: :vulns
 
   # @!attribute [rw] origin
@@ -44,6 +46,7 @@ class Mdm::Vuln < ApplicationRecord
   #
   #   @return [ActiveRecord::Relation<origin>]
   belongs_to :origin,
+             optional: true,
              polymorphic: true
 
   # @!attribute [rw] vuln_attempts

data/app/models/mdm/vuln_attempt.rb

@@ -11,6 +11,7 @@ class Mdm::VulnAttempt < ApplicationRecord
   # @return [nil] if {#exploited} is `false`.
   belongs_to :loot,
              class_name: 'Mdm::Loot',
+             optional: true,
              inverse_of: :vuln_attempt
 
   # The session opened by this attempt.
@@ -19,6 +20,7 @@ class Mdm::VulnAttempt < ApplicationRecord
   # @return [nil] if {#exploited} is `false`.
   belongs_to :session,
              class_name: 'Mdm::Session',
+             optional: true,
              inverse_of: :vuln_attempt
 
   # The {Mdm::Vuln vulnerability} that this attempt was exploiting.

data/app/models/mdm/vuln_detail.rb

@@ -67,6 +67,7 @@ class Mdm::VulnDetail < ApplicationRecord
   belongs_to :nexpose_console,
              class_name: 'Mdm::NexposeConsole',
              foreign_key: :nx_console_id,
+             optional: true,
              inverse_of: :vuln_details
 
   # @!attribute nx_added

data/app/models/mdm/workspace.rb

@@ -36,7 +36,7 @@ class Mdm::Workspace < ApplicationRecord
 
   # User that owns this workspace and has full permissions within this workspace even if they are not an
   # {Mdm::User#admin administrator}.
-  belongs_to :owner, :class_name => 'Mdm::User', :foreign_key => 'owner_id'
+  belongs_to :owner, :class_name => 'Mdm::User', :foreign_key => 'owner_id', optional: true
 
   # Tasks run inside this workspace.
   has_many :tasks,

data/app/models/metasploit_data_models/automatic_exploitation/match.rb

@@ -17,6 +17,7 @@ class MetasploitDataModels::AutomaticExploitation::Match < ApplicationRecord
   # The {MatchSet} this match is part of
   belongs_to :match_set,
              class_name: 'MetasploitDataModels::AutomaticExploitation::MatchSet',
+             optional: true,
              inverse_of: :matches
 
   # The Metasploit Module that this match connects to

data/app/models/metasploit_data_models/ip_address/v4/segment/nmap/list.rb

@@ -12,7 +12,7 @@ class MetasploitDataModels::IPAddress::V4::Segment::Nmap::List < Metasploit::Mod
   # Either an individual {MetasploitDataModels::IPAddress::V4::Segment::Single segment number} or a
   # {MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range segment range}.
   RANGE_OR_NUMBER_REGEXP = %r{
-      (?<range>#{parent::Range.regexp})
+      (?<range>#{module_parent::Range.regexp})
       |
       # range first because it contains a segment and if the range isn't first only the first part of the range will
       # match.

data/app/models/metasploit_data_models/module_run.rb

@@ -109,6 +109,7 @@ class MetasploitDataModels::ModuleRun < ApplicationRecord
   belongs_to :target_session,
              class_name: 'Mdm::Session',
              foreign_key: :session_id,
+             optional: true,
              inverse_of: :target_module_runs
 
 
@@ -130,6 +131,7 @@ class MetasploitDataModels::ModuleRun < ApplicationRecord
   belongs_to :user,
              class_name:  'Mdm::User',
              foreign_key: 'user_id',
+             optional: true,
              inverse_of: :module_runs
 
 

data/app/models/metasploit_data_models/search/visitor/relation.rb

@@ -67,7 +67,7 @@ class MetasploitDataModels::Search::Visitor::Relation < Metasploit::Model::Base
   # @return [Hash{Symbol => Class}]
   def self.visitor_class_by_relation_method
     @relation_method_by_visitor_class ||= RELATION_METHODS.each_with_object({}) { |relation_method, relation_method_by_visitor_class|
-      visitor_class_name = "#{parent.name}::#{relation_method.to_s.camelize}"
+      visitor_class_name = "#{module_parent.name}::#{relation_method.to_s.camelize}"
       visitor_class = visitor_class_name.constantize
 
       relation_method_by_visitor_class[relation_method] = visitor_class

data/db/migrate/20140905031549_add_detected_arch_to_host.rb

@@ -1,5 +1,5 @@
 class AddDetectedArchToHost < ActiveRecord::Migration[4.2]
   def change
-    add_column :hosts, :detected_arch, :string, { :null => true }
+    add_column :hosts, :detected_arch, :string, :null => true
   end
 end

data/db/migrate/20190308134512_create_async_callbacks.rb

@@ -8,7 +8,6 @@ class CreateAsyncCallbacks < ActiveRecord::Migration[4.2]
       t.string :target_port
 
       t.timestamps null: false
-      t.uuid null: false
     end
   end
 end

data/lib/metasploit_data_models/version.rb

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

data/metasploit_data_models.gemspec

@@ -33,11 +33,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
 
 
-  s.add_runtime_dependency 'activerecord', '~>5.2.2'
-  s.add_runtime_dependency 'activesupport', '~>5.2.2'
+  s.add_runtime_dependency 'activerecord', '~>6.0'
+  s.add_runtime_dependency 'activesupport', '~>6.0'
   s.add_runtime_dependency 'metasploit-concern'
   s.add_runtime_dependency 'metasploit-model', '>=3.1'
-  s.add_runtime_dependency 'railties', '~>5.2.2'
+  s.add_runtime_dependency 'railties', '~>6.0'
   s.add_runtime_dependency 'webrick'
 
   # os fingerprinting

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

@@ -2,8 +2,8 @@ RSpec.describe Mdm::Event, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
-    it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
+    it { is_expected.to belong_to(:host).optional.class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:workspace).optional.class_name('Mdm::Workspace') }
   end
 
   context 'database' do

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

@@ -3,9 +3,9 @@ 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).class_name('Mdm::Service') }
+    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(:module_run).class_name('MetasploitDataModels::ModuleRun') }
+    it { is_expected.to belong_to(:module_run).optional.class_name('MetasploitDataModels::ModuleRun') }
   end
 
   context 'database' do

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

@@ -41,9 +41,9 @@ RSpec.describe Mdm::Note, type: :model do
 
   context 'associations' do
     it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
-    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
-    it { is_expected.to belong_to(:service).class_name('Mdm::Service') }
-    it { is_expected.to belong_to(:vuln).class_name('Mdm::Vuln') }
+    it { is_expected.to belong_to(:host).optional.class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:service).optional.class_name('Mdm::Service') }
+    it { is_expected.to belong_to(:vuln).optional.class_name('Mdm::Vuln') }
   end
 
   context 'scopes' do

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

@@ -45,7 +45,7 @@ RSpec.describe Mdm::Session, type: :model do
   context 'associations' do
     it { is_expected.to have_many(:events).class_name('Mdm::SessionEvent').dependent(:delete_all) }
     it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
-    it { is_expected.to belong_to(:originating_module_run).class_name('MetasploitDataModels::ModuleRun') }
+    it { is_expected.to belong_to(:originating_module_run).optional.class_name('MetasploitDataModels::ModuleRun') }
     it { is_expected.to have_many(:routes).class_name('Mdm::Route').dependent(:delete_all) }
     it { is_expected.to have_many(:target_module_runs).class_name('MetasploitDataModels::ModuleRun') }
     it { is_expected.to have_many(:tasks).class_name('Mdm::Task').through(:task_sessions)}

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

@@ -6,7 +6,7 @@ RSpec.describe Mdm::Tag, type: :model do
   context 'associations' do
     it { is_expected.to have_many(:hosts_tags).class_name('Mdm::HostTag') }
     it { is_expected.to have_many(:hosts).class_name('Mdm::Host').through(:hosts_tags) }
-    it { is_expected.to belong_to(:user).class_name('Mdm::User') }
+    it { is_expected.to belong_to(:user).optional.class_name('Mdm::User') }
   end
 
   context 'database' do

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

@@ -31,9 +31,9 @@ RSpec.describe Mdm::Vuln, type: :model do
 
 
   context 'associations' do
-    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
-    it { is_expected.to belong_to(:origin) }
-    it { is_expected.to belong_to(:service).class_name('Mdm::Service') }
+    it { is_expected.to belong_to(:host).optional.class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:origin).optional }
+    it { is_expected.to belong_to(:service).optional.class_name('Mdm::Service') }
     it { is_expected.to have_many(:module_refs).class_name('Mdm::Module::Ref').through(:refs) }
     it { is_expected.to have_many(:module_runs).class_name('MetasploitDataModels::ModuleRun') }
     it { is_expected.to have_many(:refs).class_name('Mdm::Ref').through(:vulns_refs) }

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

@@ -46,7 +46,7 @@ RSpec.describe Mdm::Workspace, type: :model do
     it { is_expected.to have_many(:listeners).class_name('Mdm::Listener').dependent(:destroy) }
     it { is_expected.to have_many(:loots).class_name('Mdm::Loot').through(:hosts) }
     it { is_expected.to have_many(:notes).class_name('Mdm::Note') }
-    it { is_expected.to belong_to(:owner).class_name('Mdm::User').with_foreign_key('owner_id') }
+    it { is_expected.to belong_to(:owner).optional.class_name('Mdm::User').with_foreign_key('owner_id') }
     it { is_expected.to have_many(:services).class_name('Mdm::Service').through(:hosts).with_foreign_key('service_id') }
     it { is_expected.to have_many(:sessions).class_name('Mdm::Session').through(:hosts) }
     it { is_expected.to have_many(:tasks).class_name('Mdm::Task').dependent(:destroy).order('created_at DESC') }
@@ -185,7 +185,7 @@ RSpec.describe Mdm::Workspace, type: :model do
         before(:example) do
           FactoryBot.create(
               :mdm_workspace,
-              :name => default
+              :name => Mdm::Workspace::DEFAULT
           )
         end
 
@@ -220,7 +220,7 @@ RSpec.describe Mdm::Workspace, type: :model do
 
       context 'with DEFAULT name' do
         before(:example) do
-          workspace.name = default
+          workspace.name = Mdm::Workspace::DEFAULT
         end
 
         it { is_expected.to eq(true) }

data/spec/app/models/metasploit_data_models/ip_address/v4/segment/single_spec.rb

@@ -233,7 +233,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
   end
 
   context '#to_s' do
-    subject(:to_s) {
+    subject(:call_to_s) {
       single.to_s
     }
 
@@ -256,7 +256,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
     it 'delegates to #value' do
       expect(value).to receive(:to_s)
 
-      to_s
+      call_to_s
     end
   end
 
@@ -321,4 +321,4 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
       end
     end
   end
-end
+end

data/spec/app/models/metasploit_data_models/module_run_spec.rb

@@ -18,10 +18,10 @@ RSpec.describe MetasploitDataModels::ModuleRun, type: :model do
   end
 
   context "associations" do
-    it { is_expected.to belong_to(:user).class_name('Mdm::User') }
-    it { is_expected.to belong_to(:user).inverse_of(:module_runs) }
-    it { is_expected.to belong_to(:target_session).class_name('Mdm::Session') }
-    it { is_expected.to belong_to(:target_session).inverse_of(:target_module_runs) }
+    it { is_expected.to belong_to(:user).optional.class_name('Mdm::User') }
+    it { is_expected.to belong_to(:user).optional.inverse_of(:module_runs) }
+    it { is_expected.to belong_to(:target_session).optional.class_name('Mdm::Session') }
+    it { is_expected.to belong_to(:target_session).optional.inverse_of(:target_module_runs) }
     it { is_expected.to belong_to(:trackable) }
     it { is_expected.to belong_to(:module_detail).class_name('Mdm::Module::Detail') }
     it { is_expected.to belong_to(:module_detail).inverse_of(:module_runs) }
@@ -40,7 +40,7 @@ RSpec.describe MetasploitDataModels::ModuleRun, type: :model do
       context "when the module is an exploit" do
         context "and that exploit IS NOT local" do
           before(:example) do
-            module_run.module_fullname = 'exploit/windows/mah-crazy-exploit'
+            module_run.module_detail = FactoryBot.create(:mdm_module_detail, fullname: 'exploit/windows/mah-crazy-exploit')
           end
 
           it { is_expected.to_not be_valid }
@@ -48,7 +48,7 @@ RSpec.describe MetasploitDataModels::ModuleRun, type: :model do
 
         context "and that exploit IS local" do
           before(:example) do
-            module_run.module_fullname = 'exploit/windows/local/mah-crazy-exploit'
+            module_run.module_detail = FactoryBot.create(:mdm_module_detail, fullname: 'exploit/windows/local/mah-crazy-exploit')
           end
 
           it { is_expected.to be_valid }
@@ -65,7 +65,7 @@ RSpec.describe MetasploitDataModels::ModuleRun, type: :model do
 
         context "and it IS NOT a login scanner" do
           before(:example) do
-            module_run.module_fullname = 'post/multi/gather/steal-minecraft-maps'
+            module_run.module_detail = FactoryBot.create(:mdm_module_detail, fullname: 'post/multi/gather/steal-minecraft-maps')
           end
 
           it { is_expected.to_not be_valid }
@@ -73,7 +73,7 @@ RSpec.describe MetasploitDataModels::ModuleRun, type: :model do
 
         context "and it IS a login scanner" do
           before(:example) do
-            module_run.module_fullname = 'auxiliary/scanner/ssh/ssh_login'
+            module_run.module_detail = FactoryBot.create(:mdm_module_detail, fullname: 'auxiliary/scanner/ssh/ssh_login')
           end
 
           it { is_expected.to be_valid }

data/spec/app/models/metasploit_data_models/search/operation/range_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
 
       context '#ordered' do
         let(:error) {
-          I18n.translate!('metasploit.model.errors.models.metasploit_data_models/search/operation/range.attributes.value.order', error_attributes)
+          I18n.translate!('metasploit.model.errors.models.metasploit_data_models/search/operation/range.attributes.value.order', **error_attributes)
         }
 
         context 'with Range' do
@@ -230,4 +230,4 @@ RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
       end
     end
   end
-end
+end

data/spec/app/models/metasploit_data_models/search/visitor/attribute_spec.rb

@@ -28,7 +28,11 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Attribute, type: :model do
           end
 
           it "should be #{node_class}#attribute" do
-            expect(name).to eq(node.attribute)
+            if node.attribute.instance_of? Symbol
+              expect(name.to_s).to eq(node.attribute.to_s)
+            else
+              expect(name).to eq(node.attribute)
+            end
           end
         end
 
@@ -93,4 +97,4 @@ RSpec.describe MetasploitDataModels::Search::Visitor::Attribute, type: :model do
       }
     end
   end
-end
+end

data/spec/dummy/app/models/application_record.rb

@@ -1,3 +1,5 @@
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
+  include ArelHelpers::ArelTable
+  include ArelHelpers::JoinAssociation
 end

data/spec/dummy/config/application.rb

@@ -51,11 +51,16 @@ module Dummy
     # 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
+
     # 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
   end
 end
 

data/spec/dummy/config/storage.yml

@@ -0,0 +1,7 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>

data/spec/dummy/db/structure.sql

@@ -5,27 +5,12 @@ SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
 SET check_function_bodies = false;
+SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
---
--- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
---
-
-CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
-
-
---
--- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
---
-
-COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
-
-
 SET default_tablespace = '';
 
-SET default_with_oids = false;
-
 --
 -- Name: api_keys; Type: TABLE; Schema: public; Owner: -
 --
@@ -64,8 +49,8 @@ ALTER SEQUENCE public.api_keys_id_seq OWNED BY public.api_keys.id;
 CREATE TABLE public.ar_internal_metadata (
     key character varying NOT NULL,
     value character varying,
-    created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL
+    created_at timestamp(6) without time zone NOT NULL,
+    updated_at timestamp(6) without time zone NOT NULL
 );
 
 

data/spec/factories/mdm/sessions.rb

@@ -4,6 +4,7 @@ FactoryBot.define do
     # Associations
     #
     association :host, :factory => :mdm_host
+    association :originating_module_run, :factory => :metasploit_data_models_module_run
 
     #
     # Attributes

data/spec/factories/mdm/tags.rb

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :mdm_tag, :class => Mdm::Tag do
+    association :user, factory: :mdm_user
     desc { generate :mdm_tag_desc }
     name { generate :mdm_tag_name }
   end

data/spec/factories/mdm/vuln_refs.rb

@@ -1,4 +1,6 @@
 FactoryBot.define do
   factory :mdm_vuln_ref, :class => Mdm::VulnRef do
+    association :ref, factory: :mdm_ref
+    association :vuln, factory: :mdm_vuln
   end
 end

data/spec/factories/metasploit_data_models/automatic_exploitation/runs.rb

@@ -2,5 +2,6 @@ FactoryBot.define do
   factory :automatic_exploitation_run, :class => MetasploitDataModels::AutomaticExploitation::Run do
     association :workspace, factory: :mdm_workspace
     association :user, factory: :mdm_user
+    association :match_set, factory: :automatic_exploitation_match_set
   end
 end

data/spec/factories/module_runs.rb

@@ -4,6 +4,8 @@ FactoryBot.define do
   factory :metasploit_data_models_module_run, class: MetasploitDataModels::ModuleRun do
 
     association :user, factory: :mdm_user
+    association :module_detail, factory: :mdm_module_detail
+    association :trackable, factory: :mdm_host
 
     trait :failed do
       status { MetasploitDataModels::ModuleRun::FAIL }
@@ -18,13 +20,11 @@ FactoryBot.define do
     end
 
     attempted_at { Time.now }
-    session_id { 1 }
     port { generate :port }
     proto { "tcp" }
     fail_detail { generate :module_run_fail_detail }
     status { MetasploitDataModels::ModuleRun::SUCCEED }
     username { "joefoo" }
-    module_fullname { generate :module_run_module_fullname }
   end
 
   sequence :module_run_module_fullname do |n|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 5.0.2
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
@@ -185,28 +185,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: metasploit-concern
   requirement: !ruby/object:Gem::Requirement
@@ -241,14 +241,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -416,7 +416,6 @@ files:
 - app/models/metasploit_data_models/search/visitor/method.rb
 - app/models/metasploit_data_models/search/visitor/relation.rb
 - app/models/metasploit_data_models/search/visitor/where.rb
-- config/initializers/arel_helper.rb
 - config/initializers/ipaddr.rb
 - config/locales/en.yml
 - console_db.yml
@@ -685,6 +684,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/storage.yml
 - spec/dummy/db/structure.sql
 - spec/dummy/db/structure.sql.from_rails_3
 - spec/dummy/lib/assets/.gitkeep

data/config/initializers/arel_helper.rb

@@ -1,5 +0,0 @@
-# Including arel-helpers in all active record models.
-# https://github.com/camertron/arel-helpers
-
-ApplicationRecord.send(:include, ArelHelpers::ArelTable)
-ApplicationRecord.send(:include, ArelHelpers::JoinAssociation)