metasploit_data_models 0.24.5 → 1.0.0.pre.rails.pre.4.0a

data/db/migrate/002_add_workspaces.rb

@@ -3,7 +3,7 @@ class AddWorkspaces < ActiveRecord::Migration
 	def self.up
 		create_table :workspaces do |t|
 			t.string    :name
-			t.timestamps
+			t.timestamps null: false
 		end
 
 		change_table :hosts do |t|
@@ -16,7 +16,7 @@ class AddWorkspaces < ActiveRecord::Migration
 		# This was broken after 018_add_workspace_user_info was introduced
 		# because of the new boundary column.  For some reason, the
 		# find_or_create_by_name that .default eventually calls here tries to
-		# create a record with the boundary field that doesn't exist yet.  
+		# create a record with the boundary field that doesn't exist yet.
 		# See #1724
 		#
 		#w = Msf::DBManager::Workspace.default

data/db/migrate/007_add_loots.rb

@@ -8,7 +8,7 @@ class AddLoots < ActiveRecord::Migration
 			t.string    :ltype, :limit => 512
 			t.string    :path, :limit  => 1024
 			t.text      :data
-			t.timestamps
+			t.timestamps null: false
 		end
 	end
 

data/db/migrate/008_create_users.rb

@@ -6,7 +6,7 @@ class CreateUsers < ActiveRecord::Migration
       t.string :password_salt
       t.string :persistence_token
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 

data/db/migrate/011_add_reports.rb

@@ -7,7 +7,7 @@ class AddReports < ActiveRecord::Migration
 			t.string    :rtype
 			t.string    :path, :limit  => 1024
 			t.text      :options
-			t.timestamps
+			t.timestamps null: false
 		end
 	end
 

data/db/migrate/012_add_tasks.rb

@@ -12,7 +12,7 @@ class AddTasks < ActiveRecord::Migration
 			t.integer   :progress
 			t.text      :options
 			t.text      :error
-			t.timestamps
+			t.timestamps null: false
 		end
 	end
 

data/db/migrate/026_add_creds_table.rb

@@ -2,12 +2,12 @@ class AddCredsTable < ActiveRecord::Migration
 	def self.up
 		create_table :creds do |t|
 			t.integer   :service_id, :null => false
-			t.timestamps 
+			t.timestamps null: false
 			t.string    :user, :limit => 2048
 			t.string    :pass, :limit => 4096
 			t.boolean   :active, :default => true
 			t.string    :proof, :limit => 4096
-			t.string    :ptype, :limit => 16 
+			t.string    :ptype, :limit => 16
 			t.integer   :source_id
 			t.string    :source_type
 		end

data/db/migrate/20100824151500_add_exploited_table.rb

@@ -6,7 +6,7 @@ class AddExploitedTable < ActiveRecord::Migration
 			t.string    :session_uuid, :limit => 8
 			t.string    :name, :limit => 2048
 			t.string    :payload, :limit => 2048
-			t.timestamps 
+			t.timestamps null: false
 		end
 	end
 	def self.down

data/db/migrate/20100911122000_add_report_templates.rb

@@ -6,7 +6,7 @@ class AddReportTemplates < ActiveRecord::Migration
 			t.string    :created_by
 			t.string    :path, :limit  => 1024
 			t.text      :name
-			t.timestamps
+			t.timestamps null: false
 		end
 	end
 

data/db/migrate/20100916175000_add_campaigns_and_templates.rb

@@ -9,7 +9,7 @@ class AddCampaignsAndTemplates < ActiveRecord::Migration
 			t.text      :prefs
 			t.integer   :status, :default => 0
 			t.timestamp :started_at
-			t.timestamps
+			t.timestamps null: false
 		end
 
 		create_table :email_templates do |t|

data/db/migrate/20101001000000_add_web_tables.rb

@@ -1,51 +1,51 @@
 class AddWebTables < ActiveRecord::Migration
-	
+
 	def self.up
 		create_table :web_sites do |t|
 			t.integer   :service_id, :null => false
-			t.timestamps 
+			t.timestamps null: false
 			t.string    :vhost, :limit => 2048
 			t.text      :comments
 			t.text      :options
 		end
-		
+
 		create_table :web_pages do |t|
 			t.integer   :web_site_id, :null => false
-			t.timestamps 
+			t.timestamps null: false
 			t.text      :path
 			t.text      :query
 			t.integer   :code, :null => false
 			t.text      :cookie
 			t.text      :auth
 			t.text      :ctype
-			t.timestamp :mtime				
+			t.timestamp :mtime
 			t.text      :location
 			t.text      :body
 			t.text      :headers
-		end	
+		end
 
 		create_table :web_forms do |t|
 			t.integer   :web_site_id, :null => false
-			t.timestamps 
+			t.timestamps null: false
 			t.text      :path
 			t.string    :method, :limit => 1024
 			t.text      :params
-		end	
+		end
 
 		create_table :web_vulns do |t|
 			t.integer   :web_site_id, :null => false
-			t.timestamps 
+			t.timestamps null: false
 			t.text      :path
 			t.string    :method, :limit => 1024
 			t.text      :params
 			t.text      :pname
 			t.text      :proof
 			t.integer   :risk
-			t.string    :name,    :limit => 1024	
-		end	
-							
+			t.string    :name,    :limit => 1024
+		end
+
 	end
-	
+
 	def self.down
 		drop_table :web_sites
 		drop_table :web_pages

data/db/migrate/20110204112800_add_host_tags.rb

@@ -9,7 +9,7 @@ class AddHostTags < ActiveRecord::Migration
 			t.boolean  :report_summary, :null => false, :default => false
 			t.boolean  :report_detail, :null => false, :default => false
 			t.boolean  :critical, :null => false, :default => false
-			t.timestamps
+			t.timestamps null: false
 		end
 
 		create_table :hosts_tags, :id => false do |t|

data/db/migrate/20110527000001_add_api_keys_table.rb

@@ -2,7 +2,7 @@ class AddApiKeysTable < ActiveRecord::Migration
 	def self.up
 		create_table :api_keys do |t|
 			t.text :token
-			t.timestamps
+			t.timestamps null: false
 		end
 	end
 	def self.down

data/db/migrate/20110606000001_add_macros_table.rb

@@ -1,12 +1,12 @@
 class AddMacrosTable < ActiveRecord::Migration
 	def self.up
 		create_table :macros do |t|
-			t.timestamps
+			t.timestamps null: false
 			t.text :owner
 			t.text :name
 			t.text :description
 			t.binary :actions
-			t.binary :prefs			
+			t.binary :prefs
 		end
 	end
 	def self.down

data/db/migrate/20110624000001_add_listeners_table.rb

@@ -1,7 +1,7 @@
 class AddListenersTable < ActiveRecord::Migration
 	def self.up
 		create_table :listeners do |t|
-			t.timestamps
+			t.timestamps null: false
 			t.integer :workspace_id, :null => false, :default => 1
 			t.integer :task_id
 			t.boolean :enabled, :default => true

data/db/migrate/20110630000001_add_nexpose_consoles_table.rb

@@ -1,7 +1,7 @@
 class AddNexposeConsolesTable < ActiveRecord::Migration
 	def self.up
 		create_table :nexpose_consoles do |t|
-			t.timestamps
+			t.timestamps null: false
 			t.boolean :enabled, :default => true
 			t.text :owner
 			t.text :address

data/db/migrate/20110717000001_add_profiles_table.rb

@@ -1,7 +1,7 @@
 class AddProfilesTable < ActiveRecord::Migration
 	def self.up
 		create_table :profiles do |t|
-			t.timestamps
+			t.timestamps null: false
 			t.boolean :active, :default => true
 			t.text :name
 			t.text :owner

data/db/migrate/20130522001343_create_task_creds.rb

@@ -3,7 +3,7 @@ class CreateTaskCreds < ActiveRecord::Migration
     create_table :task_creds do |t|
       t.references :task, :null => false
       t.references :cred, :null => false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20130522032517_create_task_hosts.rb

@@ -3,7 +3,7 @@ class CreateTaskHosts < ActiveRecord::Migration
     create_table :task_hosts do |t|
       t.references :task, :null => false
       t.references :host, :null => false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20130522041110_create_task_services.rb

@@ -3,7 +3,7 @@ class CreateTaskServices < ActiveRecord::Migration
     create_table :task_services do |t|
       t.references :task, :null => false
       t.references :service, :null => false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20130604145732_create_task_sessions.rb

@@ -3,7 +3,7 @@ class CreateTaskSessions < ActiveRecord::Migration
     create_table :task_sessions do |t|
       t.references :task, :null => false
       t.references :session, :null => false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20131002004641_create_automatic_exploitation_matches.rb

@@ -5,7 +5,7 @@ class CreateAutomaticExploitationMatches < ActiveRecord::Migration
       t.string :state
       t.integer :nexpose_data_vulnerability_definition_id
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :automatic_exploitation_matches, :ref_id

data/db/migrate/20131002164449_create_automatic_exploitation_match_sets.rb

@@ -4,7 +4,7 @@ class CreateAutomaticExploitationMatchSets < ActiveRecord::Migration
       t.integer :workspace_id
       t.integer :user_id
 
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :automatic_exploitation_match_sets, :user_id
     add_index :automatic_exploitation_match_sets, :workspace_id

data/db/migrate/20131008213344_create_automatic_exploitation_runs.rb

@@ -5,7 +5,7 @@ class CreateAutomaticExploitationRuns < ActiveRecord::Migration
       t.integer :user_id
       t.integer :match_set_id
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20131017150735_create_automatic_exploitation_match_results.rb

@@ -5,7 +5,7 @@ class CreateAutomaticExploitationMatchResults < ActiveRecord::Migration
       t.integer :run_id
       t.string :state, null: false
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20150219173821_create_module_runs.rb

@@ -14,7 +14,7 @@ class CreateModuleRuns < ActiveRecord::Migration
       t.integer :user_id
       t.string :username
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :module_runs, :session_id

data/db/migrate/20150317145455_rename_module_indices.rb

@@ -0,0 +1,29 @@
+class RenameModuleIndices < ActiveRecord::Migration
+  def change
+    # This migration will only need to be run if the indices were originally
+    # generated before Rails 4. Fresh builds can safely skip this.
+    return if ActiveRecord::Base.connection.indexes(:module_actions).first.name != 'index_module_actions_on_module_detail_id'
+
+    rename_index :module_actions,
+                 'index_module_actions_on_module_detail_id',
+                 'index_module_actions_on_detail_id'
+    rename_index :module_archs,
+                 'index_module_archs_on_module_detail_id',
+                 'index_module_archs_on_detail_id'
+    rename_index :module_authors,
+                 'index_module_authors_on_module_detail_id',
+                 'index_module_authors_on_detail_id'
+    rename_index :module_mixins,
+                 'index_module_mixins_on_module_detail_id',
+                 'index_module_mixins_on_detail_id'
+    rename_index :module_platforms,
+                 'index_module_platforms_on_module_detail_id',
+                 'index_module_platforms_on_detail_id'
+    rename_index :module_refs,
+                 'index_module_refs_on_module_detail_id',
+                 'index_module_refs_on_detail_id'
+    rename_index :module_targets,
+                 'index_module_targets_on_module_detail_id',
+                 'index_module_targets_on_detail_id'
+  end
+end

data/db/migrate/20150421211719_rename_automatic_exploitation_index.rb

@@ -0,0 +1,16 @@
+class RenameAutomaticExploitationIndex < ActiveRecord::Migration
+  def up
+    if index_name_exists? :automatic_exploitation_matches, :index_automatic_exploitation_matches_on_ref_id, false
+      rename_index :automatic_exploitation_matches,
+      :index_automatic_exploitation_matches_on_ref_id,
+      :index_automatic_exploitation_matches_on_module_detail_id
+    end
+  end
+  def down
+    if index_name_exists? :automatic_exploitation_matches, :index_automatic_exploitation_matches_on_module_detail_id, false
+      rename_index :automatic_exploitation_matches,
+      :index_automatic_exploitation_matches_on_module_detail_id,
+      :index_automatic_exploitation_matches_on_ref_id
+    end
+  end
+end

data/lib/mdm/host/operating_system_normalization.rb

@@ -188,7 +188,7 @@ module Mdm::Host::OperatingSystemNormalization
     # Handle cases where the flavor contains the base name (legacy parsing, etc)
     # TODO: Remove this once we are sure it is no longer needed
     if host.os_name && host.os_flavor && host.os_flavor.index(host.os_name)
-      dlog("Host #{host.address} has os_flavor that contains os_name")
+      dlog("Host #{host.address.to_s} has os_flavor that contains os_name")
       dlog("os_flavor: #{host.os_flavor}")
       dlog("os_name: #{host.os_name}")
       host.os_flavor = host.os_flavor.gsub(host.os_name, '').strip

data/lib/metasploit_data_models.rb

@@ -16,6 +16,7 @@ require 'active_support/all'
 require 'metasploit/concern'
 require 'metasploit/model'
 require 'arel-helpers'
+require 'postgres_ext'
 
 #
 # Project

data/lib/metasploit_data_models/engine.rb

@@ -11,7 +11,7 @@ class MetasploitDataModels::Engine < Rails::Engine
 
   # Remove ActiveSupport::Dependencies loading paths to save time during constant resolution and to ensure that
   # metasploit_data_models is properly declaring all autoloads and not falling back on ActiveSupport::Dependencies
-  config.paths.each_value do |path|
+  config.paths.values.each do |path|
     path.skip_autoload!
     path.skip_autoload_once!
     path.skip_eager_load!

data/lib/metasploit_data_models/version.rb

@@ -2,11 +2,13 @@ module MetasploitDataModels
   # Holds components of {VERSION} as defined by {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0}.
   module Version
     # The major version number.
-    MAJOR = 0
+    MAJOR = 1
     # The minor version number, scoped to the {MAJOR} version number.
-    MINOR = 24
+    MINOR = 0
     # The patch number, scoped to the {MAJOR} and {MINOR} version numbers.
-    PATCH = 5
+    PATCH = 0
+    # The prerelease version, scoped to the {MAJOR}, {MINOR}, and {PATCH} version numbers.
+    PRERELEASE = 'rails-4.0a'
 
     # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the `PRERELEASE` in the
     # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.

data/metasploit_data_models.gemspec

@@ -37,20 +37,23 @@ Gem::Specification.new do |s|
   # debugging
   s.add_development_dependency 'pry'
 
-  # restrict from rails 4.0 as it requires protected_attributes gem and other changes for compatibility
-  # @see MSP-2971
-  s.add_runtime_dependency 'activerecord', '>= 3.2.13', '< 4.0.0'
-  s.add_runtime_dependency 'activesupport'
+  rails_version_constraints = ['>= 4.0.9', '< 4.1.0']
+
+  s.add_runtime_dependency 'activerecord', *rails_version_constraints
+  s.add_runtime_dependency 'activesupport', *rails_version_constraints
+  s.add_runtime_dependency 'metasploit-concern', '1.0.0.pre.rails.pre.4.0'
+  s.add_runtime_dependency 'metasploit-model', '1.0.0.pre.rails.pre.4.0'
+  s.add_runtime_dependency 'railties', *rails_version_constraints
+
   # os fingerprinting
   s.add_runtime_dependency 'recog', '~> 1.0'
 
-  s.add_runtime_dependency 'metasploit-concern', '0.4.0'
-  s.add_runtime_dependency 'metasploit-model', '~> 0.29.0'
-  s.add_runtime_dependency 'railties', '< 4.0.0'
-
   # arel-helpers: Useful tools to help construct database queries with ActiveRecord and Arel.
   s.add_runtime_dependency 'arel-helpers'
 
+  # Fixes a problem with arel not being able to visit IPAddr nodes
+  s.add_runtime_dependency 'postgres_ext'
+
   if RUBY_PLATFORM =~ /java/
     # markdown formatting for yard
     s.add_development_dependency 'kramdown'