metasploit_data_models 2.0.5 → 2.0.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6ab5b04d32b6c1f7d8b88ed0aa638481b48beaeb
4
- data.tar.gz: bdb4f6828f91b110b54daf02912766e886af9a80
3
+ metadata.gz: 60deb791f704876c50f895cd02bdbefaf5645e00
4
+ data.tar.gz: d3fb432169d4f2aac4297526b59e413f2114ef2c
5
5
  SHA512:
6
- metadata.gz: 7b2a8d4c1b0e39e7f5b006b25af05a039077dd51f6107f2511bd22dfd223c518519c3db34617e4374df15bd845b05b3bd288b8648c061e79e047626a55a9c289
7
- data.tar.gz: 39b5916ba69039884643803d3ddb18effd12f02903416244d3da67f9b22341598bd9b95db90c986cabaca5f95addf16e3159415af496fddaaeab1405a79b7c71
6
+ metadata.gz: 5073af40ac98c059cbb14a211c2d1073badf1461d55d2144c39751772488996546b5c724465c8f8ebf7beaa200a634d043e031da0eec6a7d07b7fe19c3648328
7
+ data.tar.gz: 14efb21a95c00b71a818fb0ea1e4130ac9ce408ce54b154fe948ca4a1e61d869fb402eaab2c999f35c493d25ed4e269ee68c806ae2932213684ea43bd8463ea9
Binary file
data.tar.gz.sig CHANGED
Binary file
@@ -445,7 +445,6 @@ module Mdm::Host::OperatingSystemNormalization
445
445
  host.mac = host.mac.scan(/../).join(':')
446
446
  end
447
447
  end
448
-
449
448
  end
450
449
 
451
450
  #
@@ -454,14 +453,27 @@ module Mdm::Host::OperatingSystemNormalization
454
453
  # exposed services and rename to guess_purpose_with_match()
455
454
  #
456
455
  def guess_purpose_from_match(match)
457
- # Create a string based on all match values
458
- pstr = match.values.join(' ').downcase
459
-
456
+ # some data that is sent to this is numeric; we do not want that
457
+ pstr = ""
458
+ # Go through each character of each value and make sure it is all
459
+ # UTF-8
460
+ match.values.each do |i|
461
+ if i.respond_to?(:encoding)
462
+ i.each_char do |j|
463
+ begin
464
+ pstr << j.downcase.encode("UTF-8")
465
+ rescue Encoding::UndefinedConversionError => e
466
+ # this works in Framework, but causes a Travis CI error
467
+ # elog("Found incompatible (non-ANSI) character in guess_purpose_from_match")
468
+ end
469
+ end
470
+ end
471
+ end
460
472
  # Loosely map keywords to specific purposes
461
473
  case pstr
462
474
  when /windows server|windows (nt|20)/
463
475
  'server'
464
- when /windows (xp|vista|[78])/
476
+ when /windows (xp|vista|[78]|10)/
465
477
  'client'
466
478
  when /printer|print server/
467
479
  'printer'
@@ -1,6 +1,6 @@
1
1
  module MetasploitDataModels
2
2
  # VERSION is managed by GemRelease
3
- VERSION = '2.0.5'
3
+ VERSION = '2.0.6'
4
4
 
5
5
  # @return [String]
6
6
  #
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metasploit_data_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.5
4
+ version: 2.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Samuel Huckins
@@ -91,7 +91,7 @@ cert_chain:
91
91
  G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
92
92
  8mVuTXnyJOKRJA==
93
93
  -----END CERTIFICATE-----
94
- date: 2016-10-21 00:00:00.000000000 Z
94
+ date: 2016-10-26 00:00:00.000000000 Z
95
95
  dependencies:
96
96
  - !ruby/object:Gem::Dependency
97
97
  name: metasploit-yard
metadata.gz.sig CHANGED
Binary file