recog 2.1.35 → 2.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30b7547a20fa0a47c0e90975d8d5b03c9bc13b6b
-  data.tar.gz: e79f2bc6b4b00bf3d993f8afe1d493027e1c1222
+  metadata.gz: 38bdc881c4ede4d0940ef9fde54b73dff9b76d81
+  data.tar.gz: b14431b396c9a8405ca5db785226b8324e404b94
 SHA512:
-  metadata.gz: b2338e4414b40c54643a430dd305d6ed3747bbb292dd36e92dfc9a830de10a7b09709c1af7a7f20d1c375af45c5b2320d6705a085600c3861be320f773de8c89
-  data.tar.gz: 5c7bfec7fb9ecf43b5b8447af072f517e63d237477c1331b8d0cba39540aa7e27b02d7c97189b69bc8e8238ce6f242c26b69aaff65a57eeae10c6d05f9a5b02e
+  metadata.gz: 223ebf60ee2383bb813fd15ef20c1ad2362336f30e633c4a8b7799f5801e54f1a196189a85137767901c953a04a83d081142d8618e83abc275e54467912427c9
+  data.tar.gz: d07e6f5fe1415e4bc16d48ec7e847b00b50ce57ab816457f63603284f85e0a2961f78315c26c1bb4cd6c964c3d1770dccf770124b4b033d6a00d17e7beb37894

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '2.1.35'
+  VERSION = '2.1.36'
 end

data/spec/lib/fingerprint_self_test_spec.rb

@@ -33,6 +33,11 @@ describe Recog::DB do
 
         context "#{fp.name}" do
           param_names = []
+          it "has consistent os.device and hw.device" do
+            if fp.params['os.device'] && fp.params['hw.device'] && (fp.params['os.device'] != fp.params['hw.device'])
+              fail "#{fp.name} has both hw.device and os.device but with differing values"
+            end
+          end
           fp.params.each do |param_name, pos_value|
             pos, value = pos_value
             it "has valid looking fingerprint parameter names" do

data/xml/mdns_device-info_txt.xml

@@ -12,7 +12,7 @@
      The number specified after osxvers= is equivalent to the major
      version of OS X plus 4. E.g. osxvers=13 means OS X 10.9
    -->
-   <fingerprint pattern="^osxvers=18">
+  <fingerprint pattern="^osxvers=18">
     <description>OS X 10.14 (Mojave)</description>
     <example>osxvers=18</example>
     <param pos="0" name="os.vendor" value="Apple"/>

data/xml/mysql_banners.xml

@@ -1207,7 +1207,7 @@
     <param pos="0" name="os.device" value="Storage"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
     <param pos="0" name="hw.vendor" value="Netgear"/>
-    <param pos="0" name="hw.device" value="General"/>
+    <param pos="0" name="hw.device" value="Storage"/>
     <param pos="0" name="hw.family" value="ReadyNAS"/>
     <param pos="0" name="hw.product" value="ReadyNAS"/>
   </fingerprint>

data/xml/snmp_sysdescr.xml

@@ -2708,7 +2708,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.vendor" value="HP"/>
     <param pos="0" name="os.family" value="TippingPoint"/>
     <param pos="0" name="os.device" value="IPS"/>
-    <param pos="0" name="hw.device" value="TippingPoint Core Controller"/>
+    <param pos="0" name="hw.device" value="IPS"/>
   </fingerprint>
   <fingerprint pattern="^Integrated Lights-Out (\d) \d+\.\d+ [A-Za-z]{3} \d{1,2} \d{4}$">
     <description>HP Integrated Lights-Out (iLO) with firmware version</description>

data/xml/telnet_banners.xml

@@ -662,11 +662,23 @@
     <param pos="0" name="hw.device" value="Cable Modem"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
-  <fingerprint pattern="^(?:\r|\n)*ADB-4820CD login:\s*$"><description>ADB ADB-4820CD DVR</description><example>ADB-4820CD login:</example>&gt;
-    <param pos="0" name="hw.vendor" value="ADB"/><param pos="0" name="hw.device" value="DVR"/><param pos="0" name="hw.product" value="ADB-4820CD"/></fingerprint>
-  <fingerprint pattern="^(?:\r|\n)*IMDVRS login:\s*$"><description>Rifatron IMDVRS DVR</description><example>IMDVRS login:</example>&gt;
-    <param pos="0" name="hw.vendor" value="Rifatron"/><param pos="0" name="hw.family" value="IMDVR"/><param pos="0" name="hw.device" value="DVR"/></fingerprint>
-  <fingerprint pattern="^(?:\r|\n)*Ruijie login:\s*$"><description>Ruijie device (likely router/switch) </description><example>Ruijie login:</example>&gt;
+  <fingerprint pattern="^(?:\r|\n)*ADB-4820CD login:\s*$">
+    <description>ADB ADB-4820CD DVR</description>
+    <example>ADB-4820CD login:</example>
+    <param pos="0" name="hw.vendor" value="ADB"/>
+    <param pos="0" name="hw.device" value="DVR"/>
+    <param pos="0" name="hw.product" value="ADB-4820CD"/>
+  </fingerprint>
+  <fingerprint pattern="^(?:\r|\n)*IMDVRS login:\s*$">
+    <description>Rifatron IMDVRS DVR</description>
+    <example>IMDVRS login:</example>
+    <param pos="0" name="hw.vendor" value="Rifatron"/>
+    <param pos="0" name="hw.family" value="IMDVR"/>
+    <param pos="0" name="hw.device" value="DVR"/>
+  </fingerprint>
+  <fingerprint pattern="^(?:\r|\n)*Ruijie login:\s*$">
+    <description>Ruijie device (likely router/switch)</description>
+    <example>Ruijie login:</example>
     <param pos="0" name="hw.vendor" value="Ruijie"/></fingerprint>
   <fingerprint pattern="^Welcome to Microsoft Telnet Service \r\n\n\rlogin:\s*$">
     <description>Microsoft Windows</description>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recog
 version: !ruby/object:Gem::Version
-  version: 2.1.35
+  version: 2.1.36
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-08 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Network service fingerprint database, classes, and utilities