recog 2.3.20 → 2.3.23

data/identifiers/service_product.txt

@@ -10,6 +10,7 @@ AIOHTTP
 AOS
 APIC
 ARRIS
+ASDM
 ASM
 ASP.NET
 Abyss Web Server X1
@@ -19,6 +20,7 @@ Active Directory Controller
 Active Intelligence Engine
 ActiveMQ
 AdGuard Home
+Adminer
 AirTunes
 Airflow
 Alteon Web Switch
@@ -29,6 +31,7 @@ Apache Tomcat HTTP Connector
 AppleShare IP Mail Server
 Application Load Balancer
 Application Protection System, Enterprise
+Application Server
 Application Server Portal
 Application Server Web Cache
 Appweb
@@ -49,6 +52,7 @@ BlackJumboDog
 BladeSystems
 Boa
 Bugzilla
+CALDERA
 CCProxy
 CMS
 CMS400.NET
@@ -89,6 +93,7 @@ CouchDB
 Couchbase Server
 Courier IMAP
 Courier POP
+Covenant
 Cowboy
 Coyote
 Cross Web Server
@@ -139,6 +144,7 @@ Exchange 2003 Server
 Exchange 2007 Server
 Exchange Server
 Exchange Server 5.5
+Express WebTools
 Expressway
 FTGate
 FTP
@@ -160,6 +166,7 @@ Flyspray
 FortiVoice
 FortressSSH Server
 FreSSH
+FreeNAS
 FreeSWITCH
 Fusion Middleware
 GHost
@@ -191,6 +198,7 @@ HttpProxy
 Hummingbird Exceed X server
 IBM Domino
 IIS
+ILOM
 IMail Server
 IOS
 IPVA
@@ -329,7 +337,9 @@ Niagara AX
 Node
 Notebook
 Nucleus SNMP Agent
+Nuggets Learning Server
 Observium
+Office 365 Reporter
 OpManager
 Open Directory
 Open Stack Platform Director
@@ -388,6 +398,7 @@ RealServer
 RealVNC
 Recursor
 Red Hat Directory Server
+Redis Commander
 Redmine
 Reflection
 Reflection for Secure IT
@@ -445,7 +456,9 @@ SmartDNS
 SmartSense Tool
 SmbFTPD
 Snowball
+Solr
 SonarQube
+Spark
 SpeedTouch
 Splunk
 Squeezebox
@@ -467,10 +480,12 @@ TCPIP POP server
 TUX Web Server
 Tableau Server
 TeamCity
+TeamSpeak
 Tengine
 TestCenter IQ
 Thin
 TigerVNC
+TinyGS
 Tinyproxy
 Tivoli Access Manager for e-business WebSEAL
 Tivoli Storage FlashCopy Manager
@@ -483,10 +498,13 @@ Transportation Management
 Twisted FTPD
 Twisted Web
 Twonky Media Server
+UNMS
 UnboundID Directory Proxy Server
 UnboundID Directory Server
+UniFi
 UniFi Video
 Universal Management Appliance
+Unraid
 Urchin Tracking Module
 Usermin
 VM
@@ -507,6 +525,7 @@ VisionFS
 VxWorks CIFS
 WEBrick
 WHM
+WLED
 WS_FTP
 WU-FTPD
 WeOnlyDo SSH Server
@@ -520,6 +539,7 @@ WebGUI
 WebLogic
 WebServer
 WebShield
+WebSocket++
 WebSphere
 WebSphere Load Balancer
 WebTrends
@@ -570,6 +590,7 @@ gSOAP
 gdnsd
 httpd
 iLO
+iPlanet Web Server
 iScale
 inetutils ftpd
 ipGENADevice
@@ -579,6 +600,7 @@ libupnp
 lighttpd
 micro_httpd
 mini_httpd
+mitmproxy
 mod_access
 mod_access_compat
 mod_actions
@@ -726,16 +748,20 @@ mod_vhost_alias
 mod_watchdog
 mod_wsgi
 mod_xml2enc
+mongo-express
 nginx
 noVNC
+ntopng
 ownCloud Server
 perl
 pfSense
+phpMyAdmin
 qmail
 qpopper-mysql
 raptor
 rbldnsd
 sfcb
+sofia-sip
 sshlib
 thttpd
 tnftpd

data/identifiers/vendor.txt

@@ -1,3 +1,4 @@
+2N Telekomunikace
 3CX
 3Com
 8x8 Inc.
@@ -34,6 +35,8 @@ Aastra
 Accelerated Technology
 AdGuard
 Adaptec
+AdminDroid
+Adminer
 Adobe
 Adtran
 Aerohive
@@ -41,6 +44,7 @@ Agere Systems
 Agilent
 AirDefense
 AirMagnet
+Aircookie
 Airties
 Akamai
 Algo
@@ -48,6 +52,8 @@ AlienVault
 Allegro Software
 Allen-Bradley
 Allied Telesyn
+Allworx
+Alpha Technologies
 Alpha Telecom, Inc. U.S.A.
 Alpine
 Alt-N
@@ -58,6 +64,7 @@ AnyBus
 Apache
 Apple
 Aprelium Technologies
+Aptinex
 ArGoSoft
 Arachni
 Araknis Networks
@@ -93,14 +100,18 @@ BT
 Bandura Labs
 Bangteng
 Barco
+Barix
 Barracuda
 Berkeley Software Design Inc.
 Bftpd Project
 Bigfoot
+Bird Home Automation
 Bitvise
+BlackBox
 Blue Coat
 BlueCat
 Boa
+Bobcat
 Bomgar
 Bosch
 Bose
@@ -113,6 +124,7 @@ Buffalo
 C&D Technologies
 C-Phone Corporation
 CA
+CBT
 CDVI
 CSM
 Cabletron
@@ -163,6 +175,7 @@ Conectiva
 Conexant
 Congruency, Inc.
 ConnectWise
+Control Solutions
 Couchbase
 Cradlepoint
 Crestron
@@ -170,6 +183,7 @@ Critical Path
 CrushFTP
 CrystalVoice Communications
 Cumulus
+CyberPower
 Cyberoam
 D J Bernstein
 D-Link
@@ -214,6 +228,7 @@ Eclipse
 Ektron
 Elastic
 Eltek
+Eltex
 EmbedThis
 Embedthis
 Emby
@@ -227,6 +242,7 @@ EqualLogic
 Equivalence (OpenH323)
 Ericsson
 Eudora
+Evolis
 ExtraHop
 Extreme Networks
 Extron
@@ -237,6 +253,7 @@ Facebook
 FarSite Communications
 FatWire
 Fedora Project
+Ferner
 Ferrari Electronik GmbH
 Fidelis
 Fidelix
@@ -255,6 +272,8 @@ Foundry Networks
 FreeBSD
 FreePBX
 FreeSWITCH
+Freebox
+FreshTomato
 Fuji Xerox
 Fujitsu
 Fujitsu Siemens
@@ -272,12 +291,15 @@ Genivia
 Genscape
 Gentoo
 Gerrit
+GigaBlue
 Gigamon
+Gigaset
 GitHub
 GitLab
 Gitea
 Global Technology Associates
 GlobalScape
+GoGogate
 Gogs
 Google
 Gordano
@@ -361,6 +383,7 @@ Kyocera
 Kyocera Mita
 LANCOM Systems
 LANDesk
+LG
 LINX
 Labtam
 Lanier
@@ -376,17 +399,20 @@ Liebert
 Lifesize
 LigoWave
 Ligowave
+Lime Technologies
 Linksys
 Linux
 LiteSpeed Technologies
 LiveWorks Limited
 Logitech
+Lorex
 Lotus
 Loxone
 Lucent
 Lynx Technology
 Lyris
 MBP Kommunikationssysteme GmbH
+MITRE
 MPI Technologies
 MPS Software
 MRV Communications
@@ -406,6 +432,7 @@ Media5 Corporation
 MediaGate
 Mediatrix Telecom
 Merak
+Meraki
 Mercury Security
 Merit LILIN
 Mersive
@@ -442,6 +469,7 @@ NLnet Labs
 NTP
 NVIDIA
 Nagios
+Nanoleaf
 NcFTP Software
 Neoscale
 Nero
@@ -453,6 +481,7 @@ NetData
 NetIQ
 NetSarang Computer, Inc.
 NetWin
+Netgate
 Netgear
 Netia
 Netopia
@@ -471,6 +500,7 @@ Nominum
 Nortel
 Norton
 Novell
+Nuuo
 OPNsense
 Objective Communications
 Observium
@@ -509,6 +539,7 @@ Panduit
 Paradyne
 Parallels
 Paramiko
+Patton
 Paul Smith Computer Services
 Pelco
 Percona
@@ -516,12 +547,14 @@ Perl
 Phacility
 Philips
 Philips Video Conferencing Systems
+Phoenix Contact
 Pi-hole
 PictureTel
 Plain Black
 Plex
 Plixer
 Polatis
+Poly
 Polycom
 Portainer
 Postfix
@@ -531,11 +564,13 @@ PowerWare
 Pragma Systems
 Pro Group
 ProFTPD Project
+ProSoft Technology
 Process Software
 Progress
 Prometheus
 Pronet
 Proxmox
+Psion Teklogix
 Pulse Secure
 Pure Storage
 PureFTPd
@@ -560,6 +595,7 @@ RealVNC Ltd.
 Rectifier Technologies
 Red Hat
 Redback Networks
+Redline
 Redmine
 Rhino Software
 Ricoh
@@ -600,6 +636,7 @@ SapporoWorks
 Satelitech
 Savin
 Scalix
+Schneider Electric
 Schneider Rundfunkwerke AG
 Science Dynamics Corporation
 Science Logic
@@ -612,11 +649,13 @@ Segger
 Sendmail
 Sequent
 Sercomm
+SerenityOS
 Serome Technology, Inc.
 Serv-U
 ServerTech
 Sharp
 ShellInABox
+Shelly
 Shenzhen Reecam Tech. Ltd.
 ShoreTel
 Siebel
@@ -629,6 +668,7 @@ SmoothWall
 SnapServer
 Sofrel
 Softing
+Software House
 SolarWinds
 SonarQube
 SonicWall
@@ -641,6 +681,7 @@ Spiceworks
 Spirent Communications
 SpliceCom
 Splunk
+SpotterRF
 Squid Cache
 Standard Networks
 StarNet Communications Corp.
@@ -674,15 +715,18 @@ Tableau
 Tandberg
 Taobao
 Tasman Networks
+TeamSpeak
 Technicolor
 Tektronix
 Teldat H. Kruszynski, M. Cichocki Sp. J.
 TeleStream Technologies, Inc.
 TeleWare
+Teledyne FLIR
 Telliris
 Telxon Corporation
 Tenable
 Tencent
+Teradici
 Thekelleys
 Thomson
 TigerVNC
@@ -694,6 +738,8 @@ Tinyproxy Project
 Tivo
 Tobit Software
 Tokutek
+Tomato
+TomatoUSB
 Tor Project
 TornadoWeb
 Toshiba
@@ -712,10 +758,14 @@ Ubiquiti
 Ubuntu
 UnboundID
 Unica
+Unify
 Unisys
 UnitedLinux
+VBrick
 VMware
 VTEL
+Vaddio
+Valcom
 VanDyke Software
 Vanguard Managed Solutions
 Varnish-cache
@@ -739,20 +789,23 @@ WatchGuard
 WeOnlyDo
 WebTrends
 Webmin
+Weidmüller
 Westbay Engineers
 Westell
 Western Digital
 White Box
+Wifx
 Wildix
 Wind River
 Wowza
 Wowza Media Systems
+Wyze
 X.Org
 XAMPP
 XFree86
 XRoads
 Xerox
-Xiongmai Tech
+Xiongmai Technology
 Xiph
 Xiph.org
 Xitami
@@ -767,6 +820,7 @@ Youngzsoft
 ZMailer
 ZTE
 Zabbix
+Zaphoyd Studios
 ZebraNet
 Zed Shaw
 Zyxel
@@ -781,17 +835,24 @@ exim
 gdnsd
 home.pl
 i.LON
+iRobot
+iStar
 iTach
+iXsystems
 innovaphone
 libssh
 lighttpd
+mitmproxy
 mod_ssl
 mod_wsgi
+mongo-express Project
 nginx
 ninenines
 noVNC
+ntop
 ownCloud
 pfSense
+phpMyAdmin
 port25
 qmail
 rPath

data/lib/recog/db.rb

@@ -66,10 +66,11 @@ class DB
 
     end
 
+    filepath =  self.path.sub(/\.xml$/, '')
     @match_key = File.basename(self.path).sub(/\.xml$/, '') unless @match_key
 
     xml.xpath('/fingerprints/fingerprint').each do |fprint|
-      @fingerprints << Fingerprint.new(fprint, @match_key, @protocol)
+      @fingerprints << Fingerprint.new(fprint, @match_key, @protocol, filepath)
     end
 
     xml = nil

data/lib/recog/fingerprint.rb

@@ -5,6 +5,7 @@ module Recog
 class Fingerprint
   require 'set'
 
+  require 'recog/fingerprint_parse_error'
   require 'recog/fingerprint/regexp_factory'
   require 'recog/fingerprint/test'
 
@@ -28,19 +29,27 @@ class Fingerprint
   # @return (see #parse_examples)
   attr_reader :tests
 
+  # The line number of the XML entity in the source file for this
+  # fingerprint.
+  #
+  # @return [Integer] The line number of this entity.
+  attr_reader :line
+
   # @param xml [Nokogiri::XML::Element]
   # @param match_key [String] See Recog::DB
   # @param protocol [String] Protocol such as ftp, mssql, http, etc.
-  def initialize(xml, match_key=nil, protocol=nil)
+  # @param example_path [String] Directory path for fingerprint example files
+  def initialize(xml, match_key=nil, protocol=nil, example_path=nil)
     @match_key = match_key
     @protocol = protocol
     @name   = parse_description(xml)
     @regex  = create_regexp(xml)
+    @line   = xml.line
     @params = {}
     @tests = []
 
     @protocol.downcase! if @protocol
-    parse_examples(xml)
+    parse_examples(xml, example_path)
     parse_params(xml)
   end
 
@@ -160,6 +169,7 @@ class Fingerprint
     # look for the presence of test cases
     if tests.size == 0
       yield :warn, "'#{@name}' has no test cases"
+      return
     end
 
     # make sure each test case passes
@@ -176,6 +186,7 @@ class Fingerprint
       # out correctly and match the capture group values we expect.
       test.attributes.each do |k, v|
         next if k == '_encoding'
+        next if k == '_filename'
         if !result.has_key?(k) || result[k] != v
           message = "'#{@name}' failed to find expected capture group #{k} '#{v}'. Result was #{result[k]}"
           status = :fail
@@ -223,8 +234,8 @@ class Fingerprint
     capture_group_used.each do |param_name, param_used|
       if !param_used
         message = "'#{@name}' is missing an example that checks for parameter '#{param_name}' " +
-                  "messsage which is derived from a capture group"
-        yield :warn, message
+                  "which is derived from a capture group"
+        yield :fail, message
       end
     end
   end
@@ -247,14 +258,30 @@ class Fingerprint
   end
 
   # @param xml [Nokogiri::XML::Element]
+  # @param example_path [String] Directory path for fingerprint example files
   # @return [void]
-  def parse_examples(xml)
+  def parse_examples(xml, example_path)
     elements = xml.xpath('example')
 
     elements.each do |elem|
       # convert nokogiri Attributes into a hash of name => value
       attrs = elem.attributes.values.reduce({}) { |a,e| a.merge(e.name => e.value) }
-      @tests << Test.new(elem.content, attrs)
+      if attrs["_filename"]
+        contents = ""
+        filename = attrs["_filename"]
+        fn = File.expand_path(File.join(example_path, filename))
+        unless fn.start_with?(File.expand_path(example_path) + File::Separator)
+          raise FingerprintParseError.new("an example specifies an illegal file path '#{filename}'", line_number = @line)
+        end
+
+        File.open(fn, "rb") do |file|
+          contents = file.read
+          contents.force_encoding(Encoding::ASCII_8BIT)
+        end
+        @tests << Test.new(contents, attrs)
+      else
+        @tests << Test.new(elem.content, attrs)
+      end
     end
 
     nil

data/lib/recog/fingerprint_parse_error.rb

@@ -0,0 +1,10 @@
+module Recog
+  class FingerprintParseError < StandardError
+    attr_reader :line_number
+
+    def initialize(msg, line_number=nil)
+      @line_number = line_number
+      super(msg)
+    end
+  end
+end