metasploit_data_models 0.17.2-java → 0.17.3-java

data/app/models/metasploit_data_models/search/visitor/includes.rb

@@ -25,4 +25,6 @@ class MetasploitDataModels::Search::Visitor::Includes
   visit 'Metasploit::Model::Search::Operator::Attribute' do |_operator|
     []
   end
+
+  Metasploit::Concern.run(self)
 end

data/app/models/metasploit_data_models/search/visitor/joins.rb

@@ -44,4 +44,6 @@ class MetasploitDataModels::Search::Visitor::Joins
   visit 'Metasploit::Model::Search::Operator::Attribute' do |_|
     []
   end
+
+  Metasploit::Concern.run(self)
 end

data/app/models/metasploit_data_models/search/visitor/method.rb

@@ -10,4 +10,6 @@ class MetasploitDataModels::Search::Visitor::Method
         'Metasploit::Model::Search::Operation::Union' do
     :or
   end
+
+  Metasploit::Concern.run(self)
 end

data/app/models/metasploit_data_models/search/visitor/relation.rb

@@ -84,4 +84,8 @@ class MetasploitDataModels::Search::Visitor::Relation < Metasploit::Model::Base
       errors.add(:query, :invalid)
     end
   end
+
+  private
+
+  Metasploit::Concern.run(self)
 end

data/app/models/metasploit_data_models/search/visitor/where.rb

@@ -62,4 +62,6 @@ class MetasploitDataModels::Search::Visitor::Where
   def method_visitor
     @method_visitor ||= MetasploitDataModels::Search::Visitor::Method.new
   end
+
+  Metasploit::Concern.run(self)
 end

data/lib/metasploit_data_models.rb

@@ -10,6 +10,7 @@ require 'active_record'
 require 'active_support'
 require 'active_support/all'
 require 'active_support/dependencies'
+require 'metasploit/concern'
 require 'metasploit/model'
 
 #

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.17.2'
+  VERSION = '0.17.3'
 end

data/metasploit_data_models.gemspec

@@ -38,7 +38,8 @@ Gem::Specification.new do |s|
   # @see MSP-2971
   s.add_runtime_dependency 'activerecord', '>= 3.2.13', '< 4.0.0'
   s.add_runtime_dependency 'activesupport'
-  s.add_runtime_dependency 'metasploit-model', '>= 0.24.1.pre.semantic.pre.versioning.pre.2.pre.0', '< 0.25'
+  s.add_runtime_dependency 'metasploit-concern', '~> 0.1.0'
+  s.add_runtime_dependency 'metasploit-model', '>= 0.24.1', '< 0.25'
   
   if RUBY_PLATFORM =~ /java/
     # markdown formatting for yard

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

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Mdm::ApiKey do
+  it_should_behave_like 'Metasploit::Concern.run'
+end

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

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe Mdm::Client do
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     it { should belong_to(:host).class_name('Mdm::Host') }
   end

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

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::Cred do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context "Associations" do
     it { should have_many(:task_creds).class_name('Mdm::TaskCred').dependent(:destroy) }

data/spec/app/models/mdm/{events_spec.rb → event_spec.rb}

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::Event do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
     it { should belong_to(:host).class_name('Mdm::Host') }

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

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::ExploitAttempt do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
     it { should belong_to(:host).class_name('Mdm::Host') }

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

@@ -1,38 +1,40 @@
 require 'spec_helper'
 
 describe Mdm::ExploitedHost do
-   context 'associations' do
-     it { should belong_to(:host).class_name('Mdm::Host') }
-     it { should belong_to(:service).class_name('Mdm::Service') }
-   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(:host_id).of_type(:integer).with_options(:null => false) }
-       it { should have_db_column(:service_id).of_type(:integer) }
-       it { should have_db_column(:name).of_type(:string) }
-       it { should have_db_column(:session_uuid).of_type(:string) }
-       it { should have_db_column(:payload).of_type(:string) }
-     end
-   end
-
-   context '#destroy' do
-     it 'should successfully destroy the object and all dependent objects' do
-       exploited_host = FactoryGirl.create(:mdm_exploited_host)
-       expect {
-         exploited_host.destroy
-       }.to_not raise_error
-       expect {
-         exploited_host.reload
-       }.to raise_error(ActiveRecord::RecordNotFound)
-     end
-   end
+  it_should_behave_like 'Metasploit::Concern.run'
+
+  context 'associations' do
+    it { should belong_to(:host).class_name('Mdm::Host') }
+    it { should belong_to(:service).class_name('Mdm::Service') }
+  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(:host_id).of_type(:integer).with_options(:null => false) }
+      it { should have_db_column(:service_id).of_type(:integer) }
+      it { should have_db_column(:name).of_type(:string) }
+      it { should have_db_column(:session_uuid).of_type(:string) }
+      it { should have_db_column(:payload).of_type(:string) }
+    end
+  end
+
+  context '#destroy' do
+    it 'should successfully destroy the object and all dependent objects' do
+      exploited_host = FactoryGirl.create(:mdm_exploited_host)
+      expect {
+        exploited_host.destroy
+      }.to_not raise_error
+      expect {
+        exploited_host.reload
+      }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+  end
 
   context 'factory' do
     it 'should be valid' do

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

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::HostDetail do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
     it { should belong_to(:host).class_name('Mdm::Host') }

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

@@ -37,6 +37,8 @@ describe Mdm::Host do
     ]
   end
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'factory' do
     it 'should be valid' do
       host = FactoryGirl.build(:mdm_host)

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

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::HostTag do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
     it { should belong_to(:host).class_name('Mdm::Host') }

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

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mdm::Listener do
+  it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
     it { should belong_to(:workspace).class_name('Mdm::Workspace') }

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

@@ -1,77 +1,79 @@
 require 'spec_helper'
 
 describe Mdm::Loot do
-   context 'associations' do
-     it { should belong_to(:workspace).class_name('Mdm::Workspace') }
-     it { should belong_to(:service).class_name('Mdm::Service') }
-     it { should belong_to(:host).class_name('Mdm::Host') }
-   end
+  it_should_behave_like 'Metasploit::Concern.run'
 
-   context 'database' do
+  context 'associations' do
+    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
+    it { should belong_to(:service).class_name('Mdm::Service') }
+    it { should belong_to(:host).class_name('Mdm::Host') }
+  end
 
-     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 'database' do
 
-     context 'columns' do
-       it { should have_db_column(:workspace_id).of_type(:integer).with_options(:null => false, :default =>1) }
-       it { should have_db_column(:host_id).of_type(:integer) }
-       it { should have_db_column(:service_id).of_type(:integer) }
-       it { should have_db_column(:ltype).of_type(:string) }
-       it { should have_db_column(:path).of_type(:string) }
-       it { should have_db_column(:data).of_type(:text) }
-       it { should have_db_column(:content_type).of_type(:string) }
-       it { should have_db_column(:name).of_type(:text) }
-       it { should have_db_column(:info).of_type(:text) }
-     end
-   end
+    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 'factory' do
-     it 'should be valid' do
-       loot = FactoryGirl.build(:mdm_loot)
-       loot.should be_valid
-     end
-   end
+    context 'columns' do
+      it { should have_db_column(:workspace_id).of_type(:integer).with_options(:null => false, :default =>1) }
+      it { should have_db_column(:host_id).of_type(:integer) }
+      it { should have_db_column(:service_id).of_type(:integer) }
+      it { should have_db_column(:ltype).of_type(:string) }
+      it { should have_db_column(:path).of_type(:string) }
+      it { should have_db_column(:data).of_type(:text) }
+      it { should have_db_column(:content_type).of_type(:string) }
+      it { should have_db_column(:name).of_type(:text) }
+      it { should have_db_column(:info).of_type(:text) }
+    end
+  end
 
-   context '#destroy' do
-     it 'should successfully destroy the object' do
-       loot = FactoryGirl.create(:mdm_loot)
-       expect {
-         loot.destroy
-       }.to_not raise_error
-       expect {
-         loot.reload
-       }.to raise_error(ActiveRecord::RecordNotFound)
-     end
-   end
+  context 'factory' do
+    it 'should be valid' do
+      loot = FactoryGirl.build(:mdm_loot)
+      loot.should be_valid
+    end
+  end
 
-   context 'scopes' do
-     context 'search' do
-       it 'should match on ltype' do
-         myloot = FactoryGirl.create(:mdm_loot, :ltype => 'find.this.ltype')
-         Mdm::Loot.search('find.this.ltype').should include(myloot)
-       end
+  context '#destroy' do
+    it 'should successfully destroy the object' do
+      loot = FactoryGirl.create(:mdm_loot)
+      expect {
+        loot.destroy
+      }.to_not raise_error
+      expect {
+        loot.reload
+      }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+  end
 
-       it 'should match on name' do
-         myloot = FactoryGirl.create(:mdm_loot, :name => 'Find This')
-         Mdm::Loot.search('Find This').should include(myloot)
-       end
+  context 'scopes' do
+    context 'search' do
+      it 'should match on ltype' do
+        myloot = FactoryGirl.create(:mdm_loot, :ltype => 'find.this.ltype')
+        Mdm::Loot.search('find.this.ltype').should include(myloot)
+      end
 
-       it 'should match on info' do
-         myloot = FactoryGirl.create(:mdm_loot, :info => 'Find This')
-         Mdm::Loot.search('Find This').should include(myloot)
-       end
-     end
-   end
+      it 'should match on name' do
+        myloot = FactoryGirl.create(:mdm_loot, :name => 'Find This')
+        Mdm::Loot.search('Find This').should include(myloot)
+      end
 
-   context 'callbacks' do
-     context 'before_destroy' do
-       it 'should call #delete_file' do
-         myloot =  FactoryGirl.create(:mdm_loot)
-         myloot.should_receive(:delete_file)
-         myloot.destroy
-       end
-     end
-   end
+      it 'should match on info' do
+        myloot = FactoryGirl.create(:mdm_loot, :info => 'Find This')
+        Mdm::Loot.search('Find This').should include(myloot)
+      end
+    end
+  end
+
+  context 'callbacks' do
+    context 'before_destroy' do
+      it 'should call #delete_file' do
+        myloot =  FactoryGirl.create(:mdm_loot)
+        myloot.should_receive(:delete_file)
+        myloot.destroy
+      end
+    end
+  end
 end

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

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Mdm::Macro do
+  it_should_behave_like 'Metasploit::Concern.run'
+end

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

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Mdm::ModRef do
+  it_should_behave_like 'Metasploit::Concern.run'
+end

data/spec/app/models/mdm/module/action_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mdm::Module::Action do
+
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
   end

data/spec/app/models/mdm/module/arch_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mdm::Module::Arch do
+
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
   end

data/spec/app/models/mdm/module/author_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mdm::Module::Author do
+
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
   end

data/spec/app/models/mdm/module/detail_spec.rb

@@ -47,6 +47,8 @@ describe Mdm::Module::Detail do
     ]
   end
 
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     it { should have_many(:actions).class_name('Mdm::Module::Action').dependent(:destroy) }
     it { should have_many(:archs).class_name('Mdm::Module::Arch').dependent(:destroy) }

data/spec/app/models/mdm/module/mixin_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mdm::Module::Mixin do
+
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
   end

data/spec/app/models/mdm/module/platform_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mdm::Module::Platform do
+
+  it_should_behave_like 'Metasploit::Concern.run'
+
   context 'associations' do
     it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
   end