recog 2.3.21 → 2.3.22

data/identifiers/hw_product.txt

@@ -15,6 +15,7 @@ Adaptive Security Appliance
 AirPort Express
 AirPort Extreme
 Alarm Panel
+AmpliFi
 AppDynamics
 Apple TV (2nd generation)
 Apple TV (3rd generation)
@@ -24,12 +25,15 @@ Apple TV 4K (2nd generation)
 Appliance
 ArchiveTeam Warrior
 Asset Management
+AutoDome
 AutoVu SharpV
+BlackBox
 BladeSystem Onboard Administrator
 Border GW
 Bridge
 CC EtherNet/IP
 CP
+CU360
 Camera
 Captive Portal
 CarDetector
@@ -40,6 +44,8 @@ Chromecast
 ClearPass Policy Manager
 ClickShare
 CloudKey
+Color Bulb
+CommServer
 CommandPost
 ConnectUPS Web Card
 Crosswork SON Appliance
@@ -49,12 +55,16 @@ DCS-932
 DD OS
 DNA Center
 DSL Router
+DX800A
 Data ONTAP
 Digital Signage Player
 Discover
 Discovery
+DocCam
 Document Centre
+Drone Detector
 DuraFon
+E5810 Gateway Device
 ECOM100
 EDR-G902
 EDR-G903
@@ -68,6 +78,7 @@ EdgeSwitch
 Elevation
 Email Security Gateway
 EqualLogic
+Eternus
 Ethernet Relay Controller
 Ethernet Relay Module
 Excella
@@ -93,10 +104,12 @@ HT812
 HT813
 HT814
 HT818
+Helium Miner
 HiPer Access Router Card
 Home Controller
 Home Gateway
 HomePod
+HomePod mini
 Hue
 HyperFlex Connect
 IA Appliance
@@ -110,6 +123,7 @@ IP2IR
 IPMI
 IVR
 Infinity Controler
+Instreamer
 IntelliSlot Web Card
 Internet Payment Gateway
 Internet Phone Adapter
@@ -120,8 +134,10 @@ J9155A
 JetDirect
 K1000
 KWS-1043N
+KX-NS1000
 Key Management
 Key Management Server
+LORIX ONE
 Lantick Ethernet Relay Controller
 Lencore Sound Manager 2
 MDS 9000
@@ -204,11 +220,13 @@ Mercury
 Mergepoint
 Miniserver
 My Book Live
+N1913A Power Meter
 N5172B Signal Generator
 NAM
 NAS4Free
 NFVIS
 NPort
+NR900
 NetScaler Gateway
 NetScaler SDX Gateway
 NetScreen
@@ -221,6 +239,7 @@ Network Node
 Network Security Appliance
 Nexus 1000V
 Nexus Player
+Novus UPS
 OfficeConnect Switch
 OnHub
 OpenManage
@@ -228,30 +247,37 @@ OpenManage Switch
 OpenNAC
 Orbi micro
 Orbit IP Camera
+PCoIP Endpoint Device
 PDR M800
 PIAF Virtual Appliance
 PLAY
 PLC-5
 Paragon-100G
 Photonic Switch
+Plug Outdoor
 PoliWall
+PowerLogic Power Meter
 PowerVault 124T
 Prime Collaboration Manager
 Primergy
 Printer
 Prosafe Plus
+Quad Plus Receiver
 R Series
 RT31P2
 RTU
 Rack PDU Card
+RadioLinx
 Raspberry Pi
 ReadyNAS
 RecoverPoint
 ReeCam
 Roku
 Room Alert
+Roomba
 S7 DALI Gateway
 SD-WAN
+SHDSL Router
 SHIELD
 SIP Gateway
 SIParator Firewall
@@ -274,6 +300,7 @@ Site Recovery Manager
 SmartEdge Sensor
 Softswitch
 SolsticePod
+SonicPoint
 SoundPoint
 Spot
 Stealthwatch
@@ -298,9 +325,12 @@ UCM6202
 UCM6204
 UCM6208
 UCS Manager
+UDS
+UPS
 USG20-VPN
 USG40
 USG60
+Ultra Door Controller
 UniFi Cloud Key
 UniFi NVR
 UniFi Security Gateway
@@ -320,6 +350,7 @@ WebBox
 Whiteboard
 Wireless Dock
 Wireless LAN Controller
+Wireless Radio
 Wireless Router
 XCC
 Xfinity Broadband Router
@@ -346,6 +377,7 @@ iMac (21.5-inch, Mid 2010)
 iMac (21.5-inch, Mid 2011)
 iMac (21.5-inch, Mid 2014)
 iMac (24-inch, Early 2009)
+iMac (24-inch, M1, 2021)
 iMac (27-inch, Late 2009)
 iMac (27-inch, Late 2012)
 iMac (27-inch, Late 2013)
@@ -363,12 +395,17 @@ iMac Pro (Retina 5K, Late 2017)
 iPad (4th generation)
 iPad (5th generation)
 iPad (6th generation)
+iPad (7th generation)
+iPad (8th generation)
+iPad (9th generation)
 iPad Air
 iPad Air (3rd generation)
+iPad Air (4th generation)
 iPad Air 2
 iPad Pro (10.5-inch)
 iPad Pro (11-inch)
 iPad Pro (11-inch, 2nd generation)
+iPad Pro (11-inch, 3rd generation)
 iPad Pro (12.9-inch)
 iPad Pro (12.9-inch, 2nd generation)
 iPad Pro (12.9-inch, 3rd generation)
@@ -376,16 +413,22 @@ iPad Pro (12.9-inch, 4th generation)
 iPad Pro (9.7-inch)
 iPad mini
 iPad mini (5th generation)
+iPad mini (6th generation)
 iPad mini 2
 iPad mini 3
 iPad mini 4
 iPhone
+iPhone 11
 iPhone 11 Pro
 iPhone 11 Pro Max
 iPhone 12 5G
 iPhone 12 Mini 5G
 iPhone 12 Pro 5G
 iPhone 12 Pro Max 5G
+iPhone 13
+iPhone 13 Pro
+iPhone 13 Pro Max
+iPhone 13 mini
 iPhone 3G
 iPhone 3GS
 iPhone 4
@@ -407,4 +450,12 @@ iPhone X
 iPhone XR
 iPhone XS
 iPhone XS Max
+iPod Touch (1st generation)
+iPod Touch (2nd generation)
+iPod Touch (3rd generation)
+iPod Touch (4th generation)
+iPod Touch (5th generation)
+iPod Touch (6th generation)
+iPod Touch (7th generation)
+iSTAR Ultra
 vManage

data/identifiers/os_family.txt

@@ -185,6 +185,7 @@ System Storage
 T3 Termination
 TASKalfa
 TDS750 Series
+Teradici
 Time Capsule
 TippingPoint
 Total Access

data/identifiers/os_product.txt

@@ -82,12 +82,15 @@ Fastmark M5
 FaxPress
 Fedora
 Fedora Core Linux
+Fermentrack
 Fiery Print Server
 Firepower
 Firewall-1
 Fireware
 FortiOS
 FreeBSD
+FreeNAS Firmware
+Freebox OS
 G2 Console Switch
 GAiA OS
 GXP1610 Firmware
@@ -122,6 +125,7 @@ JetDirect
 Junos OS
 Kamikaze
 KeeneticOS
+LORIX OS
 LX
 Linux
 Linux AMI
@@ -135,10 +139,12 @@ Mac OS
 Mac OS X
 Mac OS X Server
 Management Processor
+Media Server
 Meeting Management
 MegaRAC
 Mergepoint
 Meridian 1 Call Server
+Mongoose OS
 NAM
 NAS4Free
 NEO Tape Library
@@ -166,6 +172,7 @@ OSSIM
 OfficeConnect Cable Modem
 Onboard Administrator
 OneFS
+Onyx
 OpenBSD
 OpenMediaVault
 OpenServer
@@ -240,6 +247,7 @@ SuperStack 3
 SuperStack 3 Firewall
 SuperStack II
 SureStore Tape Library
+SwOS
 Switch
 TMS zl Module
 TRU64
@@ -262,6 +270,7 @@ USG40 firmware
 USG60 firmware
 Ubuntu Linux
 Ultrix
+Unified SIP Phone 3900 Firmware
 UnixWare
 VBrick Rev
 VIDOS-NVR
@@ -337,4 +346,5 @@ ipOS
 tvOS
 vManage
 vSphere Management Assistant
+webOS
 z/OS

data/identifiers/service_product.txt

@@ -10,6 +10,7 @@ AIOHTTP
 AOS
 APIC
 ARRIS
+ASDM
 ASM
 ASP.NET
 Abyss Web Server X1
@@ -139,6 +140,7 @@ Exchange 2003 Server
 Exchange 2007 Server
 Exchange Server
 Exchange Server 5.5
+Express WebTools
 Expressway
 FTGate
 FTP
@@ -160,6 +162,7 @@ Flyspray
 FortiVoice
 FortressSSH Server
 FreSSH
+FreeNAS
 FreeSWITCH
 Fusion Middleware
 GHost
@@ -329,7 +332,9 @@ Niagara AX
 Node
 Notebook
 Nucleus SNMP Agent
+Nuggets Learning Server
 Observium
+Office 365 Reporter
 OpManager
 Open Directory
 Open Stack Platform Director
@@ -388,6 +393,7 @@ RealServer
 RealVNC
 Recursor
 Red Hat Directory Server
+Redis Commander
 Redmine
 Reflection
 Reflection for Secure IT
@@ -471,6 +477,7 @@ Tengine
 TestCenter IQ
 Thin
 TigerVNC
+TinyGS
 Tinyproxy
 Tivoli Access Manager for e-business WebSEAL
 Tivoli Storage FlashCopy Manager
@@ -483,10 +490,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 +517,7 @@ VisionFS
 VxWorks CIFS
 WEBrick
 WHM
+WLED
 WS_FTP
 WU-FTPD
 WeOnlyDo SSH Server
@@ -728,6 +739,7 @@ mod_wsgi
 mod_xml2enc
 nginx
 noVNC
+ntopng
 ownCloud Server
 perl
 pfSense

data/identifiers/vendor.txt

@@ -1,3 +1,4 @@
+2N Telekomunikace
 3CX
 3Com
 8x8 Inc.
@@ -34,6 +35,7 @@ Aastra
 Accelerated Technology
 AdGuard
 Adaptec
+AdminDroid
 Adobe
 Adtran
 Aerohive
@@ -41,6 +43,7 @@ Agere Systems
 Agilent
 AirDefense
 AirMagnet
+Aircookie
 Airties
 Akamai
 Algo
@@ -48,6 +51,8 @@ AlienVault
 Allegro Software
 Allen-Bradley
 Allied Telesyn
+Allworx
+Alpha Technologies
 Alpha Telecom, Inc. U.S.A.
 Alpine
 Alt-N
@@ -58,6 +63,7 @@ AnyBus
 Apache
 Apple
 Aprelium Technologies
+Aptinex
 ArGoSoft
 Arachni
 Araknis Networks
@@ -93,14 +99,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 +123,7 @@ Buffalo
 C&D Technologies
 C-Phone Corporation
 CA
+CBT
 CDVI
 CSM
 Cabletron
@@ -163,6 +174,7 @@ Conectiva
 Conexant
 Congruency, Inc.
 ConnectWise
+Control Solutions
 Couchbase
 Cradlepoint
 Crestron
@@ -170,6 +182,7 @@ Critical Path
 CrushFTP
 CrystalVoice Communications
 Cumulus
+CyberPower
 Cyberoam
 D J Bernstein
 D-Link
@@ -227,6 +240,7 @@ EqualLogic
 Equivalence (OpenH323)
 Ericsson
 Eudora
+Evolis
 ExtraHop
 Extreme Networks
 Extron
@@ -237,6 +251,7 @@ Facebook
 FarSite Communications
 FatWire
 Fedora Project
+Ferner
 Ferrari Electronik GmbH
 Fidelis
 Fidelix
@@ -255,6 +270,8 @@ Foundry Networks
 FreeBSD
 FreePBX
 FreeSWITCH
+Freebox
+FreshTomato
 Fuji Xerox
 Fujitsu
 Fujitsu Siemens
@@ -272,12 +289,15 @@ Genivia
 Genscape
 Gentoo
 Gerrit
+GigaBlue
 Gigamon
+Gigaset
 GitHub
 GitLab
 Gitea
 Global Technology Associates
 GlobalScape
+GoGogate
 Gogs
 Google
 Gordano
@@ -361,6 +381,7 @@ Kyocera
 Kyocera Mita
 LANCOM Systems
 LANDesk
+LG
 LINX
 Labtam
 Lanier
@@ -376,11 +397,13 @@ Liebert
 Lifesize
 LigoWave
 Ligowave
+Lime Technologies
 Linksys
 Linux
 LiteSpeed Technologies
 LiveWorks Limited
 Logitech
+Lorex
 Lotus
 Loxone
 Lucent
@@ -406,6 +429,7 @@ Media5 Corporation
 MediaGate
 Mediatrix Telecom
 Merak
+Meraki
 Mercury Security
 Merit LILIN
 Mersive
@@ -442,6 +466,7 @@ NLnet Labs
 NTP
 NVIDIA
 Nagios
+Nanoleaf
 NcFTP Software
 Neoscale
 Nero
@@ -471,6 +496,7 @@ Nominum
 Nortel
 Norton
 Novell
+Nuuo
 OPNsense
 Objective Communications
 Observium
@@ -509,6 +535,7 @@ Panduit
 Paradyne
 Parallels
 Paramiko
+Patton
 Paul Smith Computer Services
 Pelco
 Percona
@@ -516,12 +543,14 @@ Perl
 Phacility
 Philips
 Philips Video Conferencing Systems
+Phoenix Contact
 Pi-hole
 PictureTel
 Plain Black
 Plex
 Plixer
 Polatis
+Poly
 Polycom
 Portainer
 Postfix
@@ -531,11 +560,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 +591,7 @@ RealVNC Ltd.
 Rectifier Technologies
 Red Hat
 Redback Networks
+Redline
 Redmine
 Rhino Software
 Ricoh
@@ -600,6 +632,7 @@ SapporoWorks
 Satelitech
 Savin
 Scalix
+Schneider Electric
 Schneider Rundfunkwerke AG
 Science Dynamics Corporation
 Science Logic
@@ -617,6 +650,7 @@ Serv-U
 ServerTech
 Sharp
 ShellInABox
+Shelly
 Shenzhen Reecam Tech. Ltd.
 ShoreTel
 Siebel
@@ -629,6 +663,7 @@ SmoothWall
 SnapServer
 Sofrel
 Softing
+Software House
 SolarWinds
 SonarQube
 SonicWall
@@ -641,6 +676,7 @@ Spiceworks
 Spirent Communications
 SpliceCom
 Splunk
+SpotterRF
 Squid Cache
 Standard Networks
 StarNet Communications Corp.
@@ -679,10 +715,12 @@ Tektronix
 Teldat H. Kruszynski, M. Cichocki Sp. J.
 TeleStream Technologies, Inc.
 TeleWare
+Teledyne FLIR
 Telliris
 Telxon Corporation
 Tenable
 Tencent
+Teradici
 Thekelleys
 Thomson
 TigerVNC
@@ -712,10 +750,14 @@ Ubiquiti
 Ubuntu
 UnboundID
 Unica
+Unify
 Unisys
 UnitedLinux
+VBrick
 VMware
 VTEL
+Vaddio
+Valcom
 VanDyke Software
 Vanguard Managed Solutions
 Varnish-cache
@@ -739,14 +781,17 @@ 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
@@ -781,7 +826,10 @@ exim
 gdnsd
 home.pl
 i.LON
+iRobot
+iStar
 iTach
+iXsystems
 innovaphone
 libssh
 lighttpd
@@ -790,6 +838,7 @@ mod_wsgi
 nginx
 ninenines
 noVNC
+ntop
 ownCloud
 pfSense
 port25

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