metasploit_data_models 3.0.8 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1de250dab01252ec903267f151d8381dc07075fe
-  data.tar.gz: 52d15de85b7946d63a93c33fcc629fc6bcc4ff8c
+SHA256:
+  metadata.gz: 7160a9465ddf37341f8823e9523185b042f1fb99db31e42a79aa25b583ddb676
+  data.tar.gz: dfff423e1f177a6bdc6bc85b84225c3a243e2528283e49185d188c76d04808c1
 SHA512:
-  metadata.gz: 79679aa1cfea49f399d47d0d80d24f3f6ed2362bf2dbe9670ea4b848e52581d9ff211e580bffb54f3cd927ef48c645424451f5e740c6b6b6c6fd194d0dfaaa34
-  data.tar.gz: 5477dc7aeaf031bc3d96bafeb90c53ee59457a3fba9d3e3769247f7548375e6eee0fa979eed75a9804e2843b62638bf0398e4ea5ff63cc6dd590858bd24e594b
+  metadata.gz: 7c60f29e7ebff8b3c2f1aa0e7a10a9c06a07f186f57c3539deb24419ba65b5d004897ecada92e313b19c38f37c634dcf2dc55765aea3e0e1ae2b126f6748e597
+  data.tar.gz: 501f97755d40903d2e25b3476538e498f650209df40c9522e98ddf7eb6ab1bd716e28454eb0ceb289991e22a400b10feb0665e776f0f4d4ee55822888247466f

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-�/��C
-w!��!��4����;v��@P1D;��ŘՀD=pش��=2��+B2�u›(�:%J:y��
-�@�v�ΆC�"R_��`
+fo㏚j��E'�G�G�Τ�Y�9����v�;��3V����פ�f(1`l�6�G�v���S����͒Gω|�1g�cU�R�y����^�b&%>

data.tar.gz.sig

@@ -1 +1 @@
-S)��Yo�����NIG�b%��K��F�mU&J��[��$VM�@��'Ĩ1�R�^p�ɇ�X�������!d٘�]Cd(�,���҈d]ɹ�m9�҅���������ݎsϬ�T��%�D>����ۣ\9�a��?���]\�Ӊ����#f��������@��C��X{ح��}�=d����nrH0V�$,��{\�C�l�Ρ`�m���!��b��!l�!%�>����9u5ӳ�y_�N��e�
+�Y����@JJ۸y�K*~��%I��1��L/l�wM0s8���;�t���[�:�"���-�������HbC)6��S�yW���!��ts�ć�G�3��	!����c.=�~�~H!b�$�AP���NY���d�����K&�&�y�_r�]*����nUA���Z�3�`<�bK�"*�z��H���S�y��H�Lr4
���p�=Y����qa�����<w�a~�ÝS�M��Ay��.�P�$��(��L����;�%z��

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
@@ -53,7 +53,7 @@ class Mdm::ApiKey < ActiveRecord::Base
     license = License.get
 
     if license and not license.supports_api?
-      errors[:license] = " - this product does not support API access"
+      errors.add :license, " - this product does not support API access"
     end
   end
 

data/app/models/mdm/async_callback.rb

@@ -0,0 +1,64 @@
+# An asychronous callback that has been received by the Mettle Pingback Listener and is logged
+class Mdm::AsyncCallback < ApplicationRecord
+  extend ActiveSupport::Autoload
+
+  include Metasploit::Model::Search
+
+  #
+  # Associations
+  #
+
+
+  #
+  # Attributes
+  #
+
+  # @!attribute [rw] uuid
+  #   A 16-byte unique identifier for this payload. The UUID is encoded to include specific information.
+  #   See lib/msf/core/payload/uuid.rb in the https://github.com/rapid7/metasploit-framework repo.
+  #
+  #   @return [String]
+
+  # @!attribute [rw] timestamp
+  #   The Unix format timestamp when this payload called back.
+  #
+  #   @return [Integer]
+
+  # @!attribute [rw] listener_uri
+  #   Non-unique URIs (eg. "tcp://192.168.1.7:4444") which received callbacks from this payload.
+  #
+  #   @return [String]
+
+  # @!attribute [rw] target_host
+  #   The IP address (eg. "192.168.1.7" or "fe80::1") from which the callback originated, from the view of the callback listener.
+  #
+  #   @return [String]
+
+  # @!attribute [rw] target_port
+  #   The IP port (eg. "4444") from which the callback originated, from the view of the callback listener.
+  #
+  #   @return [Integer]
+
+  #
+  # Validations
+  #
+
+
+  #
+  # Search Attributes
+  #
+
+  search_attribute :uuid,
+                   type: :string
+
+  #
+  # Serializations
+  #
+
+  # NONE
+
+
+  public
+
+  Metasploit::Concern.run(self)
+end

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
@@ -113,7 +113,7 @@ class Mdm::Note < ActiveRecord::Base
   #
   # @return [void]
   def normalize
-    if data_changed? and ntype =~ /fingerprint/ && host.workspace.present? && !host.workspace.import_fingerprint
+    if saved_change_to_data? and ntype =~ /fingerprint/ && host.workspace.present? && !host.workspace.import_fingerprint
       host.normalize_os
     end
   end

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
@@ -8,14 +8,6 @@ class Mdm::Payload < ActiveRecord::Base
   # Associations
   #
 
-  # @!attribute [rw] workspace
-  # {Mdm::Workspace} in which this payload was created.
-  #
-  #   @return [Mdm::Workspace]
-  belongs_to :workspace,
-             class_name: 'Mdm::Workspace',
-             inverse_of: :payloads
-
 
   #
   # Attributes
@@ -65,11 +57,6 @@ class Mdm::Payload < ActiveRecord::Base
   #
   #   @return [String]
 
-  # @!attribute [rw] workspace_id
-  #   The ID of the workspace this payload belongs to.
-  #
-  #   @return [Integer]
-
   # @!attribute [rw] raw_payload
   #   A URL pointing to where the binary payload can be downloaded from.
   #
@@ -95,8 +82,6 @@ class Mdm::Payload < ActiveRecord::Base
   # Validations
   #
 
-  validates :workspace, :presence => true
-
 
   #
   # Search Attributes

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