metasploit_data_models 3.0.10 → 4.0.0

data/app/models/mdm/vuln_attempt.rb

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

data/app/models/mdm/vuln_detail.rb

@@ -1,5 +1,5 @@
 # {Mdm::Vuln Vulnerability details} supplied from an external source, such as Nexpose.
-class Mdm::VulnDetail < ActiveRecord::Base
+class Mdm::VulnDetail < ApplicationRecord
   #
   # Associations
   #

data/app/models/mdm/vuln_ref.rb

@@ -1,5 +1,5 @@
 # Join model between {Mdm::Vuln} and {Mdm::Ref}.
-class Mdm::VulnRef < ActiveRecord::Base
+class Mdm::VulnRef < ApplicationRecord
   self.table_name = 'vulns_refs'
 
   #

data/app/models/mdm/web_form.rb

@@ -1,5 +1,5 @@
 # A filled-in form on a {#web_site}.
-class Mdm::WebForm < ActiveRecord::Base
+class Mdm::WebForm < ApplicationRecord
   
   #
   # Associations

data/app/models/mdm/web_page.rb

@@ -1,5 +1,5 @@
 # Web page requested from a {#web_site}.
-class Mdm::WebPage < ActiveRecord::Base
+class Mdm::WebPage < ApplicationRecord
   
   #
   # Associations

data/app/models/mdm/web_site.rb

@@ -1,5 +1,5 @@
 # A Web Site running on a {#service}.
-class Mdm::WebSite < ActiveRecord::Base
+class Mdm::WebSite < ApplicationRecord
   
   #
   # Associations

data/app/models/mdm/web_vuln.rb

@@ -10,7 +10,7 @@
 #       "#{confidence}%"
 #     end
 #   end
-class Mdm::WebVuln < ActiveRecord::Base
+class Mdm::WebVuln < ApplicationRecord
   
   #
   # CONSTANTS

data/app/models/mdm/wmap_request.rb

@@ -1,5 +1,5 @@
 # Request sent to a {Mdm::WmapTarget}.  WMAP is a plugin to metasploit-framework.
-class Mdm::WmapRequest < ActiveRecord::Base
+class Mdm::WmapRequest < ApplicationRecord
   #
   #
   # Attributes

data/app/models/mdm/wmap_target.rb

@@ -1,5 +1,5 @@
 # WMAP target. WMAP is a plugin to metasploit-framework.
-class Mdm::WmapTarget < ActiveRecord::Base
+class Mdm::WmapTarget < ApplicationRecord
   #
   # Attributes
   #

data/app/models/mdm/workspace.rb

@@ -1,6 +1,6 @@
 # Workspace to separate different collections of {#hosts}.  Can be used to separate pentests against different networks
 # or different clients as reports are normally generated against all records in a workspace.
-class Mdm::Workspace < ActiveRecord::Base
+class Mdm::Workspace < ApplicationRecord
   #
   # CONSTANTS
   #
@@ -52,7 +52,7 @@ class Mdm::Workspace < ActiveRecord::Base
   # Users that are allowed to use this workspace.  Does not necessarily include all users, as an {Mdm::User#admin
   # administrator} can access any workspace, even ones where they are not a member.
   has_and_belongs_to_many :users,
-                          -> { uniq },
+                          -> { distinct },
                           class_name: 'Mdm::User',
                           join_table: 'workspace_members'
 
@@ -210,7 +210,7 @@ class Mdm::Workspace < ActiveRecord::Base
       Mdm::WebSite.join_association(:service),
       Mdm::Service.join_association(:host),
       Mdm::Host.join_association(:workspace)
-    ).where(Mdm::Workspace[:id].eq(id)).uniq
+    ).where(Mdm::Workspace[:id].eq(id)).distinct
   end
 
 
@@ -223,7 +223,7 @@ class Mdm::Workspace < ActiveRecord::Base
       Mdm::WebSite.join_association(:service),
       Mdm::Service.join_association(:host),
       Mdm::Host.join_association(:workspace)
-    ).where(Mdm::Workspace[:id].eq(id)).uniq
+    ).where(Mdm::Workspace[:id].eq(id)).distinct
   end
 
   # Web sites running on {#services}.
@@ -234,7 +234,7 @@ class Mdm::Workspace < ActiveRecord::Base
       Mdm::WebSite.join_association(:service),
       Mdm::Service.join_association(:host),
       Mdm::Host.join_association(:workspace)
-    ).where(Mdm::Workspace[:id].eq(id)).uniq
+    ).where(Mdm::Workspace[:id].eq(id)).distinct
   end
 
   # Web vulnerability found on {#web_sites}.
@@ -246,7 +246,7 @@ class Mdm::Workspace < ActiveRecord::Base
       Mdm::WebSite.join_association(:service),
       Mdm::Service.join_association(:host),
       Mdm::Host.join_association(:workspace)
-    ).where(Mdm::Workspace[:id].eq(id)).uniq
+    ).where(Mdm::Workspace[:id].eq(id)).distinct
   end
 
   # Web forms on {#web_sites}.

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

@@ -1,5 +1,5 @@
 # Matches {#matchable} {Mdm::Service} or {Mdm::Vuln} to a {#module_detail Metasploit Module} that can exploit it.
-class MetasploitDataModels::AutomaticExploitation::Match < ActiveRecord::Base
+class MetasploitDataModels::AutomaticExploitation::Match < ApplicationRecord
   #
   # Associations
   #

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

@@ -1,5 +1,5 @@
 # The result of {#run running} a {#match}.
-class MetasploitDataModels::AutomaticExploitation::MatchResult < ActiveRecord::Base
+class MetasploitDataModels::AutomaticExploitation::MatchResult < ApplicationRecord
   #
   # CONSTANTS
   #

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

@@ -1,5 +1,5 @@
 # A set of {#matches automatic exploitation matches}.
-class MetasploitDataModels::AutomaticExploitation::MatchSet < ActiveRecord::Base
+class MetasploitDataModels::AutomaticExploitation::MatchSet < ApplicationRecord
   #
   # Associations
   #

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

@@ -1,5 +1,5 @@
 # Runs a {#match_set set of matches} to produce {#match_results results}.
-class MetasploitDataModels::AutomaticExploitation::Run < ActiveRecord::Base
+class MetasploitDataModels::AutomaticExploitation::Run < ApplicationRecord
   #
   # Associations
   #
@@ -26,4 +26,4 @@ class MetasploitDataModels::AutomaticExploitation::Run < ActiveRecord::Base
              inverse_of: :automatic_exploitation_runs
 
   Metasploit::Concern.run(self)
-end
+end

data/app/models/metasploit_data_models/module_run.rb

@@ -6,7 +6,7 @@
 # There are also associations to {Mdm::Session} for two use cases: a `spawned_session` is a
 # session created by the ModuleRun. A `target_session` is a session that the ModuleRun
 # is acting upon (e.g.) for running a post module.
-class MetasploitDataModels::ModuleRun < ActiveRecord::Base
+class MetasploitDataModels::ModuleRun < ApplicationRecord
   #
   # Constants
   #

data/bin/rails

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/metasploit_data_models/engine', __dir__)
+APP_PATH = File.expand_path('../test/dummy/config/application', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/config/initializers/arel_helper.rb

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

data/config/initializers/ipaddr.rb

@@ -1,10 +1,7 @@
 module IPAddrExtensions
   extend ActiveSupport::Concern
-  included do
-    alias_method_chain :coerce_other, :rescue
-  end
-  
-  def coerce_other_with_rescue(other)
+
+  def coerce(other)
     begin
       case other
       when IPAddr
@@ -18,7 +15,15 @@ module IPAddrExtensions
       OpenStruct.new(family: false, to_i: false)
     end
   end
+
+  def include?(other)
+    begin
+      super(other)
+    rescue IPAddr::InvalidAddressError
+      false
+    end
+  end
   
 end
 
-IPAddr.send(:include, IPAddrExtensions)
+IPAddr.send(:prepend, IPAddrExtensions)

data/db/migrate/000_create_tables.rb

@@ -1,4 +1,4 @@
-class CreateTables < ActiveRecord::Migration
+class CreateTables < ActiveRecord::Migration[4.2]
 
 	def self.up
 		

data/db/migrate/001_add_wmap_tables.rb

@@ -1,4 +1,4 @@
-class AddWmapTables < ActiveRecord::Migration
+class AddWmapTables < ActiveRecord::Migration[4.2]
 	def self.up
 		create_table :wmap_targets do |t|
 			t.string  :host                  # vhost

data/db/migrate/002_add_workspaces.rb

@@ -1,4 +1,4 @@
-class AddWorkspaces < ActiveRecord::Migration
+class AddWorkspaces < ActiveRecord::Migration[4.2]
 
 	def self.up
 		create_table :workspaces do |t|

data/db/migrate/003_move_notes.rb

@@ -1,4 +1,4 @@
-class MoveNotes < ActiveRecord::Migration
+class MoveNotes < ActiveRecord::Migration[4.2]
 	def self.up
 		# Remove the host requirement.  We'll add the column back in below.
 		remove_column :notes, :host_id

data/db/migrate/004_add_events_table.rb

@@ -1,4 +1,4 @@
-class AddEventsTable < ActiveRecord::Migration
+class AddEventsTable < ActiveRecord::Migration[4.2]
 	def self.up
 		create_table :events do |t|
 			t.integer   :workspace_id

data/db/migrate/005_expand_info.rb

@@ -1,4 +1,4 @@
-class ExpandInfo < ActiveRecord::Migration
+class ExpandInfo < ActiveRecord::Migration[4.2]
 	def self.up
 		remove_column :events, :info
 		change_table :events do |t|

data/db/migrate/006_add_timestamps.rb

@@ -1,7 +1,7 @@
 
 # Adds 'created_at' and 'updated_at' columns to every primary table.
 #
-class AddTimestamps < ActiveRecord::Migration
+class AddTimestamps < ActiveRecord::Migration[4.2]
 
 	@@TABLES_NEEDING_RENAME = [:clients, :hosts, :notes, :refs, :services, :vulns, :wmap_requests]
 	@@TABLES_NEEDING_CREATED_AT = [:wmap_targets]

data/db/migrate/007_add_loots.rb

@@ -1,4 +1,4 @@
-class AddLoots < ActiveRecord::Migration
+class AddLoots < ActiveRecord::Migration[4.2]
 
 	def self.up
 		create_table :loots do |t|

data/db/migrate/008_create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[4.2]
   def self.up
     create_table :users do |t|
       t.string :username

data/db/migrate/009_add_loots_ctype.rb

@@ -1,4 +1,4 @@
-class AddLootsCtype < ActiveRecord::Migration
+class AddLootsCtype < ActiveRecord::Migration[4.2]
 	def self.up
 		add_column :loots, :content_type, :string
 	end

data/db/migrate/010_add_alert_fields.rb

@@ -1,4 +1,4 @@
-class AddAlertFields < ActiveRecord::Migration
+class AddAlertFields < ActiveRecord::Migration[4.2]
 	def self.up
 		add_column :notes, :critical, :boolean
 		add_column :notes, :seen, :boolean

data/db/migrate/011_add_reports.rb

@@ -1,4 +1,4 @@
-class AddReports < ActiveRecord::Migration
+class AddReports < ActiveRecord::Migration[4.2]
 
 	def self.up
 		create_table :reports do |t|

data/db/migrate/012_add_tasks.rb

@@ -1,4 +1,4 @@
-class AddTasks < ActiveRecord::Migration
+class AddTasks < ActiveRecord::Migration[4.2]
 
 	def self.up
 		create_table :tasks do |t|

data/db/migrate/013_add_tasks_result.rb

@@ -1,4 +1,4 @@
-class AddTasksResult < ActiveRecord::Migration
+class AddTasksResult < ActiveRecord::Migration[4.2]
 	def self.up
 		add_column :tasks, :result, :text
 	end

data/db/migrate/014_add_loots_fields.rb

@@ -1,4 +1,4 @@
-class AddLootsFields < ActiveRecord::Migration
+class AddLootsFields < ActiveRecord::Migration[4.2]
 	def self.up
 		add_column :loots, :name, :text
 		add_column :loots, :info, :text

data/db/migrate/015_rename_user.rb

@@ -1,4 +1,4 @@
-class RenameUser < ActiveRecord::Migration
+class RenameUser < ActiveRecord::Migration[4.2]
 	def self.up
 		remove_column :events, :user
 		change_table :events do |t|

data/db/migrate/016_add_host_purpose.rb

@@ -1,4 +1,4 @@
-class AddHostPurpose < ActiveRecord::Migration
+class AddHostPurpose < ActiveRecord::Migration[4.2]
 	def self.up
 		add_column :hosts, :purpose, :text
 	end

data/db/migrate/017_expand_info2.rb

@@ -1,4 +1,4 @@
-class ExpandInfo2 < ActiveRecord::Migration
+class ExpandInfo2 < ActiveRecord::Migration[4.2]
 	def self.up
 		remove_column :events, :info
 		change_table :events do |t|

data/db/migrate/018_add_workspace_user_info.rb

@@ -1,4 +1,4 @@
-class AddWorkspaceUserInfo < ActiveRecord::Migration
+class AddWorkspaceUserInfo < ActiveRecord::Migration[4.2]
 	def self.up
 		change_table :workspaces do |t|
 			t.string :boundary, :limit => 4096

data/db/migrate/019_add_workspace_desc.rb

@@ -1,4 +1,4 @@
-class AddWorkspaceDesc < ActiveRecord::Migration
+class AddWorkspaceDesc < ActiveRecord::Migration[4.2]
 	def self.up
 		change_table :workspaces do |t|
 			t.string :description, :limit => 4096

data/db/migrate/020_add_user_preferences.rb

@@ -1,4 +1,4 @@
-class AddUserPreferences < ActiveRecord::Migration
+class AddUserPreferences < ActiveRecord::Migration[4.2]
 	def self.up
 		add_column :users, :prefs, :string, :limit => 524288
 	end

data/db/migrate/021_standardize_info_and_data.rb

@@ -1,4 +1,4 @@
-class StandardizeInfoAndData < ActiveRecord::Migration
+class StandardizeInfoAndData < ActiveRecord::Migration[4.2]
 	def self.up
 		# Remove the host requirement.  We'll add the column back in below.
 		remove_column :vulns, :data

data/db/migrate/022_enlarge_event_info.rb

@@ -1,4 +1,4 @@
-class EnlargeEventInfo < ActiveRecord::Migration
+class EnlargeEventInfo < ActiveRecord::Migration[4.2]
 	def self.up
 		change_column :events, :info, :text
 	end

data/db/migrate/023_add_report_downloaded_at.rb

@@ -1,4 +1,4 @@
-class AddReportDownloadedAt < ActiveRecord::Migration
+class AddReportDownloadedAt < ActiveRecord::Migration[4.2]
 	def self.up
 		add_column :reports, :downloaded_at, :timestamp
 	end

data/db/migrate/024_convert_service_info_to_text.rb

@@ -1,4 +1,4 @@
-class ConvertServiceInfoToText < ActiveRecord::Migration
+class ConvertServiceInfoToText < ActiveRecord::Migration[4.2]
 
 	def self.up
 		change_column :services, :info, :text

data/db/migrate/025_add_user_admin.rb

@@ -1,4 +1,4 @@
-class AddUserAdmin < ActiveRecord::Migration
+class AddUserAdmin < ActiveRecord::Migration[4.2]
 
 	# Add user admin flag and project member list.
 	def self.up

data/db/migrate/026_add_creds_table.rb

@@ -1,4 +1,4 @@
-class AddCredsTable < ActiveRecord::Migration
+class AddCredsTable < ActiveRecord::Migration[4.2]
 	def self.up
 		create_table :creds do |t|
 			t.integer   :service_id, :null => false

data/db/migrate/20100819123300_migrate_cred_data.rb

@@ -1,4 +1,4 @@
-class MigrateCredData < ActiveRecord::Migration
+class MigrateCredData < ActiveRecord::Migration[4.2]
 
 	def self.up
 		begin # Wrap the whole thing in a giant rescue.

data/db/migrate/20100824151500_add_exploited_table.rb

@@ -1,4 +1,4 @@
-class AddExploitedTable < ActiveRecord::Migration
+class AddExploitedTable < ActiveRecord::Migration[4.2]
 	def self.up
 		create_table :exploited_hosts do |t|
 			t.integer   :host_id, :null => false