Housekeeping / Fixup after recent merges (#340)

* Housekeeping * hw.device: file server -> NAS
rapid7 · Feb 4, 2021 · 0dd0b8c · 0dd0b8c
1 parent 3564c94
commit 0dd0b8c
Show file tree

Hide file tree

Showing 17 changed files with 131 additions and 46 deletions.
diff --git a/cpe-remap.yaml b/cpe-remap.yaml
@@ -13,6 +13,8 @@ mappings:
     vendor: aprelium
   alt-n:
     vendor: altn
+  aruba_networks:
+    vendor: arubanetworks
   bea:
     products:
       weblogic: weblogic_server
@@ -41,6 +43,8 @@ mappings:
   crushftp:
     products:
       crushftp_web_interface: crushftp
+  cumulus:
+    vendor: cumulusnetworks
   data_domain:
     vendor: dell
     products:
@@ -73,6 +77,8 @@ mappings:
       ibm_domino: lotus_domino
       os/400: os_400
       i5/os: i5os
+  ignite_realtime:
+    vendor: igniterealtime
   intel:
     products:
       intel(r)_active_management_technology: active_management_technology

diff --git a/identifiers/hw_device.txt b/identifiers/hw_device.txt
@@ -46,6 +46,7 @@ Power Relay
 Powerline
 Print Server
 Printer
+Relay Controller
 Router
 SD-WAN Appliance
 SIP Device

diff --git a/identifiers/hw_family.txt b/identifiers/hw_family.txt
@@ -5,6 +5,7 @@ AirPort
 Apple TV
 Communication Manager
 DVR
+Data ONTAP
 DiskStation
 Document Centre
 EDR
@@ -85,6 +86,7 @@ Turbo Station
 UNIVERGE
 UniFi
 Unified Security Gateway
+VDX
 VSX
 VoIP
 WD2GO

diff --git a/identifiers/hw_product.txt b/identifiers/hw_product.txt
@@ -36,6 +36,7 @@ Catalyst
 Catalyst 1900
 Celerra
 Chromecast
+ClearPass Policy Manager
 ClickShare
 CloudKey
 CommandPost
@@ -47,6 +48,7 @@ DCS-932
 DD OS
 DNA Center
 DSL Router
+Data ONTAP
 Digital Signage Player
 Discover
 Discovery
@@ -63,6 +65,7 @@ EchoLife Home Gateway
 EdgeSwitch
 Elevation
 EqualLogic
+Ethernet Relay Controller
 Ethernet Relay Module
 Excella
 Fastmark M5
@@ -115,6 +118,7 @@ JetDirect
 K1000
 KWS-1043N
 Key Management
+Key Management Server
 Lantick Ethernet Relay Controller
 Lencore Sound Manager 2
 MDS 9000
@@ -130,6 +134,7 @@ Mac mini (Late 2009)
 Mac mini (Late 2012)
 Mac mini (Late 2014)
 Mac mini (Late 2018)
+Mac mini (M1, 2020)
 Mac mini (Mid 2007)
 Mac mini (Mid 2010)
 Mac mini (Mid 2011)
@@ -147,16 +152,20 @@ MacBook Air (13-inch, Early 2014)
 MacBook Air (13-inch, Late 2010)
 MacBook Air (13-inch, Mid 2011)
 MacBook Air (13-inch, Mid 2012)
+MacBook Air (M1, 2020)
 MacBook Air (Mid 2009)
 MacBook Air (Retina, 13-inch, 2018)
 MacBook Air (Retina, 13-inch, 2019)
+MacBook Air (Retina, 13-inch, 2020)
 MacBook Pro (13-inch, 2016, Four Thunderbolt 3 ports)
 MacBook Pro (13-inch, 2016, Two Thunderbolt 3 ports)
 MacBook Pro (13-inch, 2017, Four Thunderbolt 3 ports)
 MacBook Pro (13-inch, 2017, Two Thunderbolt 3 ports)
 MacBook Pro (13-inch, 2018, Four Thunderbolt 3 ports)
 MacBook Pro (13-inch, 2019, Two Thunderbolt 3 ports)
+MacBook Pro (13-inch, 2020)
 MacBook Pro (13-inch, Late 2011)
+MacBook Pro (13-inch, M1, 2020)
 MacBook Pro (13-inch, Mid 2009)
 MacBook Pro (13-inch, Mid 2010)
 MacBook Pro (13-inch, Mid 2012)
@@ -168,6 +177,8 @@ MacBook Pro (15-inch, Late 2008)
 MacBook Pro (15-inch, Late 2011)
 MacBook Pro (15-inch, Mid 2009)
 MacBook Pro (15-inch, Mid 2010)
+MacBook Pro (15-inch, Mid 2012)
+MacBook Pro (16-inch, 2019)
 MacBook Pro (17-inch, Early 2008)
 MacBook Pro (17-inch, Late 2011)
 MacBook Pro (17-inch, Mid 2009)
@@ -179,11 +190,13 @@ MacBook Pro (Retina, 15-inch, Early 2013)
 MacBook Pro (Retina, 15-inch, Late 2013)
 MacBook Pro (Retina, 15-inch, Mid 2015)
 Makito X Decoder
+Media Gateway
 MediaLink Controller
 MediaSense
 Meeting Management
 Meeting Server
 MegaRAC
+Meraki Device
 Mercury
 Mergepoint
 Miniserver
@@ -195,6 +208,7 @@ NPort
 NetScreen
 NetVR
 Netbox
+Network Camera
 Network Gateway
 Network Node
 Nexus 1000V
@@ -207,6 +221,7 @@ OpenNAC
 Orbi micro
 Orbit IP Camera
 PDR M800
+PIAF Virtual Appliance
 PLAY
 PLC-5
 Paragon-100G
@@ -228,6 +243,7 @@ ReeCam
 Roku
 Room Alert
 S7 DALI Gateway
+SD-WAN
 SHIELD
 SIP Gateway
 SIParator Firewall
@@ -253,6 +269,7 @@ SolsticePod
 SoundPoint
 Spot
 Stealthwatch
+Steelhead
 Storage Appliance
 Sub
 Sunny WebBox
@@ -279,6 +296,7 @@ UniFi Security Gateway
 Univerge
 Universal Media Gateway
 VBrick Rev
+VPN Gateway
 Verizon FiOS Router
 Video Controller
 Vigor
@@ -307,6 +325,7 @@ iCOM Control Panel
 iDRAC
 iLO
 iLO 3
+iMac (20/24-inch, Early 2008)
 iMac (21.5-inch, 2017)
 iMac (21.5-inch, Late 2012)
 iMac (21.5-inch, Late 2013)
@@ -325,6 +344,7 @@ iMac (Retina 4K, 21.5-inch, 2019)
 iMac (Retina 4K, 21.5-inch, Late 2015)
 iMac (Retina 5K, 27-inch, 2017)
 iMac (Retina 5K, 27-inch, 2019)
+iMac (Retina 5K, 27-inch, 2020)
 iMac (Retina 5K, 27-inch, Late 2015)
 iMac (Retina 5K, 27-inch, Mid 2015)
 iMac Pro (Retina 5K, Late 2017)
@@ -336,14 +356,24 @@ iPad Air (3rd generation)
 iPad Air 2
 iPad Pro (10.5-inch)
 iPad Pro (11-inch)
+iPad Pro (11-inch, 2nd generation)
 iPad Pro (12.9-inch)
+iPad Pro (12.9-inch, 2nd generation)
+iPad Pro (12.9-inch, 3rd generation)
+iPad Pro (12.9-inch, 4th generation)
 iPad Pro (9.7-inch)
 iPad mini
 iPad mini (5th generation)
 iPad mini 2
 iPad mini 3
 iPad mini 4
 iPhone
+iPhone 11 Pro
+iPhone 11 Pro Max
+iPhone 12 5G
+iPhone 12 Mini 5G
+iPhone 12 Pro 5G
+iPhone 12 Pro Max 5G
 iPhone 3G
 iPhone 3GS
 iPhone 4
@@ -360,6 +390,7 @@ iPhone 7 Plus
 iPhone 8
 iPhone 8 Plus
 iPhone SE
+iPhone SE (2020)
 iPhone X
 iPhone XR
 iPhone XS

diff --git a/identifiers/os_family.txt b/identifiers/os_family.txt
@@ -123,6 +123,7 @@ Netopia
 NetportExpress
 Netscaler
 Network Printer
+NetworkOS
 OPTI-MX
 OS/400
 OfficeConnect

diff --git a/identifiers/os_product.txt b/identifiers/os_product.txt
@@ -47,6 +47,7 @@ Cobalt RaQ
 CommandPost
 Comware
 ConnectUPS
+Cumulus Linux
 D2D Backup System
 DCS-2100
 DD OS
@@ -208,6 +209,7 @@ Raptor
 RecoverPoint
 RedHat Enterprise AS
 RedHat Enterprise WS
+RiOS
 Router
 RouterOS
 SCM Manager module
@@ -317,6 +319,7 @@ XCC Linux
 XOS
 Zentyal
 Zone Director
+ZyNOS firmware
 audioOS
 e-STUDIO
 eCos

diff --git a/identifiers/service_family.txt b/identifiers/service_family.txt
@@ -140,6 +140,7 @@ OzymanDNS
 PBX
 PHP
 PWS
+Phabricator
 Pi-hole
 Post.Office
 Postfix
@@ -222,6 +223,7 @@ Wing FTP
 ZMailer
 Zope
 ZyWALL
+Zywall
 djbdns
 ePolicy Orchestrator
 emHTTPD

diff --git a/identifiers/service_product.txt b/identifiers/service_product.txt
@@ -41,6 +41,7 @@ Bigfoot Email Tools
 BlackJumboDog
 BladeSystems
 Boa
+Bugzilla
 CCProxy
 CMS
 CMS400.NET
@@ -59,13 +60,15 @@ CentOS Web Panel
 Cherokee
 CherryPy
 Chronograf
+ClearPass Policy Manager
 Cloud C2
 CloudFlare Load Balancer
 CloudFront Load Balancer
 Cobalt Strike Listener
 CockroachDB
 Code Review
 ColdFusion
+Collaboration Server
 Commerce Server
 Communication Broker
 Communigate Pro
@@ -93,11 +96,13 @@ Data Connection Directory
 Deploy
 Desktop
 Desktop Authority
+Desktop Central
 Device Manager
 Director
 Directory Server
 Dnsmasq
 DocuWiki
+Dokuwiki
 Domain Time II
 Domino LDAP Server
 Dovecot
@@ -148,6 +153,7 @@ GitLab
 Gitea
 GlassFish Server
 GoAhead Webserver
+Gogs
 Google Front End
 Google Web Services
 Grafana
@@ -303,6 +309,7 @@ Open Directory
 Open Stack Platform Director
 OpenAdStream
 OpenEdge Explorer
+OpenFire
 OpenLDAP
 OpenManage
 OpenMediaVault
@@ -328,6 +335,7 @@ PWS
 Paramiko
 Percona Server
 Perl
+Phabricator
 Phusion Passenger
 Pi-hole
 Platform Services Controller
@@ -500,6 +508,7 @@ Xvnc
 ZMailer
 Zabbix
 Zimbra
+Zimbra Collaboration Suite
 Zing Vision
 Zope
 alphapd
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,6 +140,7 @@ OzymanDNS @@
     PBX
     PHP
     PWS
+    Phabricator
     Pi-hole
     Post.Office
     Postfix
@@ Expand Down Expand Up / @@ -222,6 +223,7 @@ Wing FTP @@
     ZMailer
     Zope
     ZyWALL
+    Zywall
     djbdns
     ePolicy Orchestrator
     emHTTPD
@@ Expand Down @@