recog 2.3.19 → 2.3.20

data/identifiers/vendor.txt

@@ -1,3 +1,4 @@
+3CX
 3Com
 8x8 Inc.
 A.K.I Software
@@ -6,6 +7,7 @@ ACT Security
 ADB
 ADC
 ADTRAN
+AIOHTTP Project
 ALCATEL
 ALT
 ALU
@@ -91,6 +93,7 @@ BT
 Bandura Labs
 Bangteng
 Barco
+Barracuda
 Berkeley Software Design Inc.
 Bftpd Project
 Bigfoot
@@ -159,6 +162,7 @@ Compuware
 Conectiva
 Conexant
 Congruency, Inc.
+ConnectWise
 Couchbase
 Cradlepoint
 Crestron
@@ -215,7 +219,9 @@ Embedthis
 Emby
 Emerson
 Emulex
+Encode
 Enterasys
+Envoy Proxy
 Epson
 EqualLogic
 Equivalence (OpenH323)
@@ -240,6 +246,7 @@ Firefly
 Floosietek
 FlowPoint
 Flussonic
+Flyspray
 Folding@home
 Fortinet
 Foscam
@@ -326,6 +333,8 @@ Internet Archive
 Inveo
 Ipswitch
 Isilon
+Istio
+JFrog
 Jamf
 Jellyfin
 Jenkins
@@ -371,6 +380,7 @@ Linksys
 Linux
 LiteSpeed Technologies
 LiveWorks Limited
+Logitech
 Lotus
 Loxone
 Lucent
@@ -413,6 +423,7 @@ Mitel
 Mobatek
 Mobotix
 Mocana
+MoinMoin
 Moodle
 Mort Bay
 Motion Media Technology
@@ -453,6 +464,7 @@ Netwave
 Network Alchemy Limited
 Network Equipment Technologies
 Neustar
+Nextcloud
 Nokia
 Nokia-Siemens
 Nominum
@@ -461,6 +473,7 @@ Norton
 Novell
 OPNsense
 Objective Communications
+Observium
 Oce
 Octopus
 Oki
@@ -499,6 +512,7 @@ Paramiko
 Paul Smith Computer Services
 Pelco
 Percona
+Perl
 Phacility
 Philips
 Philips Video Conferencing Systems
@@ -578,6 +592,7 @@ SSH Communications Security
 STARFACE GmhH
 SUSE
 SafeNet
+Sage
 Samba
 Samsung
 Sangoma
@@ -611,6 +626,7 @@ Silver Peak
 Siqura
 Slackware
 SmoothWall
+SnapServer
 Sofrel
 Softing
 SolarWinds
@@ -654,6 +670,7 @@ TP-LINK
 TRENDnet
 TVersity
 TYPO3
+Tableau
 Tandberg
 Taobao
 Tasman Networks
@@ -680,6 +697,7 @@ Tokutek
 Tor Project
 TornadoWeb
 Toshiba
+Traefik Labs
 Treck
 Tridium
 Troy
@@ -710,6 +728,7 @@ VideoServer
 Vignette
 Vine
 Vircom
+Visuality Systems
 Vizio
 VocalTec Communications, Inc.
 Västgöta-Data AB
@@ -719,12 +738,14 @@ Washington University
 WatchGuard
 WeOnlyDo
 WebTrends
+Webmin
 Westbay Engineers
 Westell
 Western Digital
 White Box
 Wildix
 Wind River
+Wowza
 Wowza Media Systems
 X.Org
 XAMPP
@@ -755,6 +776,7 @@ cPanel
 cz.nic
 enGenius
 estos
+etherpad
 exim
 gdnsd
 home.pl
@@ -766,11 +788,11 @@ lighttpd
 mod_ssl
 mod_wsgi
 nginx
+ninenines
 noVNC
 ownCloud
 pfSense
 port25
-proxmox
 qmail
 rPath
 vsFTPd Project

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '2.3.19'
+  VERSION = '2.3.20'
 end

data/requirements.txt

@@ -1,2 +1,2 @@
-lxml==4.6.2
+lxml==4.6.3
 pyyaml

data/update_cpes.py

@@ -16,8 +16,17 @@ def parse_cpe_vp_map(file):
     parser = etree.XMLParser(remove_comments=False)
     doc = etree.parse(file, parser)
     namespaces = {'ns': 'http://cpe.mitre.org/dictionary/2.0', 'meta': 'http://scap.nist.gov/schema/cpe-dictionary-metadata/0.2'}
-    for cpe_name in doc.xpath("//ns:cpe-list/ns:cpe-item/@name", namespaces=namespaces):
+    for entry in doc.xpath("//ns:cpe-list/ns:cpe-item", namespaces=namespaces):
+        cpe_name = entry.get("name")
+        if not cpe_name:
+            continue
+
+        # If the entry is deprecated then don't add it to our list of valid CPEs.
+        if entry.get("deprecated"):
+            continue
+
         cpe_match = re.match('^cpe:/([aho]):([^:]+):([^:]+)', cpe_name)
+
         if cpe_match:
             cpe_type, vendor, product = cpe_match.group(1, 2, 3)
             if cpe_type not in vp_map:
@@ -86,7 +95,11 @@ def lookup_cpe(vendor, product, cpe_type, cpe_table, remap):
 
     # Everything else depends on a remap of some sort.
     # get the remappings for this one vendor string.
-    vendor_remap = remap.get(vendor, None)
+    vendor_remap = None
+
+    remap_type = remap.get(cpe_type, None)
+    if remap_type:
+        vendor_remap = remap_type.get(vendor, None)
 
     if vendor_remap:
         # If we have product remappings, work that angle next

data/xml/apache_modules.xml

@@ -220,6 +220,36 @@
     <param pos="0" name="service.component.product" value="mod_auth_ldap"/>
   </fingerprint>
 
+  <fingerprint pattern="mod_auth_oracle/(\S+)$">
+    <description>mod_auth_oracle with version</description>
+    <example service.component.version="1.2.3">mod_auth_oracle/1.2.3</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_auth_oracle"/>
+    <param pos="1" name="service.component.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_auth_oracle/?$">
+    <description>mod_auth_oracle without version</description>
+    <example>mod_auth_oracle/</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_auth_oracle"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_auth_pgsql/(\S+)$">
+    <description>mod_auth_pgsql with version</description>
+    <example service.component.version="1.2.3">mod_auth_pgsql/1.2.3</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_auth_pgsql"/>
+    <param pos="1" name="service.component.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_auth_pgsql/?$">
+    <description>mod_auth_pgsql without version</description>
+    <example>mod_auth_pgsql/</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_auth_pgsql"/>
+  </fingerprint>
+
   <fingerprint pattern="mod_auth_radius/(\S+)$">
     <description>mod_auth_radius with version</description>
     <example service.component.version="1.2.3">mod_auth_radius/1.2.3</example>
@@ -978,6 +1008,36 @@
     <param pos="0" name="service.component.product" value="mod_filter"/>
   </fingerprint>
 
+  <fingerprint pattern="mod_frontpage/(\S+)$">
+    <description>mod_frontpage with version</description>
+    <example service.component.version="1.2.3">mod_frontpage/1.2.3</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_frontpage"/>
+    <param pos="1" name="service.component.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_frontpage/?$">
+    <description>mod_frontpage without version</description>
+    <example>mod_frontpage/</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_frontpage"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_gzip/(\S+)$">
+    <description>mod_gzip with version</description>
+    <example service.component.version="1.2.3">mod_gzip/1.2.3</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_gzip"/>
+    <param pos="1" name="service.component.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="mod_gzip/?$">
+    <description>mod_gzip without version</description>
+    <example>mod_gzip/</example>
+    <param pos="0" name="service.component.vendor" value="Apache"/>
+    <param pos="0" name="service.component.product" value="mod_gzip"/>
+  </fingerprint>
+
   <fingerprint pattern="mod_headers/(\S+)$">
     <description>mod_headers with version</description>
     <example service.component.version="1.2.3">mod_headers/1.2.3</example>

data/xml/dns_versionbind.xml

@@ -427,7 +427,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:powerdns:authoritative_server:{service.version}"/>
   </fingerprint>
 
-  <fingerprint pattern="^PowerDNS Authoritative Server (\d\.[\w.]+(?:-rc\d)?(?:-alpha\d)?(?:-beta\d)?[^ ]*) \(built [\w\s:]+ by [\w]+\@[\w.-:-]*\)$">
+  <fingerprint pattern="^PowerDNS Authoritative Server (\d\.[\w.]+(?:-rc\d)?(?:-alpha\d)?(?:-beta\d)?[^ ]*) \(built [\w\s:]+ by [\w]+\@[\w.:-]*\)$">
     <description>PowerDNS Authoritative Server: format 2</description>
     <example service.version="4.0.4">PowerDNS Authoritative Server 4.0.4 (built Jul 26 2017 15:04:27 by root@FreeBSD:11:amd64-default-job-03)</example>
     <example service.version="4.0.0-rc2">PowerDNS Authoritative Server 4.0.0-rc2 (built Jul  4 2016 15:44:39 by root@foo-bar.baz)</example>

data/xml/favicons.xml

@@ -149,6 +149,7 @@
     <param pos="0" name="service.vendor" value="RStudio"/>
     <param pos="0" name="service.product" value="Connect"/>
     <param pos="0" name="service.certainty" value="0.5"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:rstudio:connect:-"/>
   </fingerprint>
 
   <fingerprint pattern="^84b0fc44f58bfee1a303ee3398a86670$">
@@ -236,6 +237,7 @@
     <param pos="0" name="service.vendor" value="ManageEngine"/>
     <param pos="0" name="service.product" value="ADAudit Plus"/>
     <param pos="0" name="service.certainty" value="0.5"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:zohocorp:manageengine_adaudit_plus:-"/>
   </fingerprint>
 
   <fingerprint pattern="^e9d6d23a961ea23a3e961266876e0ffd$">
@@ -1064,7 +1066,9 @@
     <param pos="0" name="os.vendor" value="SonicWall"/>
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.family" value="SonicOS"/>
+    <param pos="0" name="os.product" value="SonicOS"/>
     <param pos="0" name="os.certainty" value="0.5"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
   </fingerprint>
 
   <fingerprint pattern="^e4fd990b4b8a5d61bd5ddb98cdfc7190$">
@@ -1186,7 +1190,7 @@
     <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:-"/>
+    <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"/>
@@ -1370,6 +1374,7 @@
     <param pos="0" name="os.device" value="Network Management Device"/>
     <param pos="0" name="os.product" value="NetScaler"/>
     <param pos="0" name="os.certainty" value="0.5"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_firmware:-"/>
     <param pos="0" name="service.vendor" value="Citrix"/>
     <param pos="0" name="service.family" value="NetScaler"/>
     <param pos="0" name="service.device" value="Network Management Device"/>
@@ -1386,6 +1391,7 @@
     <param pos="0" name="os.device" value="Network Management Device"/>
     <param pos="0" name="os.product" value="NetScaler Gateway"/>
     <param pos="0" name="os.certainty" value="0.5"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_gateway_firmware:-"/>
     <param pos="0" name="service.vendor" value="Citrix"/>
     <param pos="0" name="service.family" value="NetScaler"/>
     <param pos="0" name="service.device" value="Network Management Device"/>
@@ -1472,9 +1478,11 @@
     <param pos="0" name="hw.device" value="Firewall"/>
     <param pos="0" name="hw.certainty" value="0.5"/>
     <param pos="0" name="os.vendor" value="Palo Alto Networks"/>
-    <param pos="0" name="os.product" value="PANOS"/>
+    <param pos="0" name="os.product" value="PAN-OS"/>
+    <param pos="0" name="os.family" value="PAN-OS"/>
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.certainty" value="0.5"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:paloaltonetworks:pan-os:-"/>
   </fingerprint>
 
   <fingerprint pattern="^efe29d50711d9b093d8187e97cc0e593$">
@@ -1576,6 +1584,7 @@
     <param pos="0" name="os.family" value="iLO"/>
     <param pos="0" name="os.product" value="iLO 3"/>
     <param pos="0" name="os.certainty" value="0.5"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_3_firmware:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:ad93b3973782b03ea62a43bd6602ba8b|d521487f45fa7657450edfd6c16e4a63)$">
@@ -1586,12 +1595,13 @@
     <param pos="0" name="hw.vendor" value="HP"/>
     <param pos="0" name="hw.product" value="iLO"/>
     <param pos="0" name="hw.certainty" value="0.5"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights_out:-"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights-out:-"/>
     <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"/>
     <param pos="0" name="os.product" value="iLO"/>
     <param pos="0" name="os.certainty" value="0.5"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_firmware:-"/>
   </fingerprint>
 
   <fingerprint pattern="^d11917dc7e651b21f0f75cd0dc309e8a$">

data/xml/ftp_banners.xml

@@ -404,8 +404,6 @@ more text</example>
     <param pos="0" name="service.cpe23" value="cpe:/a:pureftpd:pure-ftpd:{service.version}"/>
   </fingerprint>
 
-  <!-- CPEs for Serv-U 15.x and above changed to SolarWinds -->
-
   <fingerprint pattern="^Serv-U FTP Server v(15\.\S+) ready\.\.\.$">
     <description>SolarWinds Serv-U with version </description>
     <example service.version="15.1.3.25">Serv-U FTP Server v15.1.3.25 ready...</example>
@@ -421,10 +419,10 @@ more text</example>
     <example service.version="2.5n">Serv-U FTP-Server v2.5n for WinSock ready...</example>
     <example service.version="6.0">Serv-U FTP Server v6.0 for WinSock ready</example>
     <param pos="0" name="service.vendor" value="Serv-U"/>
-    <param pos="0" name="service.product" value="Serv-U"/>
+    <param pos="0" name="service.product" value="Serv-U FTP Server"/>
     <param pos="0" name="service.family" value="Serv-U"/>
     <param pos="1" name="service.version"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:serv-u:serv-u:{service.version}"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:serv-u_ftp_server:{service.version}"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows"/>
@@ -436,10 +434,10 @@ more text</example>
     <example service.version="7.2">Serv-U FTP Server v7.2 ready...</example>
     <example service.version="14.0">Serv-U FTP Server v14.0 ready...</example>
     <param pos="0" name="service.vendor" value="Serv-U"/>
-    <param pos="0" name="service.product" value="Serv-U"/>
+    <param pos="0" name="service.product" value="Serv-U FTP Server"/>
     <param pos="0" name="service.family" value="Serv-U"/>
     <param pos="1" name="service.version"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:serv-u:serv-u:{service.version}"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:serv-u_ftp_server:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Welcom to Serv-U FTP Server$">

data/xml/html_title.xml

@@ -7,6 +7,11 @@
     <example>301 Moved Permanently</example>
   </fingerprint>
 
+  <fingerprint pattern="^302 Found$">
+    <description>302 Found - generic -- assert nothing.</description>
+    <example>302 Found</example>
+  </fingerprint>
+
   <fingerprint pattern="^400 Bad Request$">
     <description>400 Bad Request - generic -- assert nothing.</description>
     <example>400 Bad Request</example>
@@ -17,9 +22,38 @@
     <example>401 Unauthorized</example>
   </fingerprint>
 
-  <fingerprint pattern="^404 Not Found$">
+  <fingerprint pattern="^403 Forbidden$">
+    <description>403 Forbidden - generic -- assert nothing.</description>
+    <example>403 Forbidden</example>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:404 )?Not Found$">
     <description>404 Not Found - generic -- assert nothing.</description>
     <example>404 Not Found</example>
+    <example>Not Found</example>
+  </fingerprint>
+
+  <fingerprint pattern="^Invalid URL$">
+    <description>Invalid URL - generic -- assert nothing.</description>
+    <example>Invalid URL</example>
+  </fingerprint>
+
+  <fingerprint pattern="^ERROR: The request could not be satisfied$">
+    <description>Amazon CloudFront web load balancer endpoint</description>
+    <example>ERROR: The request could not be satisfied</example>
+    <param pos="0" name="service.vendor" value="Amazon"/>
+    <param pos="0" name="service.family" value="CloudFront"/>
+    <param pos="0" name="service.product" value="CloudFront Load Balancer"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:amazon:amazon_cloudfront:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Microsoft Azure Web App - Error 404$">
+    <description>Microsoft Azure Web App - Error 404</description>
+    <example>Microsoft Azure Web App - Error 404</example>
+    <param pos="0" name="service.vendor" value="Microsoft"/>
+    <param pos="0" name="service.family" value="Azure"/>
+    <param pos="0" name="service.product" value="Azure App Service on Azure Stack"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:azure_app_service_on_azure_stack:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Index of /">
@@ -103,14 +137,41 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^Apache Tomcat/(\S+)$">
+  <fingerprint pattern="^Apache Tomcat/(\S+)(?: - Error report)?$">
     <description>Apache tomcat with minimal version information</description>
     <example service.version="8.0.32">Apache Tomcat/8.0.32</example>
+    <example service.version="5.5.29">Apache Tomcat/5.5.29 - Error report</example>
+    <param pos="0" name="service.vendor" value="Apache"/>
+    <param pos="0" name="service.product" value="Tomcat"/>
+    <param pos="0" name="service.family" value="Tomcat"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Apache Tomcat/(\S+) \(Ubuntu\) - Error report$">
+    <description>Apache Tomcat - Error report on Ubuntu</description>
+    <example service.version="8.0.32">Apache Tomcat/8.0.32 (Ubuntu) - Error report</example>
+    <param pos="0" name="service.vendor" value="Apache"/>
+    <param pos="0" name="service.product" value="Tomcat"/>
+    <param pos="0" name="service.family" value="Tomcat"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Ubuntu"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Apache Tomcat/(\S+) \(Debian\) - Error report$">
+    <description>Apache Tomcat - Error report on Debian</description>
+    <example service.version="7.0.56">Apache Tomcat/7.0.56 (Debian) - Error report</example>
     <param pos="0" name="service.vendor" value="Apache"/>
     <param pos="0" name="service.product" value="Tomcat"/>
     <param pos="0" name="service.family" value="Tomcat"/>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
 
   <fingerprint pattern="^AiCloud">
@@ -302,6 +363,14 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:parallels:parallels_plesk_panel:-"/>
   </fingerprint>
 
+  <fingerprint pattern="^Sage X3$">
+    <description>Sage X3 Syracuse Web Server</description>
+    <example>Sage X3</example>
+    <param pos="0" name="service.vendor" value="Sage"/>
+    <param pos="0" name="service.family" value="Sage X3 Syracuse Web Server"/>
+    <param pos="0" name="service.product" value="Sage X3 Syracuse Web Server"/>
+  </fingerprint>
+
   <fingerprint pattern="^Web Viewer for Samsung DVR$">
     <description>Samsung DVRs</description>
     <example>Web Viewer for Samsung DVR</example>
@@ -315,6 +384,32 @@
     <param pos="0" name="os.vendor" value="SonicWall"/>
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.family" value="SonicOS"/>
+    <param pos="0" name="os.product" value="SonicOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^SonicWall Universal Management Suite v(\d+\.\d+)$">
+    <description>SonicWall Universal Management Appliance - with version</description>
+    <example service.version="8.7">SonicWall Universal Management Suite v8.7</example>
+    <param pos="0" name="service.vendor" value="SonicWall"/>
+    <param pos="0" name="service.product" value="Universal Management Appliance"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:sonicwall:universal_management_appliance:{service.version}"/>
+    <param pos="0" name="os.vendor" value="SonicWall"/>
+    <param pos="0" name="os.family" value="SonicOS"/>
+    <param pos="0" name="os.product" value="SonicOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Fireware XTM User Authentication$">
+    <description>WatchGuard Fireware XTM login page</description>
+    <example>Fireware XTM User Authentication</example>
+    <param pos="0" name="service.vendor" value="WatchGuard"/>
+    <param pos="0" name="service.product" value="Fireware XTM"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:watchguard:fireware_xtm:-"/>
+    <param pos="0" name="os.vendor" value="WatchGuard"/>
+    <param pos="0" name="os.product" value="Fireware"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:watchguard:fireware:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(.*).nbsp;-.nbsp;Synology.nbsp;DiskStation$">
@@ -335,6 +430,10 @@
     <description>Synology with WebStation web hosting</description>
     <example>Hello! Welcome to Synology Web Station!</example>
     <example>Hallo! Herzlich Willkommen bei Synology Web Station!</example>
+    <param pos="0" name="service.vendor" value="Synology"/>
+    <param pos="0" name="service.family" value="Diskstation"/>
+    <param pos="0" name="service.product" value="Web Station"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:synology:web_station:-"/>
     <param pos="0" name="hw.vendor" value="Synology"/>
     <param pos="0" name="hw.family" value="DiskStation"/>
     <param pos="0" name="hw.device" value="NAS"/>
@@ -429,6 +528,50 @@
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
 
+  <!-- Various products by Zyxel -->
+
+  <fingerprint pattern="^USG60$">
+    <description>Zyxel USG60 Unified Security Gateway</description>
+    <example>USG60</example>
+    <param pos="0" name="os.vendor" value="Zyxel"/>
+    <param pos="0" name="os.product" value="USG60 firmware"/>
+    <param pos="0" name="os.device" value="Firewall"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:zyxel:usg60_firmware:-"/>
+    <param pos="0" name="hw.vendor" value="Zyxel"/>
+    <param pos="0" name="hw.family" value="Unified Security Gateway"/>
+    <param pos="0" name="hw.product" value="USG60"/>
+    <param pos="0" name="hw.device" value="Firewall"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:zyxel:usg60:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^USG40$">
+    <description>Zyxel USG40 Unified Security Gateway</description>
+    <example>USG40</example>
+    <param pos="0" name="os.vendor" value="Zyxel"/>
+    <param pos="0" name="os.product" value="USG40 firmware"/>
+    <param pos="0" name="os.device" value="Firewall"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:zyxel:usg40_firmware:-"/>
+    <param pos="0" name="hw.vendor" value="Zyxel"/>
+    <param pos="0" name="hw.family" value="Unified Security Gateway"/>
+    <param pos="0" name="hw.product" value="USG40"/>
+    <param pos="0" name="hw.device" value="Firewall"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:zyxel:usg40:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^USG20-VPN$">
+    <description>Zyxel USG20-VPN Unified Security Gateway</description>
+    <example>USG20-VPN</example>
+    <param pos="0" name="os.vendor" value="Zyxel"/>
+    <param pos="0" name="os.product" value="USG20-VPN firmware"/>
+    <param pos="0" name="os.device" value="Firewall"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:zyxel:usg20-vpn_firmware:-"/>
+    <param pos="0" name="hw.vendor" value="Zyxel"/>
+    <param pos="0" name="hw.family" value="Unified Security Gateway"/>
+    <param pos="0" name="hw.product" value="USG20-VPN"/>
+    <param pos="0" name="hw.device" value="Firewall"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:zyxel:usg20-vpn:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^RomPager Embedded Web Server Toolkit$">
     <description>Embedded HTTP server used by many vendors and device
       types, including APC, 3Com, Andover Controls, Cisco VoIP, D-Link,
@@ -440,6 +583,18 @@
     <param pos="0" name="service.product" value="RomPager"/>
   </fingerprint>
 
+  <fingerprint pattern="^Wowza Streaming Engine 4 (Subscription|Perpetual Pro) Edition (\d\.[\w.]+) build(\d+)$">
+    <description>Wowza Streaming Engine</description>
+    <example service.version="4.7.7.01" service.version.version="20190222144406">Wowza Streaming Engine 4 Subscription Edition 4.7.7.01 build20190222144406</example>
+    <example service.edition="Perpetual Pro">Wowza Streaming Engine 4 Perpetual Pro Edition 4.8.8.01 build20201216140014</example>
+    <param pos="0" name="service.vendor" value="Wowza"/>
+    <param pos="0" name="service.product" value="Streaming Engine"/>
+    <param pos="1" name="service.edition"/>
+    <param pos="2" name="service.version"/>
+    <param pos="3" name="service.version.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:wowza:streaming_engine:{service.version}"/>
+  </fingerprint>
+
   <fingerprint pattern="^RouterOS router configuration page$">
     <description>MikroTik RouterOS router configuration page</description>
     <example>RouterOS router configuration page</example>
@@ -535,6 +690,10 @@
   <fingerprint pattern="^Netgear Prosafe Plus Switch$">
     <description>Netgear Prosafe Plus Switch</description>
     <example>Netgear Prosafe Plus Switch</example>
+    <param pos="0" name="os.vendor" value="Netgear"/>
+    <param pos="0" name="os.device" value="Switch"/>
+    <param pos="0" name="os.product" value="Prosafe Firmware"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:netgear:prosafe_firmware:-"/>
     <param pos="0" name="hw.vendor" value="Netgear"/>
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="0" name="hw.product" value="Prosafe Plus"/>
@@ -807,11 +966,12 @@
     <param pos="0" name="hw.device" value="Lights Out Management"/>
     <param pos="0" name="hw.vendor" value="HP"/>
     <param pos="0" name="hw.product" value="iLO"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights_out:-"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights-out:-"/>
     <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"/>
     <param pos="0" name="os.product" value="iLO"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_firmware:-"/>
   </fingerprint>
 
   <fingerprint pattern="^HP Integrated Lights-Out 2$">
@@ -820,24 +980,38 @@
     <param pos="0" name="hw.device" value="Lights Out Management"/>
     <param pos="0" name="hw.vendor" value="HP"/>
     <param pos="0" name="hw.product" value="iLO"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights_out:-"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights-out:-"/>
     <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"/>
     <param pos="0" name="os.product" value="iLO 2"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_2_firmware:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^(iLO \d+)$">
-    <description>HP Integrated Lights-Out 3+</description>
-    <example hw.product="iLO 3" os.product="iLO 3">iLO 3</example>
-    <example hw.product="iLO 4" os.product="iLO 4">iLO 4</example>
+  <fingerprint pattern="^iLO 3$">
+    <description>HP Integrated Lights-Out 3</description>
+    <example>iLO 3</example>
     <param pos="0" name="hw.device" value="Lights Out Management"/>
     <param pos="0" name="hw.vendor" value="HP"/>
-    <param pos="1" name="hw.product"/>
+    <param pos="0" name="hw.product" value="iLO 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"/>
-    <param pos="1" name="os.product"/>
+    <param pos="0" name="os.product" value="iLO 3"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_3_firmware:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^iLO 4$">
+    <description>HP Integrated Lights-Out 4</description>
+    <example>iLO 4</example>
+    <param pos="0" name="hw.device" value="Lights Out Management"/>
+    <param pos="0" name="hw.vendor" value="HP"/>
+    <param pos="0" name="hw.product" value="iLO 4"/>
+    <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"/>
+    <param pos="0" name="os.product" value="iLO 4"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_4_firmware:-"/>
   </fingerprint>
 
   <fingerprint pattern="^HPE SimpliVity OmniStack$">
@@ -993,6 +1167,14 @@
     <param pos="0" name="hw.device" value="VoIP"/>
   </fingerprint>
 
+  <fingerprint pattern="^3CX Phone System Management Console$">
+    <description>3CX Phone System Management Console</description>
+    <example>3CX Phone System Management Console</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="^(SPA\S+) Configuration Utility$">
     <description>Cisco IP Phone - SPA504G Configuration Utility</description>
     <example hw.product="SPA504G">SPA504G Configuration Utility</example>
@@ -1057,7 +1239,6 @@
     <param pos="0" name="os.device" value="Switch"/>
     <param pos="0" name="os.product" value="MDS 9000"/>
     <param pos="1" name="os.version"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:mds_9000:{os.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Stealthwatch Management Console$">
@@ -1111,7 +1292,7 @@
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.device" value="Wireless Controller"/>
     <param pos="0" name="os.product" value="Wireless LAN Controller"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:wireless_lan_controller:-"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:wireless_lan_controller_software:-"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.device" value="Wireless Controller"/>
     <param pos="0" name="hw.product" value="Wireless LAN Controller"/>
@@ -1428,7 +1609,26 @@
     <param pos="0" name="service.vendor" value="Citrix"/>
     <param pos="0" name="service.product" value="XenServer"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.device" value="Hypervisor"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:citrix:xenserver:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Citrix"/>
+    <param pos="0" name="os.product" value="XenServer"/>
+    <param pos="0" name="os.device" value="Hypervisor"/>
+    <param pos="0" name="hw.device" value="Hypervisor"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Welcome to Citrix Hypervisor ([0-9\.]+)$">
+    <description>XenServer - Hypervisor variant</description>
+    <example service.version="8.2.0">Welcome to Citrix Hypervisor 8.2.0</example>
+    <param pos="0" name="service.vendor" value="Citrix"/>
+    <param pos="0" name="service.product" value="XenServer"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.device" value="Hypervisor"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:citrix:xenserver:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Citrix"/>
+    <param pos="0" name="os.product" value="XenServer"/>
+    <param pos="0" name="os.device" value="Hypervisor"/>
+    <param pos="0" name="hw.device" value="Hypervisor"/>
   </fingerprint>
 
   <fingerprint pattern="^RabbitMQ Management$">
@@ -1510,10 +1710,11 @@
   </fingerprint>
 
   <fingerprint pattern="^Login - OpenStack Dashboard$">
-    <description>OpenStack Dashboard</description>
+    <description>OpenStack Horizon Dashboard</description>
     <example>Login - OpenStack Dashboard</example>
     <param pos="0" name="service.vendor" value="OpenStack"/>
-    <param pos="0" name="service.product" value="Dashboard"/>
+    <param pos="0" name="service.product" value="Horizon"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:openstack:horizon:-"/>
   </fingerprint>
 
   <fingerprint pattern="^splunkd$">
@@ -1547,6 +1748,34 @@
     <param pos="0" name="service.product" value="Site Recovery Manager"/>
   </fingerprint>
 
+  <fingerprint pattern="^&quot; \+ ID_VC_Welcome \+ &quot;$">
+    <description>VMware vCenter</description>
+    <example>" + ID_VC_Welcome + "</example>
+    <param pos="0" name="service.vendor" value="VMware"/>
+    <param pos="0" name="service.product" value="vCenter"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:vmware:vcenter_server:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^&quot; \+ ID_EESX_Welcome \+ &quot;$">
+    <description>VMware ESXi</description>
+    <example>" + ID_EESX_Welcome + "</example>
+    <param pos="0" name="service.vendor" value="VMware"/>
+    <param pos="0" name="os.vendor" value="VMware"/>
+    <param pos="0" name="os.family" value="VMware ESX/ESXi"/>
+    <param pos="0" name="os.product" value="VMware ESXi Server"/>
+    <param pos="0" name="os.device" value="Hypervisor"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:vmware:esxi:-"/>
+    <param pos="0" name="hw.device" value="Hypervisor"/>
+  </fingerprint>
+
+  <fingerprint pattern="^&quot; \+ ID_Converter_Welcome \+ &quot;$">
+    <description>VMware Converter</description>
+    <example>" + ID_Converter_Welcome + "</example>
+    <param pos="0" name="service.vendor" value="VMware"/>
+    <param pos="0" name="service.product" value="vCenter Converter"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:vmware:vcenter_converter:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^Graylog Web Interface$">
     <description>Graylog Web Interface</description>
     <example>Graylog Web Interface</example>
@@ -1602,7 +1831,7 @@
     <example>ManageEngine OpManager</example>
     <param pos="0" name="service.vendor" value="ManageEngine"/>
     <param pos="0" name="service.product" value="OpManager"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:manageengine:opmanager:-"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:zohocorp:manageengine_opmanager:-"/>
   </fingerprint>
 
   <fingerprint pattern="^ManageEngine Desktop Central 9$">
@@ -1618,6 +1847,7 @@
     <example>ManageEngine ADAudit Plus</example>
     <param pos="0" name="service.vendor" value="ManageEngine"/>
     <param pos="0" name="service.product" value="ADAudit Plus"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:zohocorp:manageengine_adaudit_plus:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(ScanFront \d.+)Web Menu$">
@@ -1676,11 +1906,17 @@
     <param pos="0" name="os.family" value="NetScaler"/>
     <param pos="0" name="os.device" value="Network Management Device"/>
     <param pos="0" name="os.product" value="NetScaler"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_firmware:-"/>
     <param pos="0" name="service.vendor" value="Citrix"/>
     <param pos="0" name="service.family" value="NetScaler"/>
     <param pos="0" name="service.device" value="Network Management Device"/>
     <param pos="0" name="service.product" value="NetScaler"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:citrix:netscaler:-"/>
+    <param pos="0" name="hw.vendor" value="Citrix"/>
+    <param pos="0" name="hw.family" value="NetScaler"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
+    <param pos="0" name="hw.product" value="NetScaler Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:citrix:netscaler_gateway:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Netscaler Gateway$">
@@ -1690,11 +1926,17 @@
     <param pos="0" name="os.family" value="NetScaler"/>
     <param pos="0" name="os.device" value="Network Management Device"/>
     <param pos="0" name="os.product" value="NetScaler Gateway"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_gateway_firmware:-"/>
     <param pos="0" name="service.vendor" value="Citrix"/>
     <param pos="0" name="service.family" value="NetScaler"/>
     <param pos="0" name="service.device" value="Network Management Device"/>
     <param pos="0" name="service.product" value="NetScaler Gateway"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:citrix:netscaler_gateway:-"/>
+    <param pos="0" name="hw.vendor" value="Citrix"/>
+    <param pos="0" name="hw.family" value="NetScaler"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
+    <param pos="0" name="hw.product" value="NetScaler Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:citrix:netscaler_gateway:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Citrix (?:NetScaler SDX|ADC SDX)$">
@@ -1709,6 +1951,11 @@
     <param pos="0" name="service.family" value="NetScaler"/>
     <param pos="0" name="service.device" value="Network Management Device"/>
     <param pos="0" name="service.product" value="NetScaler SDX Gateway"/>
+    <param pos="0" name="hw.vendor" value="Citrix"/>
+    <param pos="0" name="hw.family" value="NetScaler"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
+    <param pos="0" name="hw.product" value="NetScaler SDX Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:citrix:netscaler_sdx:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Citrix NetScaler Insight Center$">
@@ -1822,22 +2069,22 @@
 
   <fingerprint pattern="^AVTECH Software, Inc\. - Room Alert(?:&amp;reg;)?\s+([a-zA-Z0-9/]+) - Advanced">
     <description>AVTECH RoomAlert</description>
-    <example hw.product="Room Alert 11E" hw.product.model="11E">AVTECH Software, Inc. - Room Alert 11E - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
-    <example hw.product="Room Alert 32E/W" hw.product.model="32E/W">AVTECH Software, Inc. - Room Alert 32E/W - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
-    <example hw.product="Room Alert 32E/W" hw.product.model="32E/W">AVTECH Software, Inc. - Room Alert&amp;reg; 32E/W - Advanced Computer Room Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
+    <example hw.product="Room Alert 11E" hw.model="11E">AVTECH Software, Inc. - Room Alert 11E - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
+    <example hw.product="Room Alert 32E/W" hw.model="32E/W">AVTECH Software, Inc. - Room Alert 32E/W - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
+    <example hw.product="Room Alert 32E/W" hw.model="32E/W">AVTECH Software, Inc. - Room Alert&amp;reg; 32E/W - Advanced Computer Room Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
     <param pos="0" name="hw.vendor" value="AVTECH"/>
     <param pos="0" name="hw.device" value="Monitoring"/>
-    <param pos="1" name="hw.product.model"/>
-    <param pos="0" name="hw.product" value="Room Alert {hw.product.model}"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="hw.product" value="Room Alert {hw.model}"/>
   </fingerprint>
 
   <fingerprint pattern="^AVTECH Software, Inc\. - TemPageR\s+([a-zA-Z0-9/]+) - Real-Time">
     <description>AVTECH TepPageR</description>
-    <example hw.product="TemPageR 3E" hw.product.model="3E">AVTECH Software, Inc. - TemPageR 3E - Real-Time Temperature Monitor For IT &amp;amp; Facilities Environment Monitoring</example>
+    <example hw.product="TemPageR 3E" hw.model="3E">AVTECH Software, Inc. - TemPageR 3E - Real-Time Temperature Monitor For IT &amp;amp; Facilities Environment Monitoring</example>
     <param pos="0" name="hw.vendor" value="AVTECH"/>
     <param pos="0" name="hw.device" value="Monitoring"/>
-    <param pos="1" name="hw.product.model"/>
-    <param pos="0" name="hw.product" value="TemPageR {hw.product.model}"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="0" name="hw.product" value="TemPageR {hw.model}"/>
   </fingerprint>
 
   <fingerprint pattern="^AppDynamics$">
@@ -2227,6 +2474,47 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
+  <fingerprint pattern="^Welcome to Oracle Fusion Middleware$">
+    <description>Oracle Fusion Middleware</description>
+    <example>Welcome to Oracle Fusion Middleware</example>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.product" value="Fusion Middleware"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:fusion_middleware:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Oracle Secure Global Desktop(?: Redirect Page)?$">
+    <description>Oracle Secure Global Desktop</description>
+    <example>Oracle Secure Global Desktop</example>
+    <example>Oracle Secure Global Desktop Redirect Page</example>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.product" value="Secure Global Desktop"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:secure_global_desktop:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^OTM - Oracle Transportation Management$">
+    <description>Oracle Transportation Management</description>
+    <example>OTM - Oracle Transportation Management</example>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.product" value="Transportation Management"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:transportation_management:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Bad Oracle Access Manager Request$">
+    <description>Oracle Access Manager - Bad Request</description>
+    <example>Bad Oracle Access Manager Request</example>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.product" value="Access Manager"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:access_manager:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Oracle Access Manager Operation Error$">
+    <description>Oracle Access Manager - Operation Error</description>
+    <example>Oracle Access Manager Operation Error</example>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.product" value="Access Manager"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:access_manager:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^(?:Oracle\(R\) )?Integrated Lights Out Manager$">
     <description>Oracle iLOM</description>
     <example>Oracle(R) Integrated Lights Out Manager</example>
@@ -2239,6 +2527,7 @@
     <param pos="0" name="os.vendor" value="Oracle"/>
     <param pos="0" name="os.family" value="ILOM"/>
     <param pos="0" name="os.product" value="ILOM"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:oracle:integrated_lights_out_manager_firmware:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Genetec - SHARPV\S+$">
@@ -2342,10 +2631,11 @@
   </fingerprint>
 
   <fingerprint pattern="^Gerrit Code Review$">
-    <description>Gerrit Code Review</description>
+    <description>Google's Gerrit Code Review</description>
     <example>Gerrit Code Review</example>
-    <param pos="0" name="service.vendor" value="Gerrit"/>
-    <param pos="0" name="service.product" value="Code Review"/>
+    <param pos="0" name="service.vendor" value="Google"/>
+    <param pos="0" name="service.product" value="Gerrit"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:google:gerrit:-"/>
   </fingerprint>
 
   <fingerprint pattern=" - Ignition Gateway$">
@@ -2595,9 +2885,10 @@
     <param pos="0" name="service.certainty" value="0.5"/>
   </fingerprint>
 
-  <fingerprint pattern="^ownCloud$">
+  <fingerprint pattern="^[oO]wn[cC]loud$">
     <description>ownCloud</description>
     <example>ownCloud</example>
+    <example>Owncloud</example>
     <param pos="0" name="service.vendor" value="ownCloud"/>
     <param pos="0" name="service.product" value="ownCloud Server"/>
     <param pos="0" name="service.certainty" value="0.5"/>
@@ -2624,6 +2915,7 @@
     <example>RStudio Sign In</example>
     <param pos="0" name="service.vendor" value="RStudio"/>
     <param pos="0" name="service.product" value="Connect"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:rstudio:connect:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:TurnKey Moodle|New Site)$">
@@ -2748,7 +3040,7 @@
     <param pos="0" name="hw.certainty" value="0.75"/>
     <param pos="0" name="os.vendor" value="Dell"/>
     <param pos="0" name="os.product" value="iDRAC Linux"/>
-    <param pos="0" name="os .certainty" value="0.75"/>
+    <param pos="0" name="os.certainty" value="0.75"/>
   </fingerprint>
 
   <fingerprint pattern="^Pulse Connect Secure - SSL">
@@ -2774,7 +3066,8 @@
     <description>Proxmox open-source virtualization platform</description>
     <example>proxmox - Proxmox Virtual Environment</example>
     <param pos="0" name="service.vendor" value="Proxmox"/>
-    <param pos="0" name="service.product" value="Proxmox"/>
+    <param pos="0" name="service.product" value="Virtual Environment"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:proxmox:virtual_environment:-"/>
     <param pos="0" name="os.vendor" value="Proxmox"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Proxmox"/>
@@ -2890,4 +3183,44 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:metabase:metabase:-"/>
   </fingerprint>
 
+  <fingerprint pattern="Nextcloud">
+    <description>Nextcloud</description>
+    <example>Nextcloud</example>
+    <param pos="0" name="service.vendor" value="Nextcloud"/>
+    <param pos="0" name="service.product" value="Nextcloud Server"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:nextcloud:nextcloud_server:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Observium">
+    <description>Observium</description>
+    <example>Observium :  - Test infra</example>
+    <param pos="0" name="service.vendor" value="Observium"/>
+    <param pos="0" name="service.product" value="Observium"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:observium:observium:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Login to Webmin$">
+    <description>Webmin</description>
+    <example>Login to Webmin</example>
+    <param pos="0" name="service.vendor" value="Webmin"/>
+    <param pos="0" name="service.product" value="Webmin"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:webmin:webmin:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Login to Usermin$">
+    <description>Usermin</description>
+    <example>Login to Usermin</example>
+    <param pos="0" name="service.vendor" value="Webmin"/>
+    <param pos="0" name="service.product" value="Usermin"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:webmin:usermin:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^MoinMoinWiki">
+    <description>Moinmoin wiki</description>
+    <example>MoinMoinWiki - MoinMoin</example>
+    <param pos="0" name="service.vendor" value="MoinMoin"/>
+    <param pos="0" name="service.product" value="MoinMoin"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:moinmo:moinmoin:-"/>
+  </fingerprint>
+
 </fingerprints>