recog 3.1.1 → 3.1.2

data/lib/recog/verify_reporter.rb

@@ -1,97 +1,93 @@
+# frozen_string_literal: true
+
 module Recog
-class VerifyReporter
-  attr_reader :formatter
-  attr_reader :success_count, :warning_count, :failure_count
-
-  def initialize(options, formatter, path=nil)
-    @options = options
-    @formatter = formatter
-    @path = path
-    reset_counts
-  end
+  class VerifyReporter
+    attr_reader :formatter, :success_count, :warning_count, :failure_count
+
+    def initialize(options, formatter, path = nil)
+      @options = options
+      @formatter = formatter
+      @path = path
+      reset_counts
+    end
 
-  def report(fingerprint_count)
-    reset_counts
-    if detail? and !@path.to_s.empty?
-      formatter.status_message("\n#{@path}:\n")
+    def report(fingerprint_count)
+      reset_counts
+      formatter.status_message("\n#{@path}:\n") if detail? && !@path.to_s.empty?
+      yield self
+      summarize(fingerprint_count) unless @options.quiet
     end
-    yield self
-    summarize(fingerprint_count) unless @options.quiet
-  end
 
-  def success(text)
-    @success_count += 1
-    formatter.success_message("#{padding}#{text}") if detail?
-  end
+    def success(text)
+      @success_count += 1
+      formatter.success_message("#{padding}#{text}") if detail?
+    end
 
-  def warning(text, line=nil)
-    return unless @options.warnings
-    @warning_count += 1
-    formatter.warning_message("#{path_label(line)}#{padding}WARN: #{text}")
-  end
+    def warning(text, line = nil)
+      return unless @options.warnings
 
-  def failure(text, line=nil)
-    @failure_count += 1
-    formatter.failure_message("#{path_label(line)}#{padding}FAIL: #{text}")
-  end
+      @warning_count += 1
+      formatter.warning_message("#{path_label(line)}#{padding}WARN: #{text}")
+    end
+
+    def failure(text, line = nil)
+      @failure_count += 1
+      formatter.failure_message("#{path_label(line)}#{padding}FAIL: #{text}")
+    end
+
+    def print_name(fingerprint)
+      return unless detail? && fingerprint.tests.any?
 
-  def print_name(fingerprint)
-    if detail? && fingerprint.tests.any?
       name = fingerprint.name.empty? ? '[unnamed]' : fingerprint.name
       formatter.status_message("\n#{name}")
     end
-  end
 
-  def summarize(fingerprint_count)
-    print_fingerprint_count(fingerprint_count) if detail?
-    print_summary
-  end
+    def summarize(fingerprint_count)
+      print_fingerprint_count(fingerprint_count) if detail?
+      print_summary
+    end
 
-  def print_fingerprint_count(count)
-    formatter.status_message("\nVerified #{count} fingerprints:")
-  end
+    def print_fingerprint_count(count)
+      formatter.status_message("\nVerified #{count} fingerprints:")
+    end
 
-  def print_summary
-    colorize_summary(summary_line)
-  end
+    def print_summary
+      colorize_summary(summary_line)
+    end
 
-  private
+    private
 
-  def reset_counts
-    @success_count = @failure_count = @warning_count = 0
-  end
+    def reset_counts
+      @success_count = @failure_count = @warning_count = 0
+    end
 
-  def detail?
-    @options.detail
-  end
+    def detail?
+      @options.detail
+    end
 
-  def path_label(line=nil)
-    unless detail?
-      line_label = line ? line.to_s + ":" : ""
-      @path.to_s.empty? ? "" : "#{@path}:#{line_label} "
+    def path_label(line = nil)
+      return if detail?
+
+      line_label = line ? "#{line}:" : ''
+      @path.to_s.empty? ? '' : "#{@path}:#{line_label} "
     end
-  end
 
-  def padding
-    '   ' if @options.detail
-  end
+    def padding
+      '   ' if @options.detail
+    end
 
-  def summary_line
-    summary = "#{path_label}SUMMARY: Test completed with "
-    summary << "#{@success_count} successful"
-    summary << ", #{@warning_count} warnings"
-    summary << ", and #{@failure_count} failures"
-    summary
-  end
+    def summary_line
+      "#{path_label}SUMMARY: Test completed with #{@success_count} successful, #{@warning_count} warnings, and #{@failure_count} failures"
+    end
 
-  def colorize_summary(summary)
-    if @failure_count > 0
-      formatter.failure_message(summary)
-    elsif @warning_count > 0
-      formatter.warning_message(summary)
-    else
-      formatter.success_message(summary)
+    def colorize_summary(summary)
+      if @failure_count > 0
+        formatter.failure_message(summary)
+      elsif @warning_count > 0
+        formatter.warning_message(summary)
+      else
+        formatter.success_message(summary)
+      end
     end
   end
 end
-end

data/lib/recog/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Recog
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end

data/lib/recog.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'recog/version'
 require 'recog/db_manager'
 require 'recog/nizer'

data/recog/bin/recog_match

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'optparse'
 require 'ostruct'
@@ -8,47 +9,47 @@ require 'recog/matcher_factory'
 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]"
-  opts.separator "Identifies the matches and misses between the fingerprints and the banners file or STDIN"
-  opts.separator ""
-  opts.separator "Options"
+  opts.banner = "Usage: #{$PROGRAM_NAME} [options] XML_FINGERPRINT_FILE [BANNERS_FILE]"
+  opts.separator 'Identifies the matches and misses between the fingerprints and the banners file or STDIN'
+  opts.separator ''
+  opts.separator 'Options'
 
-  opts.on("-f", "--format FORMATTER", [:summary, :detail, :json],
-          "Choose a formatter.",
-          "  [s]ummary (default - failure/match msgs)",
-          "  [d]etail  (msgs with total counts)",
-          "  [j]son    (JSON failure/match msgs)") do |format|
-    if format == :summary
+  opts.on('-f', '--format FORMATTER', %i[summary detail json],
+          'Choose a formatter.',
+          '  [s]ummary (default - failure/match msgs)',
+          '  [d]etail  (msgs with total counts)',
+          '  [j]son    (JSON failure/match msgs)') do |format|
+    case format
+    when :summary
       options.detail = false
       options.json_format = false
-    elsif format == :detail
+    when :detail
       options.detail = true
-    elsif format == :json
+    when :json
       options.json_format = true
     end
   end
 
-  opts.on("--fail-fast [NUM]",
-          "Stop after number of failures (default: 10).") do |num|
+  opts.on('--fail-fast [NUM]',
+          'Stop after number of failures (default: 10).') do |num|
     options.fail_fast = true
-    options.stop_after = (num.to_i == 0) ? 10 : num.to_i
+    options.stop_after = num.to_i == 0 ? 10 : num.to_i
   end
 
-  opts.on("-c", "--color", "Enable color in the output.") do
+  opts.on('-c', '--color', 'Enable color in the output.') do
     options.color = true
   end
 
-  opts.on("--[no-]multi-match", "Enable or disable multiple matches (defaults to disabled)") do |o|
+  opts.on('--[no-]multi-match', 'Enable or disable multiple matches (defaults to disabled)') do |o|
     options.multi_match = o
   end
 
-  opts.on("-h", "--help", "Show this message.") do
+  opts.on('-h', '--help', 'Show this message.') do
     puts opts
     exit
   end
 end
 
-
 begin
   option_parser.parse!(ARGV)
 rescue OptionParser::ParseError => e
@@ -65,4 +66,4 @@ end
 ndb = Recog::DB.new(ARGV.shift)
 options.fingerprints = ndb.fingerprints
 matcher = Recog::MatcherFactory.build(options)
-matcher.match_banners(ARGV.shift || "-")
+matcher.match_banners(ARGV.shift || '-')

data/recog/xml/apache_modules.xml

@@ -1196,6 +1196,7 @@
     <param pos="0" name="service.component.vendor" value="Apache"/>
     <param pos="0" name="service.component.product" value="mod_jk"/>
     <param pos="1" name="service.component.version"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:apache:mod_jk:{service.component.version}"/>
   </fingerprint>
 
   <fingerprint pattern="mod_jk/?$">
@@ -1203,6 +1204,7 @@
     <example>mod_jk/</example>
     <param pos="0" name="service.component.vendor" value="Apache"/>
     <param pos="0" name="service.component.product" value="mod_jk"/>
+    <param pos="0" name="service.component.cpe23" value="cpe:/a:apache:mod_jk:-"/>
   </fingerprint>
 
   <fingerprint pattern="mod_jk2/(\S+)$">

data/recog/xml/dhcp_vendor_class.xml

@@ -947,7 +947,7 @@
   <fingerprint pattern="^JNPR\.IVE$">
     <description>Juniper SSL VPN</description>
     <example>JNPR.IVE</example>
-    <param pos="0" name="hw.device" value="SSL-VPN"/>
+    <param pos="0" name="hw.device" value="VPN"/>
     <param pos="0" name="hw.vendor" value="Juniper"/>
     <param pos="0" name="os.vendor" value="Juniper"/>
     <param pos="0" name="os.product" value="IVE OS"/>

data/recog/xml/favicons.xml

@@ -30,6 +30,36 @@
     <param pos="0" name="service.product" value="Media Server"/>
   </fingerprint>
 
+  <fingerprint pattern="^(?:1a60f7f928a659f763204d525b3cf90d|6d4c72194ecff7ead96f65db45851be9|55ece828b1329741c1d553a6575d71f1)$">
+    <description>Radarr</description>
+    <!-- favicon-16x16.png -->
+
+    <example>1a60f7f928a659f763204d525b3cf90d</example>
+    <!-- favicon-32x32.png -->
+
+    <example>6d4c72194ecff7ead96f65db45851be9</example>
+    <!-- favicon.ico -->
+
+    <example>55ece828b1329741c1d553a6575d71f1</example>
+    <param pos="0" name="service.vendor" value="Radarr"/>
+    <param pos="0" name="service.product" value="Radarr"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:b3ae051d2c6b875b2064288104856291|c24b156cfaa12860760793f43b487c21|657ebbffad0e5c71a1010fbc9b279b1e)$">
+    <description>Sonarr</description>
+    <!-- favicon-32x32.png -->
+
+    <example>b3ae051d2c6b875b2064288104856291</example>
+    <!-- favicon-16x16.png -->
+
+    <example>c24b156cfaa12860760793f43b487c21</example>
+    <!-- favicon.ico -->
+
+    <example>657ebbffad0e5c71a1010fbc9b279b1e</example>
+    <param pos="0" name="service.vendor" value="Sonarr"/>
+    <param pos="0" name="service.product" value="Sonarr"/>
+  </fingerprint>
+
   <fingerprint pattern="^0f584138aacfb79aaba7e2539fc4e642$">
     <description>Plex Media Server</description>
     <example>0f584138aacfb79aaba7e2539fc4e642</example>
@@ -1303,7 +1333,6 @@
     <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.certainty" value="0.5"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:-"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="hw.product" value="Adaptive Security Appliance"/>
@@ -1698,6 +1727,7 @@
     <param pos="0" name="hw.vendor" value="HP"/>
     <param pos="0" name="hw.product" value="iLO 3"/>
     <param pos="0" name="hw.certainty" value="0.5"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights-out_3:-"/>
     <param pos="0" name="os.vendor" value="HP"/>
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="0" name="os.family" value="iLO"/>
@@ -2128,6 +2158,16 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:spark:-"/>
   </fingerprint>
 
+  <fingerprint pattern="^0629ce6bd8a86ff6b5dbb2a24c040849$">
+    <description>Apache Superset</description>
+    <!-- favicon.png from version 2.1.0 -->
+
+    <example>0629ce6bd8a86ff6b5dbb2a24c040849</example>
+    <param pos="0" name="service.vendor" value="Apache"/>
+    <param pos="0" name="service.product" value="Superset"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apache:superset:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^a3dcb28303f26786e262e0760781057a$">
     <description>Eltex device web interface</description>
     <example>a3dcb28303f26786e262e0760781057a</example>
@@ -2346,4 +2386,96 @@
     <param pos="0" name="service.product" value="R1Soft Server Backup Manager"/>
   </fingerprint>
 
+  <fingerprint pattern="^(?:cc21dae362a981ea9ce93138cb855e66|372be2fa33d5836cdcf8c1867e6900c2|54bb0b4a353b89c42e63b8e8bd6ea504)$">
+    <description>Jellyseerr</description>
+    <!-- favicon.ico-->
+
+    <example>cc21dae362a981ea9ce93138cb855e66</example>
+    <!-- favicon-16x16.png-->
+
+    <example>372be2fa33d5836cdcf8c1867e6900c2</example>
+    <!-- favicon-32x32.png-->
+
+    <example>54bb0b4a353b89c42e63b8e8bd6ea504</example>
+    <param pos="0" name="service.vendor" value="Jellyseerr"/>
+    <param pos="0" name="service.product" value="Jellyseerr"/>
+  </fingerprint>
+
+  <fingerprint pattern="^d6abc57c65b787c0418803ffc75a7fa0$">
+    <description>MeterSphere - Open-source Continuous Testing Platform</description>
+    <example>d6abc57c65b787c0418803ffc75a7fa0</example>
+    <param pos="0" name="service.vendor" value="MeterSphere"/>
+    <param pos="0" name="service.product" value="MeterSphere"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:metersphere:metersphere:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:eddb2b697c8c3dab5a9572de564976d1|b0f000f8041a6f1d2c366972b1dbad69)$">
+    <description>FatPipe Networks device web interface</description>
+    <!--
+      favicon.ico from multiple products and builds:
+        * FatPipe MPVPN versions: 9.1.2r161p26, 9.1.2r164p5
+        * FatPipe IPVPN versions: 9.1.2r129, 10.1.2r60p89
+        * FatPipe WARP versions: 9.1.2r161p19, 9.1.2r161p26, 9.1.2r185
+        * FatPipe SDWAN versions: unknown
+    -->
+
+    <example>eddb2b697c8c3dab5a9572de564976d1</example>
+    <!--
+      favicon.ico from multiple products and builds:
+        * FatPipe MPVPN version 9.1.2r161p26 to 9.1.2r164p5
+        * FatPipe IPVPN versions: 9.1.2r129
+        * FatPipe WARP versions: 9.1.2r161p19, 9.1.2r161p26, 9.1.2r185
+    -->
+
+    <example>b0f000f8041a6f1d2c366972b1dbad69</example>
+    <param pos="0" name="os.vendor" value="FatPipe Networks"/>
+    <param pos="0" name="hw.vendor" value="FatPipe Networks"/>
+  </fingerprint>
+
+  <fingerprint pattern="^619e4452da00dad6c3d7b5fd99b9390e$">
+    <description>3CX Phone System Management Console</description>
+    <example>619e4452da00dad6c3d7b5fd99b9390e</example>
+    <param pos="0" name="service.vendor" value="3CX"/>
+    <param pos="0" name="service.product" value="3CX Web Server"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:3cx:3cx_web_server:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:4764ad78b4c0d93bc48d4d0df3b36c7e|8d8030454ec1d7f96c8fdf670d4eb3c6)$">
+    <description>PaperCut MF and PaperCut NG - print management system</description>
+    <!--
+      favicon.ico across two products and multiple builds
+        * PaperCut MF builds: 54736 to 65997
+        * PaperCut NG builds: 59505
+    -->
+
+    <example>4764ad78b4c0d93bc48d4d0df3b36c7e</example>
+    <!-- favicon.ico from PaperCut MF builds: 47777 -->
+
+    <example>8d8030454ec1d7f96c8fdf670d4eb3c6</example>
+    <param pos="0" name="service.vendor" value="PaperCut"/>
+  </fingerprint>
+
+  <fingerprint pattern="^57801ef5135f6a6e8ea69baef85f8607$">
+    <description>frp - fast reverse proxy</description>
+    <!-- favicon.ico from frp version 0.48.0 -->
+
+    <example>57801ef5135f6a6e8ea69baef85f8607</example>
+    <param pos="0" name="service.vendor" value="frp"/>
+    <param pos="0" name="service.product" value="frp"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:924a68d347c80d0e502157e83812bb23|f1ac749564d5ba793550ec6bdc472e7c|ef9c0362bf20a086bb7c2e8ea346b9f0)$">
+    <description>Roundcube Webmail</description>
+    <!-- favicon.ico from Roundcube Webmail version 1.5.0+ -->
+
+    <example>924a68d347c80d0e502157e83812bb23</example>
+    <!-- favicon.ico from Roundcube Webmail up to version 1.4.13 -->
+
+    <example>f1ac749564d5ba793550ec6bdc472e7c</example>
+    <example>ef9c0362bf20a086bb7c2e8ea346b9f0</example>
+    <param pos="0" name="service.vendor" value="Roundcube"/>
+    <param pos="0" name="service.product" value="Webmail"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:roundcube:webmail:-"/>
+  </fingerprint>
+
 </fingerprints>

data/recog/xml/ftp_banners.xml

@@ -615,7 +615,7 @@ more text</example>
     <param pos="0" name="os.family" value="z/OS"/>
     <param pos="0" name="os.device" value="Mainframe"/>
     <param pos="1" name="os.version"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:ibm:z\/os:{os.version}"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:ibm:z%2fos:{os.version}"/>
     <param pos="2" name="host.name"/>
   </fingerprint>