metasploit_data_models 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e38dff6e185dae182d9db9f9cf68787b6e9f0e12
-  data.tar.gz: fc9c268cb9b83102448af9eeb890c7ac893dd1b8
+  metadata.gz: 3a2851ff0a874979d51536d4c91b346339923d0d
+  data.tar.gz: 2f917872a6e4cbf0589aca13bb50ef5c3b8e453d
 SHA512:
-  metadata.gz: 9869792d9eaf8e4c19f9ad90ee96ef75c52ef8ac92b1368265bd5befc412ffbe0b545a2d3fe76ad2a399229b87202744fd3ffb7dd4c7c6bd62c8f27e350e040f
-  data.tar.gz: 68b1ddd8bcb0f155d7ed770e1ff17592f61257ce2ef1c69f086869836bee008b2d5d597779b1f4c6ad8af033fbfcf36ab85603cb7d0104a0a844c2252dc40c0a
+  metadata.gz: 991277f433519b3f5c5378ef266d2425cc8a3470f8d824b432071cf63e82e91cc6073fad54c7b313b3ee60f50f558d052379b8dde564142e417358add1c854fd
+  data.tar.gz: d2c14f9973c35435367ad37f0080a97b167880163045551f0042e644c1ba73ad502fa547353b400561416021c79e19d0329558b59a10af66d1907705086e57b0

data/lib/mdm/host/operating_system_normalization.rb

@@ -204,8 +204,7 @@ module Mdm::Host::OperatingSystemNormalization
     # Mdm currently serves that role.
     #
 
-    service_match_keys = Hash.new { [] }
-    service_match_keys.merge({
+    service_match_keys = {
       # TODO: Implement smb.generic fingerprint database
       # 'smb'     => [ 'smb.generic' ], # Distinct from smb.fingerprint, use os.certainty to choose best match
       # 'netbios' => [ 'smb.generic' ], # Distinct from smb.fingerprint, use os.certainty to choose best match
@@ -221,10 +220,12 @@ module Mdm::Host::OperatingSystemNormalization
       'nntp'    => [ 'nntp.banner' ],
       'ftp'     => [ 'ftp.banner' ],
       'ssdp'    => [ 'ssdp_header.server' ]
-    })
+    }
 
     matches = []
 
+    return matches unless service_match_keys.has_key?(s.name)
+
     service_match_keys[s.name].each do |rdb|
       banner = s.info
       if self.respond_to?("service_banner_recog_filter_#{s.name}")

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 = 5
+    PATCH = 6
 
 
     #

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

@@ -1,4 +1,6 @@
 RSpec.describe Mdm::Host, type: :model do
+  include_context 'Rex::Text'
+
   subject(:host) do
     FactoryGirl.build(:mdm_host)
   end
@@ -724,19 +726,6 @@ RSpec.describe Mdm::Host, type: :model do
 
 
     context '#apply_match_to_host' do
-
-      before(:each) do
-        stub_const(
-            'Rex::Text',
-            Module.new do
-              def self.ascii_safe_hex(unsanitized)
-                # Pass back the sanitized value for the stub
-                unsanitized.unpack("C*").pack("C*").gsub(/([\x00-\x08\x0b\x0c\x0e-\x1f\x80-\xFF])/n){ |x| "\\x%.2x" % x.unpack("C*")[0]}
-              end
-            end
-        )
-      end
-
       it 'should set host.mac when host.mac is present' do
         match = { 'host.mac' => '00:11:22:33:44:55' }
         host.send(:apply_match_to_host, match)

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

@@ -66,11 +66,36 @@ RSpec.describe Mdm::Service, type: :model do
 
   context 'callbacks' do
     context 'after_save' do
+      include_context 'Rex::Text'
+
       it 'should call #normalize_host_os' do
         svc = FactoryGirl.create(:mdm_service)
         expect(svc).to receive(:normalize_host_os)
         svc.run_callbacks(:save)
       end
+
+      it 'should include recog data when there is a match' do
+        host = FactoryGirl.create(:mdm_host)
+        FactoryGirl.create(
+          :mdm_service,
+          :host => host,
+          :name => 'ftp',
+          :info => 'example.com Microsoft FTP Service (Version 3.0).'
+        )
+        expect(host.name).to eq('example.com')
+        expect(host.os_name).to eq('Windows NT')
+      end
+
+      it 'should not include recog data when there is not a match' do
+        host = FactoryGirl.create(:mdm_host)
+        FactoryGirl.create(
+          :mdm_service,
+          :host => host,
+          :name => 'ftp',
+          :info => 'THISSHOULDNEVERMATCH'
+        )
+        expect(host.os_name).to eq('Unknown')
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-version
@@ -731,7 +731,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Database code for MSF and Metasploit Pro