metasploit_data_models 0.7.0-java → 0.11.2-java

data/spec/factories/mdm/module/actions.rb

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :mdm_module_action, :class => Mdm::Module::Action do
+    name { generate :mdm_module_action_name }
+
+    #
+    # Associations
+    #
+    association :detail, :factory => :mdm_module_detail
+  end
+
+  sequence :mdm_module_action_name do |n|
+    "Mdm::Module::Action#name #{n}"
+  end
+end

data/spec/factories/mdm/module/archs.rb

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :mdm_module_arch, :class => Mdm::Module::Arch do
+    name { generate :mdm_module_arch_name }
+
+    #
+    # Associations
+    #
+    association :detail, :factory => :mdm_module_detail
+  end
+
+  sequence :mdm_module_arch_name do |n|
+    "Mdm::Module::Arch#name #{n}"
+  end
+end

data/spec/factories/mdm/{module_authors.rb → module/authors.rb}

@@ -1,11 +1,11 @@
 FactoryGirl.define do
-  factory :mdm_module_author, :class => Mdm::ModuleAuthor do
+  factory :mdm_module_author, :class => Mdm::Module::Author do
     name { generate :mdm_module_author_name }
 
     #
     # Associations
     #
-    association :module_detail, :factory => :mdm_module_detail
+    association :detail, :factory => :mdm_module_detail
 
     factory :full_mdm_module_author do
       email { generate :mdm_module_author_name }
@@ -13,10 +13,10 @@ FactoryGirl.define do
   end
 
   sequence :mdm_module_author_name do |n|
-    "Mdm::ModuleAuthor#name #{n}"
+    "Mdm::Module::Author#name #{n}"
   end
 
   sequence :mdm_module_author_email do |n|
-    "Mdm::ModuleAuthor#email #{n}"
+    "Mdm::Module::Author#email #{n}"
   end
 end

data/spec/factories/mdm/module/details.rb

@@ -0,0 +1,66 @@
+FactoryGirl.define do
+  factory :mdm_module_detail, :class => Mdm::Module::Detail do
+    ignore do
+      root {
+        MetasploitDataModels.root
+      }
+      modules_pathname { root.join('modules') }
+    end
+
+    description { generate :mdm_module_detail_description }
+    disclosure_date { generate :mdm_module_detail_disclosure_date }
+    license { generate :mdm_module_detail_license }
+    mtime { generate :mdm_module_detail_mtime }
+    mtype { generate :mdm_module_detail_mtype }
+    privileged { generate :mdm_module_detail_privileged }
+    name { generate :mdm_module_detail_name }
+    rank { generate :mdm_module_detail_rank }
+    refname { generate :mdm_module_detail_refname }
+    fullname { "#{mtype}/#{refname}" }
+    stance { generate :mdm_module_detail_stance }
+
+    file {
+      type_directory = Mdm::Module::Detail::DIRECTORY_BY_TYPE[mtype]
+
+      modules_pathname.join(
+          type_directory,
+          "#{refname}.rb"
+      ).to_path
+    }
+  end
+
+	sequence :mdm_module_detail_disclosure_date do |n|
+		# @todo https://www.pivotaltracker.com/story/show/48450593
+		Date.today - n
+	end
+
+	sequence :mdm_module_detail_description do |n|
+    "Module Description #{n}"
+	end
+
+	sequence :mdm_module_detail_license do |n|
+		"Module License v#{n}"
+	end
+
+	sequence :mdm_module_detail_privileged, Mdm::Module::Detail::PRIVILEGES.cycle
+
+	sequence :mdm_module_detail_mtime do |n|
+		Time.now.utc - n.seconds
+	end
+
+	ordered_types = Mdm::Module::Detail::DIRECTORY_BY_TYPE.keys.sort
+	sequence :mdm_module_detail_mtype, ordered_types.cycle
+
+	sequence :mdm_module_detail_name do |n|
+		"Module Name #{n}"
+	end
+
+  ordered_ranks = Mdm::Module::Detail::RANK_BY_NAME.values.sort
+	sequence :mdm_module_detail_rank, ordered_ranks.cycle
+
+  sequence :mdm_module_detail_refname do |n|
+    "module/ref/name#{n}"
+  end
+
+	sequence :mdm_module_detail_stance, Mdm::Module::Detail::STANCES.cycle
+end

data/spec/factories/mdm/module/mixins.rb

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :mdm_module_mixin, :class => Mdm::Module::Mixin do
+    name { generate :mdm_module_mixin_name }
+
+    #
+    # Associations
+    #
+    association :detail, :factory => :mdm_module_detail
+  end
+
+  sequence :mdm_module_mixin_name do |n|
+    "Mdm::Module::Mixin#name #{n}"
+  end
+end

data/spec/factories/mdm/module/platforms.rb

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :mdm_module_platform, :class => Mdm::Module::Platform do
+    name { generate :mdm_module_platform_name }
+
+    #
+    # Associations
+    #
+    association :detail, :factory => :mdm_module_detail
+  end
+
+  sequence :mdm_module_platform_name do |n|
+    "Mdm::Module::Platform#name #{n}"
+  end
+end

data/spec/factories/mdm/module/refs.rb

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :mdm_module_ref, :class => Mdm::Module::Ref do
+    name { generate :mdm_module_ref_name }
+
+    #
+    # Associations
+    #
+    association :detail, :factory => :mdm_module_detail
+  end
+
+  sequence :mdm_module_ref_name do |n|
+    "Mdm::Module::Ref#name #{n}"
+  end
+end

data/spec/factories/mdm/{module_targets.rb → module/targets.rb}

@@ -1,12 +1,12 @@
 FactoryGirl.define do
-  factory :mdm_module_target, :class => Mdm::ModuleTarget do
+  factory :mdm_module_target, :class => Mdm::Module::Target do
     index { generate :mdm_module_target_index }
     name { generate :mdm_module_target_name }
 
     #
     # Associations
     #
-    association :module_detail, :factory => :mdm_module_detail
+    association :detail, :factory => :mdm_module_detail
   end
 
   sequence :mdm_module_target_index do |n|
@@ -14,6 +14,6 @@ FactoryGirl.define do
   end
 
   sequence :mdm_module_target_name do |n|
-    "Mdm::ModuleTarget#name #{n}"
+    "Mdm::Module::Target#name #{n}"
   end
 end

data/spec/factories/mdm/refs.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :mdm_ref, :class => Mdm::Ref do
+    name { generate :mdm_ref_name }
+  end
+
+  sequence :mdm_ref_name do |n|
+    "Mdm::Ref#name #{n}"
+  end
+end

data/spec/factories/mdm/tags.rb

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :mdm_tag, :class => Mdm::Tag do
+    desc { generate :mdm_tag_desc }
+    name { generate :mdm_tag_name }
+  end
+
+  sequence :mdm_tag_desc do |n|
+    "Mdm::Tag#description #{n}"
+  end
+
+  sequence :mdm_tag_name do |n|
+    "mdm_tag_name#{n}"
+  end
+end

data/spec/factories/mdm/vuln_refs.rb

@@ -0,0 +1,4 @@
+FactoryGirl.define do
+  factory :mdm_vuln_ref, :class => Mdm::VulnRef do
+  end
+end

data/spec/factories/mdm/vulns.rb

@@ -0,0 +1,20 @@
+FactoryGirl.define do
+  factory :mdm_vuln, :class => Mdm::Vuln do
+    name { generate :mdm_vuln_name }
+
+    trait :host do
+      association :host, :factory => :mdm_host
+    end
+
+    trait :service do
+      association :service, :factory => :mdm_service
+    end
+
+    factory :mdm_host_vuln, :traits => [:host]
+    factory :mdm_service_vuln, :traits => [:service]
+  end
+
+  sequence :mdm_vuln_name do |n|
+    "Mdm::Vuln#name #{n}"
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.7.0
+  version: 0.11.2
 platform: java
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -188,14 +188,14 @@ files:
 - app/models/mdm/loot.rb
 - app/models/mdm/macro.rb
 - app/models/mdm/mod_ref.rb
-- app/models/mdm/module_action.rb
-- app/models/mdm/module_arch.rb
-- app/models/mdm/module_author.rb
-- app/models/mdm/module_detail.rb
-- app/models/mdm/module_mixin.rb
-- app/models/mdm/module_platform.rb
-- app/models/mdm/module_ref.rb
-- app/models/mdm/module_target.rb
+- app/models/mdm/module/action.rb
+- app/models/mdm/module/arch.rb
+- app/models/mdm/module/author.rb
+- app/models/mdm/module/detail.rb
+- app/models/mdm/module/mixin.rb
+- app/models/mdm/module/platform.rb
+- app/models/mdm/module/ref.rb
+- app/models/mdm/module/target.rb
 - app/models/mdm/nexpose_console.rb
 - app/models/mdm/note.rb
 - app/models/mdm/profile.rb
@@ -307,11 +307,22 @@ files:
 - db/migrate/20120625000008_add_fail_message.rb
 - db/migrate/20120718202805_add_owner_and_payload_to_web_vulns.rb
 - db/migrate/20130228214900_change_required_columns_to_null_false_in_web_vulns.rb
+- db/migrate/20130412154159_change_foreign_key_in_module_actions.rb
+- db/migrate/20130412171844_change_foreign_key_in_module_archs.rb
+- db/migrate/20130412173121_change_foreign_key_in_module_authors.rb
+- db/migrate/20130412173640_change_foreign_key_in_module_mixins.rb
+- db/migrate/20130412174254_change_foreign_key_in_module_platforms.rb
+- db/migrate/20130412174719_change_foreign_key_in_module_refs.rb
+- db/migrate/20130412175040_change_foreign_key_in_module_targets.rb
 - db/migrate/20130423211152_add_creds_counter_cache.rb
+- db/migrate/20130430151353_change_required_columns_to_null_false_in_hosts.rb
+- db/migrate/20130430162145_enforce_address_uniqueness_in_workspace_in_hosts.rb
 - lib/mdm.rb
 - lib/mdm/host/operating_system_normalization.rb
+- lib/mdm/module.rb
 - lib/metasploit_data_models.rb
 - lib/metasploit_data_models/base64_serializer.rb
+- lib/metasploit_data_models/change_required_columns_to_null_false.rb
 - lib/metasploit_data_models/engine.rb
 - lib/metasploit_data_models/serialized_prefs.rb
 - lib/metasploit_data_models/validators/ip_format_validator.rb
@@ -320,14 +331,20 @@ files:
 - lib/tasks/yard.rake
 - metasploit_data_models.gemspec
 - script/rails
-- spec/app/models/mdm/module_action_spec.rb
-- spec/app/models/mdm/module_arch_spec.rb
-- spec/app/models/mdm/module_author_spec.rb
-- spec/app/models/mdm/module_detail_spec.rb
-- spec/app/models/mdm/module_mixin_spec.rb
-- spec/app/models/mdm/module_platform_spec.rb
-- spec/app/models/mdm/module_ref_spec.rb
-- spec/app/models/mdm/module_target_spec.rb
+- spec/app/models/mdm/host_spec.rb
+- spec/app/models/mdm/host_tag_spec.rb
+- spec/app/models/mdm/module/action_spec.rb
+- spec/app/models/mdm/module/arch_spec.rb
+- spec/app/models/mdm/module/author_spec.rb
+- spec/app/models/mdm/module/detail_spec.rb
+- spec/app/models/mdm/module/mixin_spec.rb
+- spec/app/models/mdm/module/platform_spec.rb
+- spec/app/models/mdm/module/ref_spec.rb
+- spec/app/models/mdm/module/target_spec.rb
+- spec/app/models/mdm/ref_spec.rb
+- spec/app/models/mdm/tag_spec.rb
+- spec/app/models/mdm/vuln_ref_spec.rb
+- spec/app/models/mdm/vuln_spec.rb
 - spec/app/models/mdm/web_vuln_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -362,17 +379,22 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/factories/mdm/addresses.rb
+- spec/factories/mdm/host_tags.rb
 - spec/factories/mdm/hosts.rb
-- spec/factories/mdm/module_actions.rb
-- spec/factories/mdm/module_archs.rb
-- spec/factories/mdm/module_authors.rb
-- spec/factories/mdm/module_details.rb
-- spec/factories/mdm/module_mixins.rb
-- spec/factories/mdm/module_platforms.rb
-- spec/factories/mdm/module_refs.rb
-- spec/factories/mdm/module_targets.rb
+- spec/factories/mdm/module/actions.rb
+- spec/factories/mdm/module/archs.rb
+- spec/factories/mdm/module/authors.rb
+- spec/factories/mdm/module/details.rb
+- spec/factories/mdm/module/mixins.rb
+- spec/factories/mdm/module/platforms.rb
+- spec/factories/mdm/module/refs.rb
+- spec/factories/mdm/module/targets.rb
+- spec/factories/mdm/refs.rb
 - spec/factories/mdm/services.rb
+- spec/factories/mdm/tags.rb
 - spec/factories/mdm/users.rb
+- spec/factories/mdm/vuln_refs.rb
+- spec/factories/mdm/vulns.rb
 - spec/factories/mdm/web_sites.rb
 - spec/factories/mdm/web_vulns.rb
 - spec/factories/mdm/workspaces.rb
@@ -411,14 +433,20 @@ signing_key:
 specification_version: 3
 summary: Database code for MSF and Metasploit Pro
 test_files:
-- spec/app/models/mdm/module_action_spec.rb
-- spec/app/models/mdm/module_arch_spec.rb
-- spec/app/models/mdm/module_author_spec.rb
-- spec/app/models/mdm/module_detail_spec.rb
-- spec/app/models/mdm/module_mixin_spec.rb
-- spec/app/models/mdm/module_platform_spec.rb
-- spec/app/models/mdm/module_ref_spec.rb
-- spec/app/models/mdm/module_target_spec.rb
+- spec/app/models/mdm/host_spec.rb
+- spec/app/models/mdm/host_tag_spec.rb
+- spec/app/models/mdm/module/action_spec.rb
+- spec/app/models/mdm/module/arch_spec.rb
+- spec/app/models/mdm/module/author_spec.rb
+- spec/app/models/mdm/module/detail_spec.rb
+- spec/app/models/mdm/module/mixin_spec.rb
+- spec/app/models/mdm/module/platform_spec.rb
+- spec/app/models/mdm/module/ref_spec.rb
+- spec/app/models/mdm/module/target_spec.rb
+- spec/app/models/mdm/ref_spec.rb
+- spec/app/models/mdm/tag_spec.rb
+- spec/app/models/mdm/vuln_ref_spec.rb
+- spec/app/models/mdm/vuln_spec.rb
 - spec/app/models/mdm/web_vuln_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -453,17 +481,22 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/factories/mdm/addresses.rb
+- spec/factories/mdm/host_tags.rb
 - spec/factories/mdm/hosts.rb
-- spec/factories/mdm/module_actions.rb
-- spec/factories/mdm/module_archs.rb
-- spec/factories/mdm/module_authors.rb
-- spec/factories/mdm/module_details.rb
-- spec/factories/mdm/module_mixins.rb
-- spec/factories/mdm/module_platforms.rb
-- spec/factories/mdm/module_refs.rb
-- spec/factories/mdm/module_targets.rb
+- spec/factories/mdm/module/actions.rb
+- spec/factories/mdm/module/archs.rb
+- spec/factories/mdm/module/authors.rb
+- spec/factories/mdm/module/details.rb
+- spec/factories/mdm/module/mixins.rb
+- spec/factories/mdm/module/platforms.rb
+- spec/factories/mdm/module/refs.rb
+- spec/factories/mdm/module/targets.rb
+- spec/factories/mdm/refs.rb
 - spec/factories/mdm/services.rb
+- spec/factories/mdm/tags.rb
 - spec/factories/mdm/users.rb
+- spec/factories/mdm/vuln_refs.rb
+- spec/factories/mdm/vulns.rb
 - spec/factories/mdm/web_sites.rb
 - spec/factories/mdm/web_vulns.rb
 - spec/factories/mdm/workspaces.rb

data/app/models/mdm/module_detail.rb

@@ -1,59 +0,0 @@
-class Mdm::ModuleDetail < ActiveRecord::Base
-  self.table_name = 'module_details'
-
-  #
-  # Associations
-  #
-
-  has_many :actions,   :class_name => 'Mdm::ModuleAction',   :dependent => :destroy, :source => :module_action
-  has_many :archs,     :class_name => 'Mdm::ModuleArch',     :dependent => :destroy, :source => :module_arch
-  has_many :authors,   :class_name => 'Mdm::ModuleAuthor',   :dependent => :destroy, :source => :module_author
-  has_many :mixins,    :class_name => 'Mdm::ModuleMixin',    :dependent => :destroy, :source => :module_mixin
-  has_many :platforms, :class_name => 'Mdm::ModulePlatform', :dependent => :destroy, :source => :module_platform
-  has_many :refs,      :class_name => 'Mdm::ModuleRef',      :dependent => :destroy, :source => :module_ref
-  has_many :targets,   :class_name => 'Mdm::ModuleTarget',   :dependent => :destroy, :source => :module_target
-
-  #
-  # Validations
-  #
-
-  validates :refname,   :presence => true
-
-  validates_associated :actions
-  validates_associated :archs
-  validates_associated :authors
-  validates_associated :mixins
-  validates_associated :platforms
-  validates_associated :refs
-  validates_associated :targets
-
-  def add_action(name)
-    self.actions.build(:name => name).save
-  end
-
-  def add_arch(name)
-    self.archs.build(:name => name).save
-  end
-
-  def add_author(name, email=nil)
-    self.authors.build(:name => name, :email => email).save
-  end
-
-  def add_mixin(name)
-    self.mixins.build(:name => name).save
-  end
-
-  def add_platform(name)
-    self.platforms.build(:name => name).save
-  end
-
-  def add_ref(name)
-    self.refs.build(:name => name).save
-  end
-
-  def add_target(index, name)
-    self.targets.build(:index => index, :name => name).save
-  end
-
-  ActiveSupport.run_load_hooks(:mdm_module_detail, self)
-end