metasploit_data_models 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ab5b04d32b6c1f7d8b88ed0aa638481b48beaeb
-  data.tar.gz: bdb4f6828f91b110b54daf02912766e886af9a80
+  metadata.gz: 60deb791f704876c50f895cd02bdbefaf5645e00
+  data.tar.gz: d3fb432169d4f2aac4297526b59e413f2114ef2c
 SHA512:
-  metadata.gz: 7b2a8d4c1b0e39e7f5b006b25af05a039077dd51f6107f2511bd22dfd223c518519c3db34617e4374df15bd845b05b3bd288b8648c061e79e047626a55a9c289
-  data.tar.gz: 39b5916ba69039884643803d3ddb18effd12f02903416244d3da67f9b22341598bd9b95db90c986cabaca5f95addf16e3159415af496fddaaeab1405a79b7c71
+  metadata.gz: 5073af40ac98c059cbb14a211c2d1073badf1461d55d2144c39751772488996546b5c724465c8f8ebf7beaa200a634d043e031da0eec6a7d07b7fe19c3648328
+  data.tar.gz: 14efb21a95c00b71a818fb0ea1e4130ac9ce408ce54b154fe948ca4a1e61d869fb402eaab2c999f35c493d25ed4e269ee68c806ae2932213684ea43bd8463ea9

data/lib/mdm/host/operating_system_normalization.rb

@@ -445,7 +445,6 @@ module Mdm::Host::OperatingSystemNormalization
         host.mac = host.mac.scan(/../).join(':')
       end
     end
-
   end
 
   #
@@ -454,14 +453,27 @@ module Mdm::Host::OperatingSystemNormalization
   # exposed services and rename to guess_purpose_with_match()
   #
   def guess_purpose_from_match(match)
-    # Create a string based on all match values
-    pstr = match.values.join(' ').downcase
-
+    # some data that is sent to this is numeric; we do not want that
+    pstr = ""
+    # Go through each character of each value and make sure it is all
+    # UTF-8
+    match.values.each do |i|
+      if i.respond_to?(:encoding)
+        i.each_char do |j|
+          begin
+            pstr << j.downcase.encode("UTF-8")
+          rescue Encoding::UndefinedConversionError => e
+            # this works in Framework, but causes a Travis CI error
+            # elog("Found incompatible (non-ANSI) character in guess_purpose_from_match")
+          end
+        end
+      end
+    end
     # Loosely map keywords to specific purposes
     case pstr
     when /windows server|windows (nt|20)/
       'server'
-    when /windows (xp|vista|[78])/
+    when /windows (xp|vista|[78]|10)/
       'client'
     when /printer|print server/
       'printer'

data/lib/metasploit_data_models/version.rb

@@ -1,6 +1,6 @@
 module MetasploitDataModels
   # VERSION is managed by GemRelease
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 
   # @return [String]
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Samuel Huckins
@@ -91,7 +91,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard