metasploit_data_models 0.19.0-java → 0.19.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 845f009f4823f85118e65b70b314ee5567bf176d
-  data.tar.gz: 946f8b9169447c94e8b31dbdb2dc826d5aeaf87d
+  metadata.gz: 86e9158eae3b18e46236337d7bdab2419e9154a2
+  data.tar.gz: 104007fc1ebaa66c300080abc1a0cc3afb938c6e
 SHA512:
-  metadata.gz: 525b6ff48dab490de69e576c4a636f45218fc4b1ec0e592a8aa96283456007f27885857620ccc5e5b2444887ccf065e9d5a72492ed527e2dce47bd3f9538be2d
-  data.tar.gz: 3bdf612d729f262791f9d4e855311da53ef13a1a60177dea3f71283a34fb484c5272eaeeb3b31f3b1d4eb65f78013d23037207a962d9119f3e1e170f7232a78b
+  metadata.gz: 137f136749c44c6d6fbcd6cbfa06516d11c595b63b10cf0f38a9ed18d2cbc649b5300ac9d2fbac44997a1b83fec14e716a1aec0874cc48cf41343d627a1b05ae
+  data.tar.gz: f26e756aa5dc9d17eb79cdecd735ca7fd04a2ded251b950ecd35a3166569768959565a84c1a7c7337bceee6dc16f4f6682328abc57c878fff6d0fd55cddf1cdc

data/app/models/mdm/service.rb

@@ -185,6 +185,12 @@ class Mdm::Service < ActiveRecord::Base
   #
   #
 
+  #
+  # Search Associations
+  #
+
+  search_association :host
+
   #
   # Search Attributes
   #
@@ -202,6 +208,14 @@ 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/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 = 0
+    PATCH = 3
 
     # 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/spec/app/models/mdm/service_spec.rb

@@ -119,6 +119,16 @@ describe Mdm::Service do
     end
   end
 
+  context 'search' do
+    let(:base_class) {
+      described_class
+    }
+
+    context 'associations' do
+      it_should_behave_like 'search_association', :host
+    end
+  end
+
   context "validations" do
     subject(:mdm_service) {
       FactoryGirl.build(:mdm_service)

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

@@ -172,6 +172,32 @@ describe MetasploitDataModels::Search::Visitor::Relation do
           # Don't use factories to prevent prefix aliasing when sequences go from 1 to 10 or 10 to 100
           #
 
+          let(:non_matching_host) {
+            FactoryGirl.create(
+                :mdm_host,
+                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
+            )
+          }
+
+          let(:non_matching_host_name) {
+            'mdm_host_name_b'
+          }
+
+          let(:non_matching_host_os_flavor) {
+            'mdm_host_os_flavor_b'
+          }
+
+          let(:non_matching_host_os_name) {
+            'mdm_host_os_name_b'
+          }
+
+          let(:non_matching_host_os_sp) {
+            'mdm_host_os_sp_b'
+          }
+
           let(:non_matching_info) {
             'mdm_service_info_c'
           }
@@ -195,13 +221,13 @@ describe MetasploitDataModels::Search::Visitor::Relation do
           let!(:non_matching_record) {
             FactoryGirl.create(
                 :mdm_service,
+                host: non_matching_host,
                 info: non_matching_info,
                 name: non_matching_name,
                 port: non_matching_port,
                 proto: non_matching_proto
             )
           }
-          p
 
           context 'with port' do
             #
@@ -294,6 +320,32 @@ describe MetasploitDataModels::Search::Visitor::Relation do
             # Don't use factories to prevent prefix aliasing when sequences go from 1 to 10 or 10 to 100
             #
 
+            let(:matching_host) {
+              FactoryGirl.create(
+                  :mdm_host,
+                  name: matching_host_name,
+                  os_flavor: matching_host_os_flavor,
+                  os_name: matching_host_os_name,
+                  os_sp: matching_host_os_sp
+              )
+            }
+
+            let(:matching_host_name) {
+              'mdm_host_name_a'
+            }
+
+            let(:matching_host_os_flavor) {
+              'mdm_host_os_flavor_a'
+            }
+
+            let(:matching_host_os_name) {
+              'mdm_host_os_name_a'
+            }
+
+            let(:matching_host_os_sp) {
+              'mdm_host_os_sp_a'
+            }
+
             let(:matching_info) {
               'mdm_service_info_a'
             }
@@ -317,6 +369,7 @@ describe MetasploitDataModels::Search::Visitor::Relation do
             let!(:matching_record) {
               FactoryGirl.create(
                   :mdm_service,
+                  host: matching_host,
                   info: matching_info,
                   name: matching_name,
                   port: matching_port,
@@ -324,6 +377,70 @@ describe MetasploitDataModels::Search::Visitor::Relation do
               )
             }
 
+            it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
+                                  association: :host,
+                                  attribute: :name
+
+            context 'with host.os' do
+              let(:matching_host_os_flavor) {
+                'XP'
+              }
+
+              let(:matching_host_os_name) {
+                'Microsoft Windows'
+              }
+
+              let(:matching_host_os_sp) {
+                'SP1'
+              }
+
+              context 'with a combination of Mdm::Host#os_name and Mdm:Host#os_sp' do
+                let(:formatted) {
+                  %Q{host.os:"win xp"}
+                }
+
+                it 'finds matching record' do
+                  expect(visit).to match_array [matching_record]
+                end
+              end
+
+              context 'with a combination of Mdm::Host#os_flavor and Mdm::Host#os_sp' do
+                let(:formatted) {
+                  %Q{host.os:"xp sp1"}
+                }
+
+                it 'finds matching record' do
+                  expect(visit).to match_array [matching_record]
+                end
+              end
+
+              context 'with multiple records matching one word' do
+                let(:formatted) {
+                  %Q{host.os:"win xp"}
+                }
+
+                let(:non_matching_host_os_name) {
+                  'Microsoft Windows'
+                }
+
+                it 'finds only matching record by other words refining search' 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: :os_flavor
+
+            it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
+                                  association: :host,
+                                  attribute: :os_name
+
+            it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
+                                  association: :host,
+                                  attribute: :os_sp
+
             it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
                                   attribute: :info
 
@@ -335,7 +452,16 @@ describe MetasploitDataModels::Search::Visitor::Relation do
 
             context 'with all operators' do
               let(:formatted) {
-                %Q{name:#{matching_name} port:#{matching_port} proto:#{matching_proto}}
+                %Q{
+                  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}
+                  name:#{matching_name}
+                  port:#{matching_port}
+                  proto:#{matching_proto}
+                }
               }
 
               it 'finds only matching record' do
@@ -567,67 +693,65 @@ describe MetasploitDataModels::Search::Visitor::Relation do
           end
         end
 
+        context 'with Mdm::Tag' do
+          #
+          # lets
+          #
+
+          let(:klass) {
+            Mdm::Tag
+          }
+
+          let(:matching_desc) {
+            'This is a description'
+          }
 
-      end
+          let(:matching_name) {
+            'matching.tag'
+          }
+
+          let(:non_matching_desc) {
+            'This could be a description'
+          }
 
-      context 'with Mdm::Tag' do
-        #
-        # lets
-        #
-
-        let(:klass) {
-          Mdm::Tag
-        }
-
-        let(:matching_desc) {
-          'This is a description'
-        }
-
-        let(:matching_name) {
-          'matching.tag'
-        }
-
-        let(:non_matching_desc) {
-          'This could be a description'
-        }
-
-        let(:non_matching_name) {
-          'tag.does.not.match'
-        }
-
-        #
-        # let!s
-        #
-
-        let!(:matching_record) {
-          FactoryGirl.create(
-            :mdm_tag,
-            desc: matching_desc,
-            name: matching_name
-          )
-        }
-
-        let!(:non_matching_record) {
-          FactoryGirl.create(
-            :mdm_tag,
-            desc: non_matching_desc,
-            name: non_matching_name
-          )
-        }
-
-        it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
-          attribute: :desc
-
-        it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
-          attribute: :name
-
-        context 'with all operators' do
-          let(:formatted) {
-            %Q{desc:"#{matching_desc}" name:"#{matching_name}"}
+          let(:non_matching_name) {
+            'tag.does.not.match'
           }
 
-          it 'should find only matching record' do
-            expect(visit).to match_array([matching_record])
+          #
+          # let!s
+          #
+
+          let!(:matching_record) {
+            FactoryGirl.create(
+                :mdm_tag,
+                desc: matching_desc,
+                name: matching_name
+            )
+          }
+
+          let!(:non_matching_record) {
+            FactoryGirl.create(
+                :mdm_tag,
+                desc: non_matching_desc,
+                name: non_matching_name
+            )
+          }
+
+          it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
+                                attribute: :desc
+
+          it_should_behave_like 'MetasploitDataModels::Search::Visitor::Relation#visit matching record',
+                                attribute: :name
+
+          context 'with all operators' do
+            let(:formatted) {
+              %Q{desc:"#{matching_desc}" name:"#{matching_name}"}
+            }
+
+            it 'should find only matching record' do
+              expect(visit).to match_array([matching_record])
+            end
           end
         end
       end

data/spec/factories/mdm/creds.rb

@@ -4,5 +4,14 @@ FactoryGirl.define do
     # Associations
     #
     association :service, :factory => :mdm_service
+
+    active true
+    pass{ generate :mdm_cred_pass }
+    ptype 'password'
+    user{ generate :mdm_user_username }
+  end
+
+  sequence :mdm_cred_pass do |n|
+    "mahp455w3rd!-#{n}"
   end
 end

data/spec/spec_helper.rb

@@ -32,6 +32,7 @@ Rails.backtrace_cleaner.remove_silencers!
 
 engines = [
     Metasploit::Concern::Engine,
+    Metasploit::Model::Engine,
     MetasploitDataModels::Engine
 ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.3
 platform: java
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake