metasploit_data_models 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a2851ff0a874979d51536d4c91b346339923d0d
-  data.tar.gz: 2f917872a6e4cbf0589aca13bb50ef5c3b8e453d
+  metadata.gz: a832e9ced35288ddac2edbb5e3cd4d4eb19cbb5c
+  data.tar.gz: a9f00670c0d01fe19f0991471f7344c6c3370915
 SHA512:
-  metadata.gz: 991277f433519b3f5c5378ef266d2425cc8a3470f8d824b432071cf63e82e91cc6073fad54c7b313b3ee60f50f558d052379b8dde564142e417358add1c854fd
-  data.tar.gz: d2c14f9973c35435367ad37f0080a97b167880163045551f0042e644c1ba73ad502fa547353b400561416021c79e19d0329558b59a10af66d1907705086e57b0
+  metadata.gz: 255b6a0e805116a6c992657c38d1f25ba81a863cec6dde9f79c5263016c693043c80c99c812329bc4186aab2bc7bccafebde2e9967102afffb2fb50520c58aa1
+  data.tar.gz: a0c035e7112895aee64de5fb2af85824dade5095b9d0da642d612c6d59d75d08a1a8216ac83cd95578fe68228561c0ba78ab8504c10d0971621b76eb62b54aef

data/app/models/mdm/vuln.rb

@@ -22,6 +22,14 @@ class Mdm::Vuln < ActiveRecord::Base
              counter_cache: :vuln_count,
              inverse_of: :vulns
 
+  # @!attribute [rw] matches
+  #   The matches for this vuln
+  #
+  #   @return [ActiveRecord::Relation<MetasploitDataModels::AutomaticExploitation::Match>]
+  has_many :matches, class_name: "MetasploitDataModels::AutomaticExploitation::Match",
+           as: :matchable,
+           dependent: :destroy
+
   # @!attribute [rw] service
   #   The service with the vulnerability.
   #
@@ -118,6 +126,8 @@ class Mdm::Vuln < ActiveRecord::Base
             :class_name => 'Mdm::Module::Detail',
             :source => :detail,
             :through => :module_refs
+
+
   #
   # Attributes
   #

data/app/models/metasploit_data_models/automatic_exploitation/match.rb

@@ -25,5 +25,19 @@ class MetasploitDataModels::AutomaticExploitation::Match < ActiveRecord::Base
              foreign_key: :module_fullname,
              primary_key: :fullname
 
+  # Scope a match to a MetasploitDataModels::AutomaticExploitation::Run
+  scope :by_run_and_vuln,
+        ->(run,vuln){
+          joins(
+            MetasploitDataModels::AutomaticExploitation::Match.join_association(:match_set),
+            MetasploitDataModels::AutomaticExploitation::MatchSet.join_association(:runs)
+          ).where(
+            MetasploitDataModels::AutomaticExploitation::Run[:id].eq(run.id)
+          ).where(
+            MetasploitDataModels::AutomaticExploitation::Match[:matchable_id].eq(vuln.id),
+            MetasploitDataModels::AutomaticExploitation::Match[:matchable_type].eq("Mdm::Vuln")
+          )
+        }
+
   Metasploit::Concern.run(self)
 end

data/lib/metasploit_data_models/version.rb

@@ -10,7 +10,7 @@ module MetasploitDataModels
     # The minor version number, scoped to the {MAJOR} version number.
     MINOR = 2
     # The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
-    PATCH = 6
+    PATCH = 7
 
 
     #

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

@@ -41,6 +41,7 @@ RSpec.describe Mdm::Vuln, type: :model do
     it { is_expected.to have_many(:vuln_details).class_name('Mdm::VulnDetail').dependent(:destroy) }
     it { is_expected.to have_many(:vulns_refs).class_name('Mdm::VulnRef').dependent(:destroy) }
     it { is_expected.to have_many(:notes).class_name('Mdm::Note').dependent(:delete_all).order('notes.created_at') }
+    it { is_expected.to have_many(:matches).class_name("MetasploitDataModels::AutomaticExploitation::Match").dependent(:destroy) }
 
     context 'module_details' do
       it { is_expected.to have_many(:module_details).class_name('Mdm::Module::Detail').through(:module_refs) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-version