recog 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca2e3909b1b60418e80721625975ab8025e8dcaaaee59754dccb128b25661f00
-  data.tar.gz: 68be49a8c47fc1bb2b6a0f64d02c18a8fc29b67ee60b62060542be2216979e5c
+  metadata.gz: f61ccb4f953facea4bbf95ccbd3deb144d8f0763d9be1355cba70a6eb4dc9c79
+  data.tar.gz: 8fa728463dfc0f3dd783fd3f535965b70e62f6e47eb8960e269076e6ddf3c43f
 SHA512:
-  metadata.gz: 2e0f749e0a8b313a8ba9845c39aa72ce08108e4c5b4e3785d689ae9e726aeb72b31b23da6e1e4610fff4dcd1caad966ee9578ab887a425cf2f414ee377b7b001
-  data.tar.gz: 7714d9bca0d70f27efd756460f0f167a46c69ee45c38da8a70bdfb5271256decb92375c8281efe67529e5b7e3a897b3e3e2fc20b7a62075b12db9abf940635a6
+  metadata.gz: 1f2ed5453f4dc800bcf750592ca16ec25f89c2e93ec7528b2a2a71bada7399bd5d3ea149acb1888006826d8fea0b4a6186b3c7ea4a519febebe99e3be8c6efcf
+  data.tar.gz: c515c0183b55cf8a38dd03d2865d7ef208c75930854b00f69ade77494b0fe0f7162d244a5806d9451ec7442675c93c2070d2a59ef25d1355b241f4a0922c5d7a

data/lib/recog/match_reporter.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Recog
 class MatchReporter
   attr_reader :formatter
@@ -24,14 +26,46 @@ class MatchReporter
     @line_count += 1
   end
 
-  def match(text)
+  def match(match_data)
     @match_count += 1
-    formatter.success_message(text)
+    if @options.json_format
+      # remove data field from all matches and promote to a top-level field
+      data_field = match_data[0]["data"]
+      match_data.each { |h| h.delete("data") }
+      new_object = {
+        'data' => data_field,
+      }
+
+      if @options.multi_match
+        new_object['matches'] = match_data
+      else
+        new_object['match'] = match_data[0]
+      end
+      msg = new_object.to_json
+    else
+      match_prefix = match_data.size > 1 ? 'MATCHES' : 'MATCH'
+      msg = "#{match_prefix}: #{match_data.map(&:inspect).join(',')}"
+    end
+    formatter.success_message("#{msg}")
   end
 
   def failure(text)
     @fail_count += 1
-    formatter.failure_message(text)
+    if @options.json_format
+      new_object = {
+        'data' => text,
+        'match_failure' => true
+      }
+      if @options.multi_match
+        new_object['matches'] = nil
+      else
+        new_object['match'] = nil
+      end
+      msg = new_object.to_json
+    else
+      msg = "FAIL: #{text}"
+    end
+    formatter.failure_message("#{msg}")
   end
 
   def print_summary

data/lib/recog/matcher.rb

@@ -29,26 +29,21 @@ class Matcher
         line = line.to_s.unpack("C*").pack("C*").strip.gsub(/\\[rn]/, '')
         found_extractions = false
 
-        all_extractions = []
+        extraction_data = []
         fingerprints.each do |fp|
           extractions = fp.match(line)
           if extractions
             found_extractions = true
             extractions['data'] = line
-            if multi_match
-              all_extractions << extractions
-            else
-              reporter.match "MATCH: #{extractions.inspect}"
-              break
-            end
+            extraction_data << extractions
+            break unless multi_match
           end
         end
 
         if found_extractions
-          match_prefix = all_extractions.size > 1 ? 'MATCHES' : 'MATCH'
-          reporter.match "#{match_prefix}: #{all_extractions.map(&:inspect).join(',')}" if multi_match
+          reporter.match extraction_data
         else
-          reporter.failure "FAIL: #{line}"
+          reporter.failure line
         end
 
         if reporter.stop?

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '3.0.1'
+  VERSION = '3.0.3'
 end

data/recog/bin/recog_match

@@ -5,7 +5,7 @@ require 'ostruct'
 require 'recog'
 require 'recog/matcher_factory'
 
-options = OpenStruct.new(color: false, detail: false, fail_fast: false, multi_match: false)
+options = OpenStruct.new(color: false, detail: false, json_format: false, fail_fast: false, multi_match: false)
 
 option_parser = OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [options] XML_FINGERPRINT_FILE [BANNERS_FILE]"
@@ -13,12 +13,18 @@ option_parser = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Options"
 
-  opts.on("-f", "--format FORMATTER",
+  opts.on("-f", "--format FORMATTER", [:summary, :detail, :json],
           "Choose a formatter.",
           "  [s]ummary (default - failure/match msgs)",
-          "  [d]etail  (msgs with total counts)") do |format|
-    if format.start_with? 'd'
+          "  [d]etail  (msgs with total counts)",
+          "  [j]son    (JSON failure/match msgs)") do |format|
+    if format == :summary
+      options.detail = false
+      options.json_format = false
+    elsif format == :detail
       options.detail = true
+    elsif format == :json
+      options.json_format = true
     end
   end
 
@@ -41,9 +47,17 @@ option_parser = OptionParser.new do |opts|
     exit
   end
 end
-option_parser.parse!(ARGV)
 
-if ARGV.count != 1 && ARGV.count != 2
+
+begin
+  option_parser.parse!(ARGV)
+rescue OptionParser::ParseError => e
+  puts e.message
+  puts option_parser
+  exit(1)
+end
+
+if ARGV.count < 1 || ARGV.count > 2
   puts option_parser
   exit(1)
 end

data/recog/xml/dhcp_vendor_class.xml

@@ -8,13 +8,17 @@
     and inform (8) messages.
   -->
 
-  <fingerprint pattern="^Mfg=(?:Fuji)?(?i:Xerox);Typ=(?:MFP|printer);Mod=(?:Xerox )?(\S+) ([a-zA-Z0-9]+).*;Ser=([A-Z0-9]{9})(?:;Loc=.*)?$">
+  <fingerprint pattern="^[Mm]fg=(?:Fuji)?(?i:Xerox);[Tt]yp=(?:MFP|AIO|[Pp]rinter);[Mm]od=(?:Xerox )?(\S+) ([a-zA-Z0-9]+).*;[Ss]er=([A-Z0-9]{9,10})(?:;[Ll]oc=.*)?$">
     <description>Xerox Multifunction Printer</description>
     <example hw.family="VersaLink" hw.model="C405" hw.serial_number="ABC123456">Mfg=Xerox;Typ=MFP;Mod=VersaLink C405;Ser=ABC123456;Loc=Print Room</example>
     <example hw.family="AltaLink" hw.model="C8055" hw.serial_number="1AB234567">Mfg=Xerox;Typ=MFP;Mod=Xerox AltaLink C8055 Multifunction Printer;Ser=1AB234567;Loc=Print Room2</example>
     <example hw.family="WorkCentre" hw.model="3345" hw.serial_number="1AB234567">Mfg=XEROX;Typ=MFP;Mod=WorkCentre 3345;Ser=1AB234567;Loc=</example>
     <example hw.family="WorkCentre" hw.model="7845" hw.serial_number="AB1234567">Mfg=Xerox;Typ=MFP;Mod=Xerox WorkCentre 7845 v1 Multifunction System;Ser=AB1234567;Loc=</example>
     <example hw.family="Phaser" hw.model="6500DN" hw.serial_number="ABC123456">Mfg=FujiXerox;Typ=printer;Mod=Phaser 6500DN;Ser=ABC123456</example>
+    <example hw.family="Phaser" hw.model="6600DN" hw.serial_number="ABC123456">Mfg=Xerox;Typ=Printer;Mod=Phaser 6600DN;Ser=ABC123456;Loc=</example>
+    <example hw.family="AltaLink" hw.model="B8045" hw.serial_number="A1B234567">mfg=Xerox;typ=MFP;mod=Xerox AltaLink B8045 MFP;ser=A1B234567;loc=Print Room 3</example>
+    <example hw.family="VersaLink" hw.model="B7035" hw.serial_number="1AB234567C">Mfg=Xerox;Typ=MFP;Mod=VersaLink B7035;Ser=1AB234567C</example>
+    <example hw.family="WorkCentre" hw.model="3615" hw.serial_number="A1B234567">Mfg=Xerox;Typ=AIO;Mod=WorkCentre 3615;Ser=A1B234567</example>
     <param pos="0" name="hw.device" value="Printer"/>
     <param pos="0" name="hw.vendor" value="Xerox"/>
     <param pos="1" name="hw.family"/>
@@ -95,9 +99,44 @@
     <param pos="0" name="os.device" value="Printer"/>
   </fingerprint>
 
-  <fingerprint pattern="^Polycom-(VVX\d{3})$">
+  <fingerprint pattern="^Mfg=DELL;Typ=Printer;Mod=Dell ([A-Z]?\d{4}dn)(?:\sLaser Printer)?;Ser=([A-Z0-9]{7});$">
+    <description>Dell Laser Printer</description>
+    <example hw.model="B2360dn" hw.serial_number="ABCDEF1">Mfg=DELL;Typ=Printer;Mod=Dell B2360dn Laser Printer;Ser=ABCDEF1;</example>
+    <example hw.model="2330dn" hw.serial_number="123ABCD">Mfg=DELL;Typ=Printer;Mod=Dell 2330dn Laser Printer;Ser=123ABCD;</example>
+    <example hw.model="S2830dn" hw.serial_number="1A2BC34">Mfg=DELL;Typ=Printer;Mod=Dell S2830dn;Ser=1A2BC34;</example>
+    <param pos="0" name="hw.device" value="Printer"/>
+    <param pos="0" name="hw.vendor" value="Dell"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="2" name="hw.serial_number"/>
+    <param pos="0" name="os.vendor" value="Dell"/>
+    <param pos="0" name="os.device" value="Printer"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Mfg=Dell;Typ=printer;Mod=Dell Color Printer (S\d{4}cdn);Ser=([0-9]{6})$">
+    <description>Dell Color Printer</description>
+    <example hw.model="S3840cdn" hw.serial_number="123456">Mfg=Dell;Typ=printer;Mod=Dell Color Printer S3840cdn;Ser=123456</example>
+    <param pos="0" name="hw.device" value="Printer"/>
+    <param pos="0" name="hw.vendor" value="Dell"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="2" name="hw.serial_number"/>
+    <param pos="0" name="os.vendor" value="Dell"/>
+    <param pos="0" name="os.device" value="Printer"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Dell Color MFP (S\d{4}cdn)$$">
+    <description>Dell Color Multifunction Printer</description>
+    <example hw.model="S2825cdn">Dell Color MFP S2825cdn</example>
+    <param pos="0" name="hw.device" value="Printer"/>
+    <param pos="0" name="hw.vendor" value="Dell"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="os.vendor" value="Dell"/>
+    <param pos="0" name="os.device" value="Printer"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Polycom|Poly)-(VVX(?:-[A-Z])?\d{3})$">
     <description>Polycom IP Phone</description>
     <example hw.product="VVX410" hw.model="VVX410">Polycom-VVX410</example>
+    <example hw.product="VVX-D230" hw.model="VVX-D230">Poly-VVX-D230</example>
     <param pos="0" name="hw.device" value="VoIP"/>
     <param pos="0" name="hw.vendor" value="Polycom"/>
     <param pos="0" name="hw.family" value="VVX"/>
@@ -106,6 +145,37 @@
     <param pos="0" name="os.vendor" value="Polycom"/>
   </fingerprint>
 
+  <fingerprint pattern="^Polycom-SSIP([4-7]000)$">
+    <description>Polycom SoundStation IP Phone</description>
+    <example hw.product="SoundStation IP 6000" hw.model="6000">Polycom-SSIP6000</example>
+    <example hw.product="SoundStation IP 7000" hw.model="7000">Polycom-SSIP7000</example>
+    <param pos="0" name="hw.device" value="VoIP"/>
+    <param pos="0" name="hw.vendor" value="Polycom"/>
+    <param pos="0" name="hw.family" value="SoundStation IP"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="hw.product" value="{hw.family} {hw.model}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^digium_(D\d{2})_(\d_\d{1,2}_\d{1,2})$">
+    <description>Digium D Series IP Phone</description>
+    <example hw.model="D65" os.version="2_9_10">digium_D65_2_9_10</example>
+    <param pos="0" name="hw.vendor" value="Digium"/>
+    <param pos="0" name="hw.device" value="VoIP"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="os.vendor" value="Digium"/>
+    <param pos="0" name="os.product" value="Digium Firmware"/>
+    <param pos="2" name="os.version"/>
+    <param pos="0" name="os.device" value="VoIP"/>
+  </fingerprint>
+
+  <fingerprint pattern="^ipphone.mitel.com$">
+    <description>Mitel IP Phone</description>
+    <example>ipphone.mitel.com</example>
+    <param pos="0" name="hw.device" value="VoIP"/>
+    <param pos="0" name="hw.vendor" value="Mitel"/>
+    <param pos="0" name="os.device" value="VoIP"/>
+  </fingerprint>
+
   <fingerprint pattern="^Aruba\s(JL\d+A)\s(\d+[A-Z]?)\S+\sSwitch(?:\sdslforum.org)?$">
     <description>HP Aruba Network Switch</description>
     <example hw.model="JL075A" hw.product="3810M">Aruba JL075A 3810M-16SFP+-2-slot Switch</example>
@@ -171,6 +241,16 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:google:android:{os.version}"/>
   </fingerprint>
 
+  <fingerprint pattern="^HUAWEI:android:" certainty="0.8">
+    <description>Huawei Android Device</description>
+    <example>HUAWEI:android:ABC</example>
+    <param pos="0" name="hw.vendor" value="Huawei"/>
+    <param pos="0" name="os.vendor" value="Google"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Android"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:google:android:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^dhcpcd-(?:[\d\.]+):Linux-([\d\.]+).*:(\S*):">
     <description>Linux</description>
     <example os.version="4.14.78" os.arch="armv7l">dhcpcd-6.11.5:Linux-4.14.78:armv7l:Freescale</example>
@@ -203,4 +283,141 @@
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
 
+  <fingerprint pattern="^(?i)Cisco Systems Inc\. Wireless Phone (\d{4}g?)$" certainty="0.8">
+    <description>Cisco Wireless Phone</description>
+    <example hw.model="7920">Cisco Systems Inc. Wireless Phone 7920</example>
+    <example hw.model="7925G">Cisco Systems Inc. Wireless Phone 7925G</example>
+    <param pos="0" name="hw.device" value="VoIP"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="hw.product" value="Unified Wireless IP Phone {hw.model}"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.product" value="Unified Wireless IP Phone {hw.model} Firmware"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Cisco systems, Inc\. IP Phone CP(39\d{2})$" certainty="0.8">
+    <description>Cisco SIP Phone</description>
+    <example hw.model="3911">Cisco systems, Inc. IP Phone CP3911</example>
+    <param pos="0" name="hw.device" value="VoIP"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="hw.product" value="Unified SIP Phone {hw.model}"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.product" value="Unified SIP Phone {hw.model} Firmware"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Cisco Systems, Inc\. IP Phone CP-(\d{4}(?:G|G-GE|NR)?)$" certainty="0.8">
+    <description>Cisco IP Phone</description>
+    <example hw.model="6921">Cisco Systems, Inc. IP Phone CP-6921</example>
+    <example hw.model="7911G">Cisco Systems, Inc. IP Phone CP-7911G</example>
+    <example hw.model="7941G-GE">Cisco Systems, Inc. IP Phone CP-7941G-GE</example>
+    <example hw.model="8865NR">Cisco Systems, Inc. IP Phone CP-8865NR</example>
+    <param pos="0" name="hw.device" value="VoIP"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="hw.product" value="Unified IP Phone {hw.model}"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.product" value="Unified IP Phone {hw.model} Firmware"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Cisco AP c(\d{3,4}[a-z]?)$" certainty="0.8">
+    <description>Cisco Aironet Wireless Access Point</description>
+    <example hw.model="701">Cisco AP c701</example>
+    <example hw.model="1830">Cisco AP c1830</example>
+    <example hw.model="1840i">Cisco AP c1840i</example>
+    <param pos="0" name="hw.device" value="WAP"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="hw.product" value="Aironet {hw.model}"/>
+    <param pos="0" name="os.product" value="Aironet {hw.model} Firmware"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.device" value="WAP"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Cisco AP C(9115|9120)AX$" certainty="0.8">
+    <description>Cisco Catalyst 9100 Series Wireless Access Point</description>
+    <example hw.model="9115">Cisco AP C9115AX</example>
+    <example hw.model="9120">Cisco AP C9120AX</example>
+    <param pos="0" name="hw.device" value="WAP"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="hw.product" value="Catalyst {hw.model} AP"/>
+    <param pos="0" name="os.product" value="Catalyst {hw.model} AP Firmware"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Cisco (AP80[123])$" certainty="0.8">
+    <description>Cisco 800 Series Integrated Access Point</description>
+    <example hw.model="AP801">Cisco AP801</example>
+    <example hw.model="AP802">Cisco AP802</example>
+    <example hw.model="AP803">Cisco AP803</example>
+    <param pos="0" name="hw.device" value="WAP"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Cisco AIR-CTVM-K9$" certainty="0.8">
+    <description>Cisco Virtual Wireless Controller</description>
+    <example>Cisco AIR-CTVM-K9</example>
+    <param pos="0" name="hw.device" value="Wireless Controller"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.model" value="AIR-CTVM-K9"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Cisco (AIR-CT55\d{2}-K9)$" certainty="0.8">
+    <description>Cisco 5500 Series Wireless Controller</description>
+    <example hw.model="AIR-CT5508-K9">Cisco AIR-CT5508-K9</example>
+    <param pos="0" name="hw.device" value="Wireless Controller"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+  </fingerprint>
+
+  <fingerprint pattern="^BrightSign ((?:HS|XD|LS|XT|HD)\d{3,4}(?:-W|-PP)?)$">
+    <description>BrightSign Digital Signage Player</description>
+    <example hw.model="HS124">BrightSign HS124</example>
+    <example hw.model="XD1034">BrightSign XD1034</example>
+    <example hw.model="XD1034-W">BrightSign XD1034-W</example>
+    <example hw.model="LS424-W">BrightSign LS424-W</example>
+    <example hw.model="XT244">BrightSign XT244</example>
+    <example hw.model="HD1023">BrightSign HD1023</example>
+    <example hw.model="XT1144-PP">BrightSign XT1144-PP</example>
+    <param pos="0" name="hw.vendor" value="BrightSign"/>
+    <param pos="0" name="hw.device" value="Media Server"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="os.vendor" value="BrightSign"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.device" value="Media Server"/>
+    <param pos="0" name="os.product" value="{hw.model} Firmware"/>
+  </fingerprint>
+
+  <fingerprint pattern="^iDRAC$">
+    <description>Integrated Dell Remote Access Controller</description>
+    <example>iDRAC</example>
+    <param pos="0" name="hw.vendor" value="Dell"/>
+    <param pos="0" name="hw.product" value="iDRAC"/>
+  </fingerprint>
+
+  <fingerprint pattern="^udhcp(?:c|\s)([0-1]\.\d+\.\d(?:-pre)?)$">
+    <description>Linux System using Busybox</description>
+    <example service.version="1.22.1">udhcp 1.22.1</example>
+    <example service.version="1.21.1">udhcpc1.21.1</example>
+    <example service.version="0.9.9-pre">udhcp 0.9.9-pre</example>
+    <param pos="0" name="service.vendor" value="Busybox"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.certainty" value="0.1"/>
+  </fingerprint>
+
+  <fingerprint pattern="^ccp\.avaya\.com$">
+    <description>Avaya device</description>
+    <example>ccp.avaya.com</example>
+    <param pos="0" name="hw.vendor" value="Avaya"/>
+    <param pos="0" name="hw.certainty" value="0.8"/>
+    <param pos="0" name="os.vendor" value="Avaya"/>
+    <param pos="0" name="os.certainty" value="0.8"/>
+  </fingerprint>
+
 </fingerprints>