metasploit_data_models 0.16.0-java → 0.16.1-java

data/app/models/mdm/session.rb

@@ -33,6 +33,18 @@ class Mdm::Session < ActiveRecord::Base
   #   @return [Mdm::Workspace]
   has_one :workspace, :through => :host, :class_name => 'Mdm::Workspace'
 
+  # @!attribute [rw] task_sessions
+  #   Details about sessions this task touched
+  #
+  #   @return [Array<Mdm::TaskSession>]
+  has_many :task_sessions, :dependent => :destroy, :class_name => 'Mdm::TaskSession'
+
+  # @!attribute [rw] task
+  #   Session this task touched
+  #
+  #   @return [Mdm::Session]
+  has_many :tasks, :through => :task_sessions, :class_name => 'Mdm::Task'
+
   #
   # Attributes
   #

data/app/models/mdm/task.rb

@@ -24,7 +24,7 @@ class Mdm::Task < ActiveRecord::Base
   # @!attribute [rw] creds
   #   Creds this task touched
   #
-  #   @return [Array<Mdm::TaskCred>]
+  #   @return [Array<Mdm::Cred>]
   has_many :creds, :through => :task_creds, :class_name => 'Mdm::Cred'
 
   # @!attribute [rw] task_hosts
@@ -36,7 +36,7 @@ class Mdm::Task < ActiveRecord::Base
   # @!attribute [rw] hosts
   #   Hosts this task touched
   #
-  #   @return [Array<Mdm::TaskHost>
+  #   @return [Array<Mdm::Host>
   has_many :hosts, :through => :task_hosts, :class_name => 'Mdm::Host'
 
   # @!attribute [rw] task_services
@@ -48,9 +48,22 @@ class Mdm::Task < ActiveRecord::Base
   # @!attribute [rw] services
   #   Services this task touched
   #
-  #   @return [Array<Mdm::TaskHost>
+  #   @return [Array<Mdm::Service>
   has_many :services, :through => :task_services, :class_name => 'Mdm::Service'
 
+  # @!attribute [rw] task_sessions
+  #   Details about sessions this task touched
+  #
+  #   @return [Array<Mdm::TaskSession>]
+  has_many :task_sessions, :dependent => :destroy, :class_name => 'Mdm::TaskSession'
+
+  # @!attribute [rw] sessions
+  #   Session this task touched
+  #
+  #   @return [Array<Mdm::Session>
+  has_many :sessions, :through => :task_sessions, :class_name => 'Mdm::Session'
+
+
   has_many :reports, :class_name => 'Mdm::Report'
 
   #

data/app/models/mdm/task_session.rb

@@ -0,0 +1,9 @@
+class Mdm::TaskSession < ActiveRecord::Base
+  belongs_to :session, :class_name => 'Mdm::Session'
+  belongs_to :task, :class_name =>  'Mdm::Task'
+
+  validates :session_id,
+            :uniqueness => {
+                :scope => :task_id
+            }
+end

data/db/migrate/20130604145732_create_task_sessions.rb

@@ -0,0 +1,9 @@
+class CreateTaskSessions < ActiveRecord::Migration
+  def change
+    create_table :task_sessions do |t|
+      t.references :task, :null => false
+      t.references :session, :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.16.0'
+  VERSION = '0.16.1'
 end

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

@@ -42,11 +42,13 @@ describe Mdm::Session do
     end
   end
 
-  context 'asscoiations' do
+  context 'associations' do
     it { should belong_to(:host).class_name('Mdm::Host') }
     it { should have_many(:events).class_name('Mdm::SessionEvent').dependent(:delete_all) }
     it { should have_many(:routes).class_name('Mdm::Route').dependent(:delete_all) }
     it { should have_one(:workspace).class_name('Mdm::Workspace').through(:host) }
+    it { should have_many(:task_sessions).class_name('Mdm::TaskSession').dependent(:destroy)}
+    it { should have_many(:tasks).class_name('Mdm::Task').through(:task_sessions)}
   end
 
   context 'scopes' do

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

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Mdm::TaskSession do
+
+  context 'factory' do
+    it 'should be valid' do
+      task_session = FactoryGirl.build(:mdm_task_session)
+      task_session.should be_valid
+    end
+  end
+
+  context 'database' do
+
+    context 'timestamps'do
+      it { should have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
+      it { should have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
+    end
+
+    context 'columns' do
+      it { should have_db_column(:task_id).of_type(:integer).with_options(:null => false) }
+      it { should have_db_column(:session_id).of_type(:integer).with_options(:null => false) }
+    end
+  end
+
+  context '#destroy' do
+    it 'should successfully destroy the object' do
+      task_session = FactoryGirl.create(:mdm_task_session)
+      expect {
+        task_session.destroy
+      }.to_not raise_error
+      expect {
+        task_session.reload
+      }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+  end
+
+  context "validations" do
+    it "should not allow duplicate associations" do
+      task = FactoryGirl.build(:mdm_task)
+      session = FactoryGirl.build(:mdm_session)
+      FactoryGirl.create(:mdm_task_session, :task => task, :session => session)
+      task_session2 = FactoryGirl.build(:mdm_task_session, :task => task, :session => session)
+      task_session2.should_not be_valid
+    end
+  end
+
+end

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

@@ -48,12 +48,15 @@ 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_sessions).class_name('Mdm::TaskSession').dependent(:destroy) }
+    it { should have_many(:sessions).class_name('Mdm::Session').through(:task_sessions) }
     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') }
     it { should have_many(:reports).class_name('Mdm::Report')}
+
   end
 
   context 'scopes' do

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 => 20130531144949) do
+ActiveRecord::Schema.define(:version => 20130604145732) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -440,6 +440,13 @@ ActiveRecord::Schema.define(:version => 20130531144949) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "task_sessions", :force => true do |t|
+    t.integer  "task_id",    :null => false
+    t.integer  "session_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/task_sessions.rb

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

metadata

@@ -2,7 +2,7 @@
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.16.0
+  version: 0.16.1
 platform: java
 authors:
 - Samuel Huckins
@@ -212,6 +212,7 @@ files:
 - app/models/mdm/task_cred.rb
 - app/models/mdm/task_host.rb
 - app/models/mdm/task_service.rb
+- app/models/mdm/task_session.rb
 - app/models/mdm/user.rb
 - app/models/mdm/vuln.rb
 - app/models/mdm/vuln_attempt.rb
@@ -333,6 +334,7 @@ files:
 - db/migrate/20130525015035_remove_campaign_id_from_clients.rb
 - db/migrate/20130525212420_drop_table_imported_creds.rb
 - db/migrate/20130531144949_making_host_tags_a_real_ar_model.rb
+- db/migrate/20130604145732_create_task_sessions.rb
 - lib/mdm.rb
 - lib/mdm/host/operating_system_normalization.rb
 - lib/mdm/module.rb
@@ -378,6 +380,7 @@ files:
 - 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_sessions_spec.rb
 - spec/app/models/mdm/task_spec.rb
 - spec/app/models/mdm/user_spec.rb
 - spec/app/models/mdm/vuln_attempt_spec.rb
@@ -460,6 +463,7 @@ files:
 - spec/factories/mdm/task_creds.rb
 - spec/factories/mdm/task_hosts.rb
 - spec/factories/mdm/task_services.rb
+- spec/factories/mdm/task_sessions.rb
 - spec/factories/mdm/users.rb
 - spec/factories/mdm/vuln_attempts.rb
 - spec/factories/mdm/vuln_details.rb
@@ -538,6 +542,7 @@ test_files:
 - 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_sessions_spec.rb
 - spec/app/models/mdm/task_spec.rb
 - spec/app/models/mdm/user_spec.rb
 - spec/app/models/mdm/vuln_attempt_spec.rb
@@ -620,6 +625,7 @@ test_files:
 - spec/factories/mdm/task_creds.rb
 - spec/factories/mdm/task_hosts.rb
 - spec/factories/mdm/task_services.rb
+- spec/factories/mdm/task_sessions.rb
 - spec/factories/mdm/users.rb
 - spec/factories/mdm/vuln_attempts.rb
 - spec/factories/mdm/vuln_details.rb