metasploit_data_models 0.19.3-java → 0.19.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86e9158eae3b18e46236337d7bdab2419e9154a2
-  data.tar.gz: 104007fc1ebaa66c300080abc1a0cc3afb938c6e
+  metadata.gz: 5d6d17408ff12f5c425ec48ec37f3aa032c60e92
+  data.tar.gz: 8a444cb3f6618b2783a7ded1d69d52cb47a74588
 SHA512:
-  metadata.gz: 137f136749c44c6d6fbcd6cbfa06516d11c595b63b10cf0f38a9ed18d2cbc649b5300ac9d2fbac44997a1b83fec14e716a1aec0874cc48cf41343d627a1b05ae
-  data.tar.gz: f26e756aa5dc9d17eb79cdecd735ca7fd04a2ded251b950ecd35a3166569768959565a84c1a7c7337bceee6dc16f4f6682328abc57c878fff6d0fd55cddf1cdc
+  metadata.gz: 2182b0b0fa86f7c2f2bc5e5055b2da9cf6954799762e6e187daee9982d9657863b5286c3c3830d2a745876da22d605bdd6422485f4f9c1c7113d8ce702bf649f
+  data.tar.gz: d6fc50178926110ad3fd954c6871e691248ec63798f4205c7bcd14e3f00bfa14157f1d0a8fb235740285f54c4df9d295e24263e779c2db56d5f0671651de3c5e

data/app/models/mdm/service.rb

@@ -189,7 +189,7 @@ class Mdm::Service < ActiveRecord::Base
   # Search Associations
   #
 
-  search_association :host
+  search_associations host: :tags
 
   #
   # Search Attributes
@@ -208,14 +208,6 @@ class Mdm::Service < ActiveRecord::Base
   # Search Withs
   #
 
-  # Have to declare on Mdm::Service because non-attribute operators cannot function as association operators
-  search_with MetasploitDataModels::Search::Operator::Multitext,
-              name: :'host.os',
-              operator_names: [
-                  :'host.os_name',
-                  :'host.os_flavor',
-                  :'host.os_sp'
-              ]
   search_with MetasploitDataModels::Search::Operator::Port::List
 
   #

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

@@ -3,7 +3,7 @@ class MetasploitDataModels::Search::Visitor::Attribute
   include Metasploit::Model::Visitation::Visit
 
   visit 'Metasploit::Model::Search::Operator::Association' do |operator|
-    visit operator.attribute_operator
+    visit operator.source_operator
   end
 
   visit 'Metasploit::Model::Search::Operator::Attribute',

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

@@ -12,14 +12,29 @@ class MetasploitDataModels::Search::Visitor::Includes
     parent.children.flat_map { |child|
       visit child
     }
-	end
+  end
+
+  visit 'Metasploit::Model::Search::Operation::Association' do |operation|
+    association = visit operation.operator
+    nested_associations = visit operation.source_operation
+
+    if nested_associations.empty?
+      [association]
+    else
+      [
+          {
+              association => nested_associations
+          }
+      ]
+    end
+  end
 
   visit 'Metasploit::Model::Search::Operation::Base' do |operation|
     visit operation.operator
   end
 
   visit 'Metasploit::Model::Search::Operator::Association' do |operator|
-    [operator.association]
+    operator.association
   end
 
   visit 'Metasploit::Model::Search::Operator::Attribute',

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

@@ -34,12 +34,27 @@ class MetasploitDataModels::Search::Visitor::Joins
     common_join_set.to_a
   end
 
+  visit 'Metasploit::Model::Search::Operation::Association' do |operation|
+    association = visit operation.operator
+    nested_associations = visit operation.source_operation
+
+    if nested_associations.empty?
+      [association]
+    else
+      [
+          {
+              association => nested_associations
+          }
+      ]
+    end
+  end
+
   visit 'Metasploit::Model::Search::Operation::Base' do |operation|
     visit operation.operator
   end
 
   visit 'Metasploit::Model::Search::Operator::Association' do |operator|
-    [operator.association]
+    operator.association
   end
 
   visit 'Metasploit::Model::Search::Operator::Attribute',

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

@@ -38,6 +38,10 @@ class MetasploitDataModels::Search::Visitor::Where
     attribute.eq(operation.value)
   end
 
+  visit 'Metasploit::Model::Search::Operation::Association' do |operation|
+    visit operation.source_operation
+  end
+
   visit 'Metasploit::Model::Search::Operation::String' do |operation|
     attribute = attribute_visitor.visit operation.operator
     match_value = "%#{operation.value}%"

data/lib/metasploit_data_models/version.rb

@@ -6,7 +6,7 @@ module MetasploitDataModels
     # The minor version number, scoped to the {MAJOR} version number.
     MINOR = 19
     # The patch number, scoped to the {MINOR} version number.
-    PATCH = 3
+    PATCH = 4
 
     # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the `PRERELEASE` in the
     # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.

data/metasploit_data_models.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activerecord', '>= 3.2.13', '< 4.0.0'
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'metasploit-concern', '~> 0.1.0'
-  s.add_runtime_dependency 'metasploit-model', '>= 0.25.1', '< 0.26'
+  s.add_runtime_dependency 'metasploit-model', '~> 0.26.1'
   
   # arel-helpers: Useful tools to help construct database queries with ActiveRecord and Arel.
   s.add_runtime_dependency 'arel-helpers'

data/spec/app/models/metasploit_data_models/search/visitor/attribute_spec.rb

@@ -47,28 +47,28 @@ describe MetasploitDataModels::Search::Visitor::Attribute do
     end
 
     context 'with Metasploit::Model::Search::Operator::Association' do
-      let(:attribute_operator) do
-        double('Attribute Operator')
+      let(:source_operator) do
+        double('source operator')
       end
 
       let(:node) do
         Metasploit::Model::Search::Operator::Association.new(
-            :attribute_operator => attribute_operator
+            :source_operator => source_operator
         )
       end
 
-      it 'should visit Metasploit::Model::Search::Operator::Association#attribute_operator' do
+      it 'should visit Metasploit::Model::Search::Operator::Association#source_operator' do
         visitor.should_receive(:visit).with(node).and_call_original
-        visitor.should_receive(:visit).with(attribute_operator)
+        visitor.should_receive(:visit).with(source_operator)
 
         visit
       end
 
-      it 'should return visit of Metasploit::Model::Search::Operator::Association#attribute_operator' do
+      it 'should return visit of Metasploit::Model::Search::Operator::Association#source_operator' do
         visitor.should_receive(:visit).with(node).and_call_original
 
-        visited = double('Attribute Operator Visited')
-        visitor.stub(:visit).with(attribute_operator).and_return(visited)
+        visited = double('Source Operator Visited')
+        visitor.stub(:visit).with(source_operator).and_return(visited)
 
         visit.should == visited
       end

data/spec/app/models/metasploit_data_models/search/visitor/includes_spec.rb

@@ -29,6 +29,58 @@ describe MetasploitDataModels::Search::Visitor::Includes do
       end
     end
 
+    context 'with Metasploit::Model::Search::Operation::Association' do
+      let(:association) {
+        :parent_association
+      }
+
+      let(:node) {
+        operator.operate_on('formatted_value')
+      }
+
+      let(:operator) {
+        Metasploit::Model::Search::Operator::Association.new(
+            association: association,
+            source_operator: source_operator
+        )
+      }
+
+      context '#source_operation' do
+        let(:attribute_operator) {
+          Metasploit::Model::Search::Operator::Attribute.new(
+              type: :string
+          )
+        }
+
+        context 'with Metasploit::Model::Search::Operation::Association' do
+          let(:source_operator) {
+            Metasploit::Model::Search::Operator::Association.new(
+                association: source_operator_association,
+                source_operator: attribute_operator
+            )
+          }
+
+          let(:source_operator_association) {
+            :child_association
+          }
+
+          it 'is [{ association => nested associations }]' do
+            expect(visit).to eq([{association => [source_operator_association]}])
+          end
+        end
+
+        context 'without Metasploit::Model::Search::Operation::Association' do
+          let(:source_operator) {
+            attribute_operator
+          }
+
+          it 'is [association]' do
+            expect(visit).to eq([association])
+          end
+        end
+      end
+    end
+
     operation_classes = [
         Metasploit::Model::Search::Operation::Boolean,
         Metasploit::Model::Search::Operation::Date,
@@ -60,8 +112,8 @@ describe MetasploitDataModels::Search::Visitor::Includes do
         )
       end
 
-      it 'should include association' do
-        visit.should include(association)
+      it 'is #association' do
+        expect(visit).to eq(association)
       end
     end
 

data/spec/app/models/metasploit_data_models/search/visitor/joins_spec.rb

@@ -75,7 +75,9 @@ describe MetasploitDataModels::Search::Visitor::Joins do
           context 'without child joins' do
             let(:children) do
               Array.new(2) {
-                Metasploit::Model::Search::Operator::Attribute.new
+                operator = Metasploit::Model::Search::Operator::Attribute.new(type: :string)
+
+                operator.operate_on('formatted_value')
               }
             end
 
@@ -87,20 +89,31 @@ describe MetasploitDataModels::Search::Visitor::Joins do
               FactoryGirl.generate :metasploit_model_search_operator_association_association
             end
 
+            let(:association_operation) {
+              association_operator.operate_on('formatted_value')
+            }
+
             let(:association_operator) do
+              source_operator = Metasploit::Model::Search::Operator::Attribute.new(type: :string)
+
               Metasploit::Model::Search::Operator::Association.new(
-                  association: association
+                  association: association,
+                  source_operator: source_operator
               )
             end
 
+            let(:attribute_operation) {
+              attribute_operator.operate_on('formatted_value')
+            }
+
             let(:attribute_operator) do
-              Metasploit::Model::Search::Operator::Attribute.new
+              Metasploit::Model::Search::Operator::Attribute.new(type: :string)
             end
 
             let(:children) do
               [
-                  association_operator,
-                  attribute_operator
+                  association_operation,
+                  attribute_operation
               ]
             end
 
@@ -112,15 +125,22 @@ describe MetasploitDataModels::Search::Visitor::Joins do
               FactoryGirl.generate :metasploit_model_search_operator_association_association
             end
 
+            let(:association_operation) {
+              association_operator.operate_on('formatted_value')
+            }
+
             let(:association_operator) do
+              source_operator = Metasploit::Model::Search::Operator::Attribute.new(type: :string)
+
               Metasploit::Model::Search::Operator::Association.new(
-                  association: association
+                  association: association,
+                  source_operator: source_operator
               )
             end
 
             let(:children) do
               Array.new(2) {
-                association_operator
+                association_operation
               }
             end
 
@@ -140,10 +160,19 @@ describe MetasploitDataModels::Search::Visitor::Joins do
               disjoint_associations[0, 1] + common_associations
             end
 
+            let(:first_association_operations) {
+              first_association_operators.map { |association_operator|
+                association_operator.operate_on('formatted_value')
+              }
+            }
+
             let(:first_association_operators) do
               first_associations.collect { |association|
+                source_operator = Metasploit::Model::Search::Operator::Attribute.new(type: :string)
+
                 Metasploit::Model::Search::Operator::Association.new(
-                    association: association
+                    association: association,
+                    source_operator: source_operator
                 )
               }
             end
@@ -152,16 +181,25 @@ describe MetasploitDataModels::Search::Visitor::Joins do
               disjoint_associations[1, 1] + common_associations
             end
 
+            let(:second_association_operations) {
+              second_association_operators.map { |association_operator|
+                association_operator.operate_on('formatted_value')
+              }
+            }
+
             let(:second_association_operators) do
               second_associations.collect { |association|
+                source_operator = Metasploit::Model::Search::Operator::Attribute.new(type: :string)
+
                 Metasploit::Model::Search::Operator::Association.new(
-                    association: association
+                    association: association,
+                    source_operator: source_operator
                 )
               }
             end
 
             let(:children) do
-              [first_association_operators, second_association_operators].collect { |grandchildren|
+              [first_association_operations, second_association_operations].collect { |grandchildren|
                 Metasploit::Model::Search::Group::Intersection.new(
                     children: grandchildren
                 )
@@ -208,6 +246,58 @@ describe MetasploitDataModels::Search::Visitor::Joins do
       end
     end
 
+    context 'with Metasploit::Model::Search::Operation::Association' do
+      let(:association) {
+        :parent_association
+      }
+
+      let(:node) {
+        operator.operate_on('formatted_value')
+      }
+
+      let(:operator) {
+        Metasploit::Model::Search::Operator::Association.new(
+            association: association,
+            source_operator: source_operator
+        )
+      }
+
+      context '#source_operation' do
+        let(:attribute_operator) {
+          Metasploit::Model::Search::Operator::Attribute.new(
+              type: :string
+          )
+        }
+
+        context 'with Metasploit::Model::Search::Operation::Association' do
+          let(:source_operator) {
+            Metasploit::Model::Search::Operator::Association.new(
+                association: source_operator_association,
+                source_operator: attribute_operator
+            )
+          }
+
+          let(:source_operator_association) {
+            :child_association
+          }
+
+          it 'is [{ association => nested associations }]' do
+            expect(visit).to eq([{association => [source_operator_association]}])
+          end
+        end
+
+        context 'without Metasploit::Model::Search::Operation::Association' do
+          let(:source_operator) {
+            attribute_operator
+          }
+
+          it 'is [association]' do
+            expect(visit).to eq([association])
+          end
+        end
+      end
+    end
+
     operation_classes = [
         Metasploit::Model::Search::Operation::Boolean,
         Metasploit::Model::Search::Operation::Date,
@@ -239,8 +329,8 @@ describe MetasploitDataModels::Search::Visitor::Joins do
         )
       end
 
-      it 'should include association' do
-        visit.should include(association)
+      it 'is #association' do
+        expect(visit).to eq(association)
       end
     end
 

data/spec/app/models/metasploit_data_models/search/visitor/relation_spec.rb

@@ -175,11 +175,22 @@ describe MetasploitDataModels::Search::Visitor::Relation do
           let(:non_matching_host) {
             FactoryGirl.create(
                 :mdm_host,
+                address: non_matching_host_address,
                 name: non_matching_host_name,
                 os_flavor: non_matching_host_os_flavor,
                 os_name: non_matching_host_os_name,
                 os_sp: non_matching_host_os_sp
-            )
+            ).tap { |host|
+              FactoryGirl.create(
+                  :mdm_host_tag,
+                  host: host,
+                  tag: non_matching_tag
+              )
+            }
+          }
+
+          let(:non_matching_host_address) {
+            '5.6.7.8'
           }
 
           let(:non_matching_host_name) {
@@ -214,6 +225,22 @@ describe MetasploitDataModels::Search::Visitor::Relation do
             'udp'
           }
 
+          let(:non_matching_tag) {
+            FactoryGirl.create(
+                :mdm_tag,
+                desc: non_matching_tag_desc,
+                name: non_matching_tag_name
+            )
+          }
+
+          let(:non_matching_tag_desc) {
+            'Mdm::Tag#description b'
+          }
+
+          let(:non_matching_tag_name) {
+            'mdm_tag_name.b'
+          }
+
           #
           # let!s
           #
@@ -323,11 +350,22 @@ describe MetasploitDataModels::Search::Visitor::Relation do
             let(:matching_host) {
               FactoryGirl.create(
                   :mdm_host,
+                  address: matching_host_address,
                   name: matching_host_name,
                   os_flavor: matching_host_os_flavor,
                   os_name: matching_host_os_name,
                   os_sp: matching_host_os_sp
-              )
+              ).tap { |host|
+                FactoryGirl.create(
+                    :mdm_host_tag,
+                    host: host,
+                    tag: matching_tag
+                )
+              }
+            }
+
+            let(:matching_host_address) {
+              '1.2.3.4'
             }
 
             let(:matching_host_name) {
@@ -362,6 +400,22 @@ describe MetasploitDataModels::Search::Visitor::Relation do
               'tcp'
             }
 
+            let(:matching_tag) {
+              FactoryGirl.create(
+                  :mdm_tag,
+                  desc: matching_tag_desc,
+                  name: matching_tag_name
+              )
+            }
+
+            let(:matching_tag_desc) {
+              'Mdm::Tag#description a'
+            }
+
+            let(:matching_tag_name) {
+              'mdm_tag_name.a'
+            }
+
             #
             # let!s
             #
@@ -377,6 +431,42 @@ describe MetasploitDataModels::Search::Visitor::Relation do
               )
             }
 
+            context 'with host.address operator' do
+              let(:formatted) do
+                "host.address:#{formatted_address}"
+              end
+
+              context 'with CIDR' do
+                let(:formatted_address) {
+                  '1.3.4.5/8'
+                }
+
+                it 'should find only matching record' do
+                  expect(visit).to match_array([matching_record])
+                end
+              end
+
+              context 'with Range' do
+                let(:formatted_address) {
+                  '1.1.1.1-5.6.7.7'
+                }
+
+                it 'should find only matching record' do
+                  expect(visit).to match_array([matching_record])
+                end
+              end
+
+              context 'with single' do
+                let(:formatted_address) {
+                  '1.2.3.4'
+                }
+
+                it 'should find only matching record' do
+                  expect(visit).to match_array([matching_record])
+                end
+              end
+            end
+
             it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
                                   association: :host,
                                   attribute: :name
@@ -441,6 +531,18 @@ describe MetasploitDataModels::Search::Visitor::Relation do
                                   association: :host,
                                   attribute: :os_sp
 
+            it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
+                                  association: {
+                                      host: :tags
+                                  },
+                                  attribute: :desc
+
+            it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
+                                  association: {
+                                      host: :tags
+                                  },
+                                  attribute: :name
+
             it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
                                   attribute: :info
 
@@ -453,11 +555,16 @@ describe MetasploitDataModels::Search::Visitor::Relation do
             context 'with all operators' do
               let(:formatted) {
                 %Q{
+                  host.address:1.3.4.5/8
+                  host.address:1.1.1.1-5.6.7.7
+                  host.address:1.2.3.4
                   host.name:#{matching_host_name}
                   host.os:"#{matching_host_os_name} #{matching_host_os_flavor} #{matching_host_os_sp}"
                   host.os_flavor:#{matching_host_os_flavor}
                   host.os_name:#{matching_host_os_name}
                   host.os_sp:#{matching_host_os_sp}
+                  host.tags.desc:"#{matching_tag_desc}"
+                  host.tags.name:#{matching_tag_name}
                   name:#{matching_name}
                   port:#{matching_port}
                   proto:#{matching_proto}

data/spec/support/shared/examples/metasploit_data_models/search/visitor/relation/visit/matching_record.rb

@@ -4,30 +4,43 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Relation#visit match
   attribute = options.fetch(:attribute)
   association = options[:association]
 
-  if association
-    formatted_operator = "#{association}.#{attribute}"
-  else
-    formatted_operator = attribute.to_s
+  def self.nested_hash_to_array(association)
+    case association
+      when Hash
+        hash = association
+        keys = hash.keys
+
+        unless keys.length == 1
+          raise ArgumentError, 'Only single key Hashes are allowed to nest associations'
+        end
+
+        parent_association = keys.first
+        child_association = hash[parent_association]
+
+        [parent_association, *nested_hash_to_array(child_association)]
+      when Symbol
+        [association]
+      when nil
+        []
+      else
+        raise TypeError, "Cannot convert #{association.class} (#{association}) to array"
+    end
   end
 
+  associations = nested_hash_to_array(association)
+  messages = [*associations, attribute]
+  formatted_operator = messages.map(&:to_s).join('.')
+
   context "with #{formatted_operator}" do
     let(:formatted) do
       "#{formatted_operator}:\"#{value}\""
     end
 
-    if association
-      let(:associated) do
-        # wrap in array so single and plural associations can be handled the same.
-        Array.wrap(matching_record.send(association)).first
-      end
-
-      let(:value) do
-        associated.send(attribute)
-      end
-    else
-      let(:value) do
-        matching_record.send(attribute)
-      end
+    let(:value) do
+      messages.inject(matching_record) { |instance, message|
+        # wrap in array so singel and plural associatins can be handled the same
+        Array.wrap(instance.send(message)).first
+      }
     end
 
     it 'should find only matching record' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.19.4
 platform: java
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,20 +107,14 @@ dependencies:
   name: metasploit-model
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.25.1
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: 0.26.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.25.1
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: 0.26.1
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency