metasploit_data_models 3.0.10 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d4c73d42c6399efc5b8975773428803813f1145d
-  data.tar.gz: 81aac6c3f8cdba497cfd8ce8c57fc7dfb74057eb
+SHA256:
+  metadata.gz: cdeb3ae049075f12dfedbb34e24bd1ea51f50d33a78ee3193d9bd7f191164cef
+  data.tar.gz: 540e804c5763a14491c43cbb5b9eaf31ae84ad78cdfae0f4c4e6f4d5105040a5
 SHA512:
-  metadata.gz: ae8c3c35bc46654167e9f9238b733c2cd60e2c8df6763ebf677c3b4a3d5b361b908b8ded83f2a9a895d9aec3c7be22635acb0014096ab7ce26b9701048e7a9bc
-  data.tar.gz: 5d18cc2bc2f45838e7ac41b7ecb7f9af2d91d86cc19f1dd61a315af6c7b1d37c482b06d6233565437f72fe50b38ba042723d6a377175732468b41e08cfa51b9b
+  metadata.gz: 07d119ef37cd0eb0df81082bcfab541084fc3fdf5e891225ecd2fbcab45552535b0c9d2ba0a276a5a4e8cbb1bdf887f2689143ce19fb59ebad41ebf428e7c31f
+  data.tar.gz: 66b5e26223660d4ae83f23d0cfdaa5d536d6e7714c25471c9acf3d81bcead90c12060c3d107c7cb0c35349431752e877816b3d8b328b3d36adbbc26c5ad1117e

data/.gitignore

@@ -26,4 +26,4 @@ pkg/*
 # Database configuration (with passwords) for specs
 spec/dummy/config/database.yml
 # Secrets
-spec/dummy/config/secrets.yml
+spec/dummy/tmp/*

data/.travis.yml

@@ -10,7 +10,7 @@ addons:
       - libpcap-dev
       - graphviz
 rvm:
-  - 2.5.0
+  - 2.6.5
 before_script:
   - cp spec/dummy/config/database.yml.travis spec/dummy/config/database.yml
   - bundle exec rake --version

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 
 group :development do
   #gem 'metasploit-erd'
-  # embed ERDs on index, namespace Module and Class<ActiveRecord::Base> pages
+  # embed ERDs on index, namespace Module and Class<ApplicationRecord> pages
   #gem 'yard-metasploit-erd'
 end
 
@@ -16,17 +16,19 @@ group :development, :test do
   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', '~>4'
+  gem 'factory_bot'
   # auto-load factories from spec/factories
   gem 'factory_bot_rails'
 
-  gem 'rails', '~>4.2.6'
+  gem 'rails'
   # Used to create fake data
   gem "faker"
 
   # bound to 0.20 for Activerecord 4.2.8 deprecation warnings:
   # https://github.com/ged/ruby-pg/commit/c90ac644e861857ae75638eb6954b1cb49617090
-  gem 'pg', "0.20.0"
+  gem 'pg'
+
+  gem 'pry'
 end
 
 group :test do

data/Rakefile

@@ -51,7 +51,7 @@ if gem_specification
   end
 
   #
-  # Eager load before yard docs so that ActiveRecord::Base subclasses are loaded for yard-metasploit-erd
+  # Eager load before yard docs so that ApplicationRecord subclasses are loaded for yard-metasploit-erd
   #
 
   task 'yard:doc' => :eager_load

data/app/models/mdm/api_key.rb

@@ -1,5 +1,5 @@
 # API key to access the RPC.
-class Mdm::ApiKey < ActiveRecord::Base
+class Mdm::ApiKey < ApplicationRecord
   
   #
   # Attributes

data/app/models/mdm/async_callback.rb

@@ -1,5 +1,5 @@
 # An asychronous callback that has been received by the Mettle Pingback Listener and is logged
-class Mdm::AsyncCallback < ActiveRecord::Base
+class Mdm::AsyncCallback < ApplicationRecord
   extend ActiveSupport::Autoload
 
   include Metasploit::Model::Search

data/app/models/mdm/client.rb

@@ -1,5 +1,5 @@
 # Client used for `report_client` in metasploit-framework Metasploit Modules.
-class Mdm::Client < ActiveRecord::Base
+class Mdm::Client < ApplicationRecord
   #
   # Associations
   #

data/app/models/mdm/cred.rb

@@ -1,7 +1,7 @@
 # @deprecated Use metasploit-credential's `Metasploit::Credential::Core`.
 #
 # A credential captured from a {#service}.
-class Mdm::Cred < ActiveRecord::Base
+class Mdm::Cred < ApplicationRecord
   #
   # CONSTANTS
   #

data/app/models/mdm/event.rb

@@ -1,5 +1,5 @@
 # Records framework events to the database.
-class Mdm::Event < ActiveRecord::Base
+class Mdm::Event < ApplicationRecord
     
   #
   # Associations

data/app/models/mdm/exploit_attempt.rb

@@ -1,5 +1,5 @@
 # An attempt to exploit {#host}.
-class Mdm::ExploitAttempt < ActiveRecord::Base
+class Mdm::ExploitAttempt < ApplicationRecord
   
   #
   # Associations

data/app/models/mdm/exploited_host.rb

@@ -1,7 +1,7 @@
 # @deprecated use {Mdm::ExploitAttempt} instead.
 #
 # When a {#host} or {#service} on a {#host} is exploited.
-class Mdm::ExploitedHost < ActiveRecord::Base
+class Mdm::ExploitedHost < ApplicationRecord
   #
   # Associations
   #

data/app/models/mdm/host.rb

@@ -1,5 +1,5 @@
 # A system with an {#address IP address} on the network that has been discovered in some way.
-class Mdm::Host < ActiveRecord::Base
+class Mdm::Host < ApplicationRecord
   extend ActiveSupport::Autoload
 
   autoload :OperatingSystemNormalization
@@ -316,7 +316,7 @@ class Mdm::Host < ActiveRecord::Base
   #   {Mdm::Module::Detail Details about modules} that were used to find {#vulns vulnerabilities} on this host.
   #
   #   @return [ActiveRecord::Relation<Mdm::Module::Detail]
-  has_many :module_details, -> { uniq } ,
+  has_many :module_details, -> { distinct } ,
            :class_name => 'Mdm::Module::Detail',
            :source =>:detail,
            :through => :module_refs

data/app/models/mdm/host_detail.rb

@@ -1,5 +1,5 @@
 # Details supplied by Nexpose about a {Mdm::Host host}.
-class Mdm::HostDetail < ActiveRecord::Base
+class Mdm::HostDetail < ApplicationRecord
   #
   # Associations
   #
@@ -59,4 +59,4 @@ class Mdm::HostDetail < ActiveRecord::Base
   validates :host_id, :presence => true
 
   Metasploit::Concern.run(self)
-end
+end

data/app/models/mdm/host_tag.rb

@@ -1,5 +1,5 @@
 # Join model between {Mdm::Host} and {Mdm::Tag}.
-class Mdm::HostTag < ActiveRecord::Base
+class Mdm::HostTag < ApplicationRecord
   self.table_name = "hosts_tags"
 
   #

data/app/models/mdm/listener.rb

@@ -1,5 +1,5 @@
 # A listener spawned by a {#task} that is waiting for connection on {#address}:{#port}.
-class Mdm::Listener < ActiveRecord::Base
+class Mdm::Listener < ApplicationRecord
   
   #
   # Associations

data/app/models/mdm/loot.rb

@@ -1,6 +1,6 @@
 # Loot gathered from {#host} or {#service} such as files to prove you were on the system or to crack later to gain
 # sessions on other machines in the network.
-class Mdm::Loot < ActiveRecord::Base
+class Mdm::Loot < ApplicationRecord
   
   #
   # CONSTANTS

data/app/models/mdm/macro.rb

@@ -1,5 +1,5 @@
 # Macro of {#actions} to run at once.
-class Mdm::Macro < ActiveRecord::Base
+class Mdm::Macro < ApplicationRecord
   extend MetasploitDataModels::SerializedPrefs
 
   #

data/app/models/mdm/mod_ref.rb

@@ -1,6 +1,6 @@
 # Joins a {Mdm::Module::Detail} and {Mdm::Ref} indirectly through the {Mdm::Module::Detail#refname} matching {#module},
 # {Mdm::Module::Detail#mtype} matching {#mtype}, and {Mdm::Ref#name} matching {#ref}.
-class Mdm::ModRef < ActiveRecord::Base
+class Mdm::ModRef < ApplicationRecord
   #
   # Attributes
   #

data/app/models/mdm/module/action.rb

@@ -3,7 +3,7 @@
 # {Mdm::Module::Detail Metasploit Module}: if two {Mdm::Module::Detail Metasploit Modules} have
 # {Mdm::Module::Action actions} with the same {Mdm::Module::Action#name name}, no similarity should be assumed between
 # those two {Mdm::Module::Action actions} or {Mdm::Module::Detail Metasploit Modules}.
-class Mdm::Module::Action < ActiveRecord::Base
+class Mdm::Module::Action < ApplicationRecord
   self.table_name = 'module_actions'  
 
   #

data/app/models/mdm/module/arch.rb

@@ -1,5 +1,5 @@
 # A supported architecture for a given {Mdm::Module::Detail Metasploit Module}
-class Mdm::Module::Arch < ActiveRecord::Base
+class Mdm::Module::Arch < ApplicationRecord
   self.table_name = 'module_archs'
 
   #

data/app/models/mdm/module/author.rb

@@ -1,5 +1,5 @@
 # The {#email} and {#name} of an author of a {#detail Metasploit Module}.
-class Mdm::Module::Author < ActiveRecord::Base
+class Mdm::Module::Author < ApplicationRecord
   self.table_name = 'module_authors'
 
   #

data/app/models/mdm/module/detail.rb

@@ -1,6 +1,6 @@
 # Details about an Msf::Module.  Metadata that can be an array is stored in associations in modules under the
 # {Mdm::Module} namespace.
-class Mdm::Module::Detail < ActiveRecord::Base
+class Mdm::Module::Detail < ApplicationRecord
   self.table_name = 'module_details'
 
   #

data/app/models/mdm/module/mixin.rb

@@ -1,7 +1,7 @@
 # @deprecated Never populated by metasploit-framework.
 #
 # Module mixed into a {#detail Metasploit Module}.
-class Mdm::Module::Mixin < ActiveRecord::Base
+class Mdm::Module::Mixin < ApplicationRecord
   self.table_name = 'module_mixins'
 
   #

data/app/models/mdm/module/platform.rb

@@ -1,5 +1,5 @@
 # {#name Platform} on which the {#detail Metasploit Module} can run.
-class Mdm::Module::Platform < ActiveRecord::Base
+class Mdm::Module::Platform < ApplicationRecord
   self.table_name = 'module_platforms'
 
   #

data/app/models/mdm/module/ref.rb

@@ -1,5 +1,5 @@
 # External references to the vulnerability exploited by this module.
-class Mdm::Module::Ref < ActiveRecord::Base
+class Mdm::Module::Ref < ApplicationRecord
   self.table_name = 'module_refs'
 
   #

data/app/models/mdm/module/target.rb

@@ -1,6 +1,6 @@
 # A potential target for a {Mdm::Module::Detail exploit Metasploit Module}.  Targets can change options including
 # offsets for ROP chains to tune an exploit to work with different system libraries and versions.
-class Mdm::Module::Target < ActiveRecord::Base
+class Mdm::Module::Target < ApplicationRecord
   self.table_name = 'module_targets'
 
   #

data/app/models/mdm/nexpose_console.rb

@@ -1,5 +1,5 @@
 # A connection to Nexpose from Metasploit.
-class Mdm::NexposeConsole < ActiveRecord::Base
+class Mdm::NexposeConsole < ApplicationRecord
   
   #
   # Associations

data/app/models/mdm/note.rb

@@ -1,5 +1,5 @@
 # Data gathered or derived from the {#host} or {#service} such as its {#ntype fingerprint}.
-class Mdm::Note < ActiveRecord::Base
+class Mdm::Note < ApplicationRecord
   
   #
   # Associations

data/app/models/mdm/payload.rb

@@ -1,5 +1,5 @@
 # A payload that has been generated by Metasploit and used to establish {Mdm::Session}.
-class Mdm::Payload < ActiveRecord::Base
+class Mdm::Payload < ApplicationRecord
   extend ActiveSupport::Autoload
 
   include Metasploit::Model::Search

data/app/models/mdm/profile.rb

@@ -1,5 +1,5 @@
 # User settings.
-class Mdm::Profile < ActiveRecord::Base
+class Mdm::Profile < ApplicationRecord
   #
   # Attributes
   #

data/app/models/mdm/ref.rb

@@ -1,7 +1,7 @@
 # An external vulnerability reference for vulnerabilities that aren't part of a module.  {Mdm::Module::Ref} should be
 # used whenever possible and Mdm::Ref should only be used when the vulnerability is from an import and can't be
 # correlated to a module and its {Mdm::Module::Detail}.
-class Mdm::Ref < ActiveRecord::Base
+class Mdm::Ref < ApplicationRecord
   #
   # Associations
   #

data/app/models/mdm/route.rb

@@ -1,5 +1,5 @@
 # Network route that goes through a {#session} to allow accessing IPs on the remote end of the session.
-class Mdm::Route < ActiveRecord::Base
+class Mdm::Route < ApplicationRecord
   
   #
   # Associations

data/app/models/mdm/service.rb

@@ -1,5 +1,5 @@
 # A service, such as an ssh server or web server, running on a {#host}.
-class Mdm::Service < ActiveRecord::Base
+class Mdm::Service < ApplicationRecord
   include Metasploit::Model::Search
 
   #
@@ -258,7 +258,7 @@ class Mdm::Service < ActiveRecord::Base
   #
   # @return [void]
   def normalize_host_os
-    if info_changed? && host.workspace.present? && !host.workspace.import_fingerprint
+    if saved_change_to_info? && host.workspace.present? && !host.workspace.import_fingerprint
       host.normalize_os
     end
   end

data/app/models/mdm/session.rb

@@ -1,6 +1,6 @@
 # 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 < ActiveRecord::Base
+class Mdm::Session < ApplicationRecord
   
   #
   # Associations

data/app/models/mdm/session_event.rb

@@ -1,5 +1,5 @@
 # Events that occurred when using a {#session}.
-class Mdm::SessionEvent < ActiveRecord::Base
+class Mdm::SessionEvent < ApplicationRecord
   
   #
   # Associations

data/app/models/mdm/tag.rb

@@ -1,5 +1,5 @@
 # Tag {#hosts_tags assigned} to {#hosts}.  Tags can be used to group together hosts for targeting and reporting.
-class Mdm::Tag < ActiveRecord::Base
+class Mdm::Tag < ApplicationRecord
   include Metasploit::Model::Search
 
   #

data/app/models/mdm/task.rb

@@ -1,5 +1,5 @@
 # A task run by Metasploit Pro.
-class Mdm::Task < ActiveRecord::Base
+class Mdm::Task < ApplicationRecord
   #
   #
   # Associations

data/app/models/mdm/task_cred.rb

@@ -3,7 +3,7 @@
 #   `Metasploit::Credential::Engine` is installed.
 #
 # Join model between {Mdm::Cred} and {Mdm::Task} that signifies that the {#task} found the {#cred}.
-class Mdm::TaskCred < ActiveRecord::Base
+class Mdm::TaskCred < ApplicationRecord
   #
   # Associations
   #

data/app/models/mdm/task_host.rb

@@ -1,5 +1,5 @@
 # Join model between {Mdm::Host} and {Mdm::Task} that signifies that the {#task} found the {#host}.
-class Mdm::TaskHost < ActiveRecord::Base
+class Mdm::TaskHost < ApplicationRecord
   #
   # Associations
   #

data/app/models/mdm/task_service.rb

@@ -1,5 +1,5 @@
 # Join model between {Mdm::Service} and {Mdm::Task} that signifies that the {#task} found the {#service}.
-class Mdm::TaskService < ActiveRecord::Base
+class Mdm::TaskService < ApplicationRecord
   #
   # Associations
   #

data/app/models/mdm/task_session.rb

@@ -1,5 +1,5 @@
 # Join model between {Mdm::Session} and {Mdm::Task} that signifies that the {#task} spawned the {#session}.
-class Mdm::TaskSession < ActiveRecord::Base
+class Mdm::TaskSession < ApplicationRecord
   #
   # Associations
   #

data/app/models/mdm/user.rb

@@ -1,5 +1,5 @@
 # A user of metasploit-framework or metasploit-pro.
-class Mdm::User < ActiveRecord::Base
+class Mdm::User < ApplicationRecord
   extend MetasploitDataModels::SerializedPrefs
   
   #
@@ -36,7 +36,7 @@ class Mdm::User < ActiveRecord::Base
   # {Mdm::Workspace Workspace} where this user has access.  If a user is an {#admin administrator} they have access
   # to all workspaces even if they are not a member of that workspace.
   has_and_belongs_to_many :workspaces,
-                          -> { uniq },
+                          -> { distinct },
                           class_name: 'Mdm::Workspace',
                           join_table: 'workspace_members'
 

data/app/models/mdm/vuln.rb

@@ -1,5 +1,5 @@
 # A vulnerability found on a {#host} or {#service}.
-class Mdm::Vuln < ActiveRecord::Base
+class Mdm::Vuln < ApplicationRecord
 
   #
   # Associations
@@ -122,7 +122,7 @@ class Mdm::Vuln < ActiveRecord::Base
   #
   #   @return [ActiveRecord::Relation<Mdm::Module::Detail>]
   has_many :module_details,
-            -> { uniq },
+            -> { distinct },
             :class_name => 'Mdm::Module::Detail',
             :source => :detail,
             :through => :module_refs