metasploit_data_models 0.14.4-java → 0.15.1-java

data/app/models/mdm/cred.rb

@@ -14,8 +14,25 @@ class Mdm::Cred < ActiveRecord::Base
   #
   # Relations
   #
+
+  # @!attribute [rw] servce
+  #   The service this cred is for
+  #
+  #   @return [Mdm::Service]
   belongs_to :service, :class_name => "Mdm::Service"
 
+  # @!attribute [rw] task_creds
+  #   Details about what Tasks touched this cred
+  #
+  #   @return [Array<Mdm::TaskCred>]
+  has_many :task_creds, :dependent => :destroy, :class_name => "Mdm::TaskCred"
+
+  # @!attribute [rw] tasks
+  #   Tasks that touched this service
+  #
+  #   @return [Array<Mdm::Task>]
+  has_many :tasks, :through => :task_creds
+
   after_create :increment_host_counter_cache
   after_destroy :decrement_host_counter_cache
 

data/app/models/mdm/host.rb

@@ -53,6 +53,18 @@ class Mdm::Host < ActiveRecord::Base
   # Associations
   #
 
+  # @!attribute [rw] task_hosts
+  #   Details about what Tasks touched this host
+  #
+  #   @return [Array<Mdm::TaskHost>]
+  has_many :task_hosts, :dependent => :destroy, :class_name => 'Mdm::TaskHost'
+
+  # @!attribute [rw] tasks
+  #   Tasks that touched this service
+  #
+  #   @return [Array<Mdm::Task>]
+  has_many :tasks, :through => :task_hosts, :class_name => 'Mdm::Task'
+
   # @!attribute [rw] exploit_attempts
   #   Attempts to run exploits against this host.
   #

data/app/models/mdm/service.rb

@@ -11,6 +11,18 @@ class Mdm::Service < ActiveRecord::Base
   # Associations
   #
 
+  # @!attribute [rw] task_services
+  #   Details about what Tasks touched this service
+  #
+  #   @return [Array<Mdm::TaskService>]
+  has_many :task_services, :dependent => :destroy, :class_name => 'Mdm::TaskService'
+
+  # @!attribute [rw] tasks
+  #   Tasks that touched this service
+  #
+  #   @return [Array<Mdm::Task>]
+  has_many :tasks, :through => :task_services, :class_name => 'Mdm::Task'
+
   # @!attribute [rw] creds
   #   Credentials gathered from this service.
   #

data/app/models/mdm/task.rb

@@ -9,7 +9,47 @@ class Mdm::Task < ActiveRecord::Base
   # Relations
   #
 
-  belongs_to :workspace, :class_name => "Mdm::Workspace"
+  # @!attribute [rw] workspace
+  #   The Workspace the Task belongs to
+  #
+  #   @return [Mdm::Workspace]
+  belongs_to :workspace,  :class_name => "Mdm::Workspace"
+
+  # @!attribute [rw] task_creds
+  #   Details about creds this task touched
+  #
+  #   @return [Array<Mdm::TaskCred>]
+  has_many :task_creds, :dependent => :destroy, :class_name => 'Mdm::TaskCred'
+
+  # @!attribute [rw] creds
+  #   Creds this task touched
+  #
+  #   @return [Array<Mdm::TaskCred>]
+  has_many :creds, :through => :task_creds, :class_name => 'Mdm::Cred'
+
+  # @!attribute [rw] task_hosts
+  #   Details about hosts this task touched
+  #
+  #   @return [Array<Mdm::TaskHost>]
+  has_many :task_hosts, :dependent => :destroy, :class_name => 'Mdm::TaskHost'
+
+  # @!attribute [rw] hosts
+  #   Hosts this task touched
+  #
+  #   @return [Array<Mdm::TaskHost>
+  has_many :hosts, :through => :task_hosts, :class_name => 'Mdm::Host'
+
+  # @!attribute [rw] task_services
+  #   Details about services this task touched
+  #
+  #   @return [Array<Mdm::TaskService>]
+  has_many :task_services, :dependent => :destroy, :class_name => 'Mdm::TaskService'
+
+  # @!attribute [rw] services
+  #   Services this task touched
+  #
+  #   @return [Array<Mdm::TaskHost>
+  has_many :services, :through => :task_services, :class_name => 'Mdm::Service'
 
   #
   # Scopes

data/app/models/mdm/task_cred.rb

@@ -0,0 +1,10 @@
+class Mdm::TaskCred < ActiveRecord::Base
+  # attr_accessible :title, :body
+  belongs_to :cred, :class_name => 'Mdm::Cred'
+  belongs_to :task, :class_name =>  'Mdm::Task'
+
+  validates :cred_id,
+            :uniqueness => {
+                :scope => :task_id
+            }
+end

data/app/models/mdm/task_host.rb

@@ -0,0 +1,10 @@
+class Mdm::TaskHost < ActiveRecord::Base
+  # attr_accessible :title, :body
+  belongs_to :host, :class_name => 'Mdm::Host'
+  belongs_to :task, :class_name =>  'Mdm::Task'
+
+  validates :host_id,
+            :uniqueness => {
+                :scope => :task_id
+            }
+end

data/app/models/mdm/task_service.rb

@@ -0,0 +1,10 @@
+class Mdm::TaskService < ActiveRecord::Base
+  # attr_accessible :title, :body
+  belongs_to :service, :class_name => 'Mdm::Service'
+  belongs_to :task, :class_name =>  'Mdm::Task'
+
+  validates :service_id,
+            :uniqueness => {
+                :scope => :task_id
+            }
+end

data/db/migrate/20130522001343_create_task_creds.rb

@@ -0,0 +1,9 @@
+class CreateTaskCreds < ActiveRecord::Migration
+  def change
+    create_table :task_creds do |t|
+      t.references :task, :null => false
+      t.references :cred, :null => false
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20130522032517_create_task_hosts.rb

@@ -0,0 +1,9 @@
+class CreateTaskHosts < ActiveRecord::Migration
+  def change
+    create_table :task_hosts do |t|
+      t.references :task, :null => false
+      t.references :host, :null => false
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20130522041110_create_task_services.rb

@@ -0,0 +1,9 @@
+class CreateTaskServices < ActiveRecord::Migration
+  def change
+    create_table :task_services do |t|
+      t.references :task, :null => false
+      t.references :service, :null => false
+      t.timestamps
+    end
+  end
+end

data/lib/metasploit_data_models/version.rb

@@ -4,5 +4,5 @@ module MetasploitDataModels
   # metasploit-framework/data/sql/migrate to db/migrate in this project, not all models have specs that verify the
   # migrations (with have_db_column and have_db_index) and certain models may not be shared between metasploit-framework
   # and pro, so models may be removed in the future.  Because of the unstable API the version should remain below 1.0.0
-  VERSION = '0.14.4'
+  VERSION = '0.15.1'
 end

data/spec/app/models/mdm/cred_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Mdm::Cred do
+
+  context "Associations" do
+    it { should have_many(:task_creds).class_name('Mdm::TaskCred').dependent(:destroy) }
+    it { should have_many(:tasks).class_name('Mdm::Task').through(:task_creds) }
+    it { should belong_to(:service).class_name('Mdm::Service') }
+  end
+
+
+
+end

data/spec/app/models/mdm/host_spec.rb

@@ -44,6 +44,8 @@ describe Mdm::Host do
     it { should have_many(:host_details).class_name('Mdm::HostDetail').dependent(:destroy) }
     it { should have_many(:hosts_tags).class_name('Mdm::HostTag') }
     it { should have_many(:loots).class_name('Mdm::Loot').dependent(:destroy).order('loots.created_at DESC') }
+    it { should have_many(:task_hosts).class_name('Mdm::TaskHost').dependent(:destroy) }
+    it { should have_many(:tasks).class_name('Mdm::Task').through(:task_hosts) }
 
     context 'module_details' do
       it { should have_many(:module_details).class_name('Mdm::Module::Detail').through(:module_refs) }

data/spec/app/models/mdm/service_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Mdm::Service do
+
+  context "Associations" do
+
+    it { should have_many(:task_services).class_name('Mdm::TaskService').dependent(:destroy) }
+    it { should have_many(:tasks).class_name('Mdm::Task').through(:task_services) }
+    it { should have_many(:creds).class_name('Mdm::Cred').dependent(:destroy) }
+    it { should have_many(:exploited_hosts).class_name('Mdm::ExploitedHost').dependent(:destroy) }
+    it { should have_many(:notes).class_name('Mdm::Note').dependent(:destroy) }
+    it { should have_many(:vulns).class_name('Mdm::Vuln').dependent(:destroy) }
+    it { should have_many(:web_sites).class_name('Mdm::WebSite').dependent(:destroy) }
+    it { should have_many(:web_pages).class_name('Mdm::WebPage').through(:web_sites) }
+    it { should have_many(:web_forms).class_name('Mdm::WebForm').through(:web_sites) }
+    it { should have_many(:web_vulns).class_name('Mdm::WebVuln').through(:web_sites) }
+    it { should belong_to(:host).class_name('Mdm::Host') }
+  end
+
+  context "inactive" do
+    it "should exclude open services" do
+      open_service = FactoryGirl.create(:mdm_service, :state => 'open')
+      Mdm::Service.inactive.should_not include(open_service)
+    end
+  end
+
+  context "with_state open" do
+    it "should exclude closed services" do
+      closed_service = FactoryGirl.create(:mdm_service, :state => 'closed')
+      Mdm::Service.with_state('open').should_not include(closed_service)
+    end
+  end
+
+  context "search for 'snmp'" do
+    it "should find only services that match" do
+      snmp_service   = FactoryGirl.create(:mdm_service)
+      ftp_service    =  FactoryGirl.create(:mdm_service, :proto => 'ftp')
+      search_results = Mdm::Service.search('snmp')
+      search_results.should     include(snmp_service)
+      search_results.should_not include(ftp_service)
+    end
+  end
+
+end

data/spec/app/models/mdm/task_creds_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Mdm::TaskCred do
+
+  context "Associations" do
+    it { should belong_to(:task).class_name('Mdm::Task') }
+    it { should belong_to(:cred).class_name('Mdm::Cred') }
+  end
+
+  context "validations" do
+    it "should not allow duplicate associations" do
+      task = FactoryGirl.build(:mdm_task)
+      cred = FactoryGirl.build(:mdm_cred)
+      FactoryGirl.create(:mdm_task_cred, :task => task, :cred => cred)
+      task_cred2 = FactoryGirl.build(:mdm_task_cred, :task => task, :cred => cred)
+      task_cred2.should_not be_valid
+    end
+  end
+
+end

data/spec/app/models/mdm/task_host_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Mdm::TaskHost do
+  context "Associations" do
+    it { should belong_to(:task).class_name('Mdm::Task') }
+    it { should belong_to(:host).class_name('Mdm::Host') }
+  end
+
+  context "validations" do
+    it "should not allow duplicate associations" do
+      task = FactoryGirl.build(:mdm_task)
+      host = FactoryGirl.build(:mdm_host)
+      FactoryGirl.create(:mdm_task_host, :task => task, :host => host)
+      task_host2 = FactoryGirl.build(:mdm_task_host, :task => task, :host => host)
+      task_host2.should_not be_valid
+    end
+  end
+end

data/spec/app/models/mdm/task_service_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Mdm::TaskService do
+  context "Associations" do
+    it { should belong_to(:task).class_name('Mdm::Task') }
+    it { should belong_to(:service).class_name('Mdm::Service') }
+  end
+
+  context "validations" do
+    it "should not allow duplicate associations" do
+      task = FactoryGirl.build(:mdm_task)
+      service = FactoryGirl.build(:mdm_service)
+      FactoryGirl.create(:mdm_task_service, :task => task, :service => service)
+      task_service2 = FactoryGirl.build(:mdm_task_service, :task => task, :service => service)
+      task_service2.should_not be_valid
+    end
+  end
+end

data/spec/app/models/mdm/task_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Mdm::Task do
+
+  context "Associations" do
+
+    it { should have_many(:task_creds).class_name('Mdm::TaskCred').dependent(:destroy) }
+    it { should have_many(:creds).class_name('Mdm::Cred').through(:task_creds) }
+    it { should have_many(:task_hosts).class_name('Mdm::TaskHost').dependent(:destroy) }
+    it { should have_many(:hosts).class_name('Mdm::Host').through(:task_hosts) }
+    it { should have_many(:task_services).class_name('Mdm::TaskService').dependent(:destroy) }
+    it { should have_many(:services).class_name('Mdm::Service').through(:task_services) }
+    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
+  end
+
+  context "running" do
+    it "should exclude completed tasks" do
+      task = FactoryGirl.create(:mdm_task, :completed_at => Time.now)
+      Mdm::Task.running.should_not include(task)
+    end
+
+  end
+
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130516204810) do
+ActiveRecord::Schema.define(:version => 20130522041110) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -427,6 +427,27 @@ ActiveRecord::Schema.define(:version => 20130516204810) do
     t.datetime "updated_at",                                        :null => false
   end
 
+  create_table "task_creds", :force => true do |t|
+    t.integer  "task_id",    :null => false
+    t.integer  "cred_id",    :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "task_hosts", :force => true do |t|
+    t.integer  "task_id",    :null => false
+    t.integer  "host_id",    :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "task_services", :force => true do |t|
+    t.integer  "task_id",    :null => false
+    t.integer  "service_id", :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "tasks", :force => true do |t|
     t.integer  "workspace_id",                 :default => 1, :null => false
     t.string   "created_by"

data/spec/factories/mdm/creds.rb

@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :mdm_cred, :aliases => [:cred], :class => Mdm::Cred do
+    #
+    # Associations
+    #
+    association :service, :factory => :mdm_service
+  end
+end

data/spec/factories/mdm/task.rb

@@ -0,0 +1,16 @@
+FactoryGirl.define do
+  factory :mdm_task, :aliases => [:task], :class => 'Mdm::Task' do
+    #
+    # Associations
+    #
+    association :workspace, :factory => :mdm_workspace
+
+    #
+    # Attributes
+    #
+    created_at { Time.now }
+    updated_at { Time.now }
+
+
+  end
+end

data/spec/factories/mdm/task_creds.rb

@@ -0,0 +1,9 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :mdm_task_cred, :class => 'Mdm::TaskCred' do
+
+    association :task, :factory => :mdm_task
+    association :cred, :factory => :mdm_cred
+  end
+end

data/spec/factories/mdm/task_hosts.rb

@@ -0,0 +1,9 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :mdm_task_host, :class => 'Mdm::TaskHost' do
+
+    association :task, :factory => :mdm_task
+    association :host, :factory => :mdm_host
+  end
+end

data/spec/factories/mdm/task_services.rb

@@ -0,0 +1,8 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :mdm_task_service, :class => 'Mdm::TaskService' do
+    association :task, :factory => :mdm_task
+    association :service, :factory => :mdm_service
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.14.4
+  version: 0.15.1
 platform: java
 authors:
 - Samuel Huckins
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -210,6 +210,9 @@ files:
 - app/models/mdm/session_event.rb
 - app/models/mdm/tag.rb
 - app/models/mdm/task.rb
+- app/models/mdm/task_cred.rb
+- app/models/mdm/task_host.rb
+- app/models/mdm/task_service.rb
 - app/models/mdm/user.rb
 - app/models/mdm/vuln.rb
 - app/models/mdm/vuln_attempt.rb
@@ -325,6 +328,9 @@ files:
 - db/migrate/20130515164311_change_web_vulns_confidence_to_integer.rb
 - db/migrate/20130515172727_valid_mdm_web_vuln_params.rb
 - db/migrate/20130516204810_making_vulns_refs_a_real_ar_model.rb
+- db/migrate/20130522001343_create_task_creds.rb
+- db/migrate/20130522032517_create_task_hosts.rb
+- db/migrate/20130522041110_create_task_services.rb
 - lib/mdm.rb
 - lib/mdm/host/operating_system_normalization.rb
 - lib/mdm/module.rb
@@ -339,6 +345,7 @@ files:
 - lib/tasks/yard.rake
 - metasploit_data_models.gemspec
 - script/rails
+- spec/app/models/mdm/cred_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
@@ -350,7 +357,12 @@ files:
 - 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/service_spec.rb
 - spec/app/models/mdm/tag_spec.rb
+- spec/app/models/mdm/task_creds_spec.rb
+- spec/app/models/mdm/task_host_spec.rb
+- spec/app/models/mdm/task_service_spec.rb
+- spec/app/models/mdm/task_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
@@ -388,6 +400,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/factories/mdm/addresses.rb
+- spec/factories/mdm/creds.rb
 - spec/factories/mdm/host_tags.rb
 - spec/factories/mdm/hosts.rb
 - spec/factories/mdm/module/actions.rb
@@ -401,6 +414,10 @@ files:
 - spec/factories/mdm/refs.rb
 - spec/factories/mdm/services.rb
 - spec/factories/mdm/tags.rb
+- spec/factories/mdm/task.rb
+- spec/factories/mdm/task_creds.rb
+- spec/factories/mdm/task_hosts.rb
+- spec/factories/mdm/task_services.rb
 - spec/factories/mdm/users.rb
 - spec/factories/mdm/vuln_refs.rb
 - spec/factories/mdm/vulns.rb
@@ -444,6 +461,7 @@ signing_key:
 specification_version: 3
 summary: Database code for MSF and Metasploit Pro
 test_files:
+- spec/app/models/mdm/cred_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
@@ -455,7 +473,12 @@ test_files:
 - 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/service_spec.rb
 - spec/app/models/mdm/tag_spec.rb
+- spec/app/models/mdm/task_creds_spec.rb
+- spec/app/models/mdm/task_host_spec.rb
+- spec/app/models/mdm/task_service_spec.rb
+- spec/app/models/mdm/task_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
@@ -493,6 +516,7 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/factories/mdm/addresses.rb
+- spec/factories/mdm/creds.rb
 - spec/factories/mdm/host_tags.rb
 - spec/factories/mdm/hosts.rb
 - spec/factories/mdm/module/actions.rb
@@ -506,6 +530,10 @@ test_files:
 - spec/factories/mdm/refs.rb
 - spec/factories/mdm/services.rb
 - spec/factories/mdm/tags.rb
+- spec/factories/mdm/task.rb
+- spec/factories/mdm/task_creds.rb
+- spec/factories/mdm/task_hosts.rb
+- spec/factories/mdm/task_services.rb
 - spec/factories/mdm/users.rb
 - spec/factories/mdm/vuln_refs.rb
 - spec/factories/mdm/vulns.rb