recog 2.3.14 → 2.3.19

data/xml/ftp_banners.xml

@@ -360,10 +360,11 @@ example.com FTP server (Version:  Mac OS X Server) ready.</example>
     <example service.version="1.0.11">=(&lt;*&gt;)=-.:. (( Welcome to Pure-FTPd 1.0.11 )) .:.-=(&lt;*&gt;)=-</example>
     <example service.version="1.0.11">=(&lt;*&gt;)=-.:. (( Welcome to Pure-FTPd 1.0.11 )) .:.-=(&lt;*&gt;)=-&#13;
 more stuff</example>
-    <param pos="0" name="service.fvendor" value="PureFTPd"/>
+    <param pos="0" name="service.vendor" value="PureFTPd"/>
     <param pos="0" name="service.family" value="Pure-FTPd"/>
     <param pos="0" name="service.product" value="Pure-FTPd"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:pureftpd:pure-ftpd:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^-{9,10}(?:.*)\s+Pure-FTPd\s+(.*)-{9,10}">
@@ -522,9 +523,9 @@ more text</example>
     <param pos="0" name="service.vendor" value="APC"/>
     <param pos="0" name="service.product" value="FTP"/>
     <param pos="0" name="os.vendor" value="APC"/>
-    <param pos="0" name="os.device" value="Power device"/>
+    <param pos="0" name="os.device" value="Power Device"/>
     <param pos="0" name="hw.vendor" value="APC"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
   </fingerprint>
 
   <fingerprint pattern="^(\S+) Network Management Card AOS v(\d+\..+) FTP server ready\.$">
@@ -537,11 +538,11 @@ more text</example>
     <param pos="0" name="service.family" value="AOS"/>
     <param pos="2" name="service.version"/>
     <param pos="0" name="os.vendor" value="APC"/>
-    <param pos="0" name="os.device" value="Power device"/>
+    <param pos="0" name="os.device" value="Power Device"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
     <param pos="0" name="hw.vendor" value="APC"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
   </fingerprint>
 
   <fingerprint pattern="^(\S+) FTP server \(EMC-SNAS: ([^\)]+)\)(?: \S+)?$">
@@ -560,6 +561,7 @@ more text</example>
     <param pos="0" name="hw.vendor" value="EMC"/>
     <param pos="0" name="hw.device" value="Storage"/>
     <param pos="0" name="hw.product" value="Celerra"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:emc:celerra_network_attached_storage:-"/>
   </fingerprint>
 
   <fingerprint pattern="^JD FTP Server Ready.*$">
@@ -603,7 +605,7 @@ more text</example>
     <param pos="0" name="service.vendor" value="Blue Coat"/>
     <param pos="0" name="service.product" value="Proxy"/>
     <param pos="0" name="os.vendor" value="Blue Coat"/>
-    <param pos="0" name="os.device" value="Web proxy"/>
+    <param pos="0" name="os.device" value="Web Proxy"/>
   </fingerprint>
 
   <fingerprint pattern="^---freeFTPd 1.0---warFTPd 1.65---$">
@@ -634,7 +636,7 @@ more text</example>
     <param pos="0" name="os.vendor" value="IBM"/>
     <param pos="0" name="os.product" value="4690"/>
     <param pos="0" name="os.family" value="4690"/>
-    <param pos="0" name="os.device" value="Point of sale"/>
+    <param pos="0" name="os.device" value="Point of Sale"/>
   </fingerprint>
 
   <fingerprint pattern="^([^ ]+) NcFTPd Server \(licensed copy\) ready\.$">
@@ -651,7 +653,7 @@ more text</example>
     <example>hostname DCS-2100 FTP server ready.</example>
     <param pos="0" name="os.vendor" value="D-Link"/>
     <param pos="0" name="os.product" value="DCS-2100"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
 
@@ -682,12 +684,12 @@ more text</example>
     <example hw.product="233D" hw.version="4.48.4">AXIS 233D Network Dome Camera 4.48.4 (Mar 23 2010) ready.</example>
     <example hw.product="P1346" hw.version="5.50beta3">AXIS P1346 Network Camera 5.50beta3 (2014) ready</example>
     <param pos="0" name="hw.vendor" value="Axis"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="hw.version"/>
     <param pos="0" name="os.vendor" value="AXIS"/>
     <param pos="0" name="os.family" value="Linux"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="(?i)^AXIS (\S+) (?:(?:Mk II )?Video) (?:Encoder|Encoder Blade|Module|Server|Decoder) (\S+) .*">
@@ -732,7 +734,7 @@ more text</example>
     <example hw.product="560">AXIS 560 FTP Network Print Server V6.00 Jul 7 1999 ready.</example>
     <example hw.version="6.30.beta2">AXIS 5470e FTP Network Print Server V6.30.beta2 Sep 25 2002 ready.</example>
     <param pos="0" name="hw.vendor" value="Axis"/>
-    <param pos="0" name="hw.device" value="Print server"/>
+    <param pos="0" name="hw.device" value="Print Server"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="hw.version"/>
   </fingerprint>
@@ -986,7 +988,7 @@ more text</example>
     <example hw.product="10/100 +IPDS" os.version="1.0">LinkCom Xpress 10/100 +IPDS FTP version 1.0 ready</example>
     <param pos="0" name="hw.vendor" value="MPI Technologies"/>
     <param pos="0" name="hw.family" value="LinkCom Xpress"/>
-    <param pos="0" name="hw.device" value="Print server"/>
+    <param pos="0" name="hw.device" value="Print Server"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
@@ -996,7 +998,7 @@ more text</example>
     <example hw.product="EIO PRO 10">LinkCom Xpress EIO PRO 10</example>
     <param pos="0" name="hw.vendor" value="MPI Technologies"/>
     <param pos="0" name="hw.family" value="LinkCom Xpress"/>
-    <param pos="0" name="hw.device" value="Print server"/>
+    <param pos="0" name="hw.device" value="Print Server"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
@@ -1039,7 +1041,7 @@ more text</example>
     <example>EUFSALE MarkNet X2011e FTP Server 4.20.21 ready.</example>
     <param pos="0" name="os.vendor" value="Lexmark"/>
     <param pos="0" name="os.family" value="MarkNet"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
@@ -1189,11 +1191,11 @@ more text</example>
     <example>ESI-2999A Version 6.30a.07 ready.</example>
     <param pos="0" name="os.vendor" value="Sybase"/>
     <param pos="0" name="os.family" value="Extended Systems ExtendNet"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
     <param pos="0" name="hw.family" value="Extended Systems ExtendNet"/>
-    <param pos="0" name="hw.device" value="Print server"/>
+    <param pos="0" name="hw.device" value="Print Server"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
@@ -1233,7 +1235,7 @@ more text</example>
     <param pos="0" name="service.product" value="Fiery Print Server"/>
     <param pos="0" name="os.vendor" value="EFI"/>
     <param pos="0" name="os.product" value="Fiery Print Server"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
   </fingerprint>
 
   <!-- Conjectured based on known MX FTP fingerprints -->
@@ -1289,11 +1291,11 @@ more text</example>
     <example os.version="V56.17.5Z">ZBR-79071 Version V56.17.5Z ready.</example>
     <example os.version="7.02">ZBR-46687 Version 7.02 ready.</example>
     <param pos="0" name="os.vendor" value="ZebraNet"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
     <param pos="0" name="hw.vendor" value="ZebraNet"/>
-    <param pos="0" name="hw.device" value="Print server"/>
+    <param pos="0" name="hw.device" value="Print Server"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
 

data/xml/hp_pjl_id.xml

@@ -393,7 +393,7 @@
     <example>EX4112-4127</example>
     <param pos="0" name="os.vendor" value="Xerox"/>
     <param pos="0" name="os.family" value="EX"/>
-    <param pos="0" name="os.device" value="Print server"/>
+    <param pos="0" name="os.device" value="Print Server"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
 

data/xml/html_title.xml

@@ -255,6 +255,7 @@
     <param pos="0" name="hw.vendor" value="Philips"/>
     <param pos="0" name="hw.product" value="Hue"/>
     <param pos="0" name="hw.device" value="Light Bulb"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:philips:hue:-"/>
   </fingerprint>
 
   <fingerprint pattern="LANDesk\(R\) Management Agent$">
@@ -378,8 +379,10 @@
     <param pos="0" name="os.vendor" value="Ubiquiti"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="EdgeOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:ui:edgeos:-"/>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
     <param pos="0" name="hw.product" value="EdgeSwitch"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:ui:edgeswitch:-"/>
   </fingerprint>
 
   <fingerprint pattern="^EdgeOS$">
@@ -388,6 +391,7 @@
     <param pos="0" name="os.vendor" value="Ubiquiti"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="EdgeOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:ui:edgeos:-"/>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
   </fingerprint>
 
@@ -592,6 +596,14 @@
     <param pos="0" name="hw.product" value="Lantick Ethernet Relay Controller"/>
   </fingerprint>
 
+  <fingerprint pattern="^XYTRONIX Relay$">
+    <description>Xytronix Relay</description>
+    <example>XYTRONIX Relay</example>
+    <param pos="0" name="hw.vendor" value="Xytronix"/>
+    <param pos="0" name="hw.device" value="Relay Controller"/>
+    <param pos="0" name="hw.product" value="Ethernet Relay Controller"/>
+  </fingerprint>
+
   <fingerprint pattern="^(myUTN(?:-[a-zA-Z0-9]+)?) Control Center$">
     <description>myUTN Device Server</description>
     <example hw.product="myUTN-50a">myUTN-50a Control Center</example>
@@ -621,14 +633,14 @@
     <description>Eltek Power Controller</description>
     <example>WebPower</example>
     <param pos="0" name="hw.vendor" value="Eltek"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
   </fingerprint>
 
   <fingerprint pattern="(Expert Power Control NET \d+x\d+) - (.*)$">
     <description>Gude Expert Power Control</description>
     <example host.name="Rack42" hw.product="Expert Power Control NET 2x6">Expert Power Control NET 2x6 - Rack42</example>
     <param pos="0" name="hw.vendor" value="Gude"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="host.name"/>
   </fingerprint>
@@ -637,7 +649,7 @@
     <description>Sentry Switched CDU</description>
     <example>Sentry Switched CDU</example>
     <param pos="0" name="hw.vendor" value="ServerTech"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="0" name="hw.product" value="Sentry Switched CDU"/>
   </fingerprint>
 
@@ -645,7 +657,7 @@
     <description>Emerson Network Power Rack PDU Card</description>
     <example>Emerson Network Power Rack PDU Card</example>
     <param pos="0" name="hw.vendor" value="Emerson"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="0" name="hw.product" value="Rack PDU Card"/>
   </fingerprint>
 
@@ -656,7 +668,7 @@
     <example hw.vendor="Vertiv">Vertiv IntelliSlot Web Card</example>
     <example hw.vendor="Liebert">Liebert IntelliSlot Web Card</example>
     <param pos="1" name="hw.vendor"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="0" name="hw.product" value="IntelliSlot Web Card"/>
   </fingerprint>
 
@@ -664,7 +676,7 @@
     <description>ConnectUPS Web/SNMP Card</description>
     <example>ConnectUPS Web/SNMP Card</example>
     <param pos="0" name="hw.vendor" value="APC"/>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="0" name="hw.product" value="ConnectUPS Web Card"/>
   </fingerprint>
 
@@ -1001,7 +1013,7 @@
     <description>Cisco IP Camera</description>
     <example>Cisco IP Camera</example>
     <param pos="0" name="hw.vendor" value="Cisco"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="^Cisco TelePresence MCU">
@@ -1158,19 +1170,19 @@
     <description>Axis Communications Web Cam</description>
     <example>AXIS</example>
     <param pos="0" name="hw.vendor" value="AXIS"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="0" name="os.vendor" value="AXIS"/>
     <param pos="0" name="os.family" value="Linux"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="^Hanwha Techwin$">
     <description>Hanwha Techwin IP Camera</description>
     <example>Hanwha Techwin</example>
     <param pos="0" name="hw.vendor" value="Hanwha Techwin"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="0" name="os.vendor" value="Hanwha Techwin"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
 
@@ -1179,10 +1191,10 @@
     <example hw.product="WV-NS202A">WV-NS202A Network Camera</example>
     <example hw.product="WV-NS954">WV-NS954 Network Camera</example>
     <param pos="0" name="hw.vendor" value="Panasonic"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Panasonic"/>
-    <param pos="0" name="os.device" value="Web cam"/>
+    <param pos="0" name="os.device" value="IP Camera"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
 
@@ -1551,6 +1563,7 @@
     <example>Elastic Kibana</example>
     <param pos="0" name="service.vendor" value="Elastic"/>
     <param pos="0" name="service.product" value="Kibana"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:elastic:kibana:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Grafana$">
@@ -1592,6 +1605,14 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:manageengine:opmanager:-"/>
   </fingerprint>
 
+  <fingerprint pattern="^ManageEngine Desktop Central 9$">
+    <description>ManageEngine Desktop Central 9</description>
+    <example>ManageEngine Desktop Central 9</example>
+    <param pos="0" name="service.vendor" value="ManageEngine"/>
+    <param pos="0" name="service.product" value="Desktop Central"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:manageengine:desktop_central:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^ManageEngine ADAudit Plus$">
     <description>ManageEngineADAudit Plus</description>
     <example>ManageEngine ADAudit Plus</example>
@@ -1622,9 +1643,9 @@
   <fingerprint pattern="^Liebert OpenComms Network Interface Card$">
     <description>Liebert UPS</description>
     <example>Liebert OpenComms Network Interface Card</example>
-    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.device" value="Power Device"/>
     <param pos="0" name="hw.vendor" value="Liebert"/>
-    <param pos="0" name="os.device" value="Power device"/>
+    <param pos="0" name="os.device" value="Power Device"/>
     <param pos="0" name="os.vendor" value="Liebert"/>
   </fingerprint>
 
@@ -1673,6 +1694,7 @@
     <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:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Citrix (?:NetScaler SDX|ADC SDX)$">
@@ -2000,7 +2022,7 @@
     <description>Mobotix Network Camera</description>
     <example>Redirect to userimage: /control/userimage.html</example>
     <param pos="0" name="hw.vendor" value="Mobotix"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="0" name="hw.product" value="IP Camera"/>
   </fingerprint>
 
@@ -2059,6 +2081,7 @@
     <param pos="0" name="os.vendor" value="Data Domain"/>
     <param pos="0" name="os.product" value="DD OS"/>
     <param pos="0" name="os.device" value="Storage"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:dell:emc_data_domain_os:-"/>
     <param pos="0" name="hw.vendor" value="Data Domain"/>
     <param pos="0" name="hw.product" value="DD OS"/>
     <param pos="0" name="hw.device" value="Storage"/>
@@ -2176,6 +2199,14 @@
     <param pos="0" name="service.product" value="Kiwi Syslog"/>
   </fingerprint>
 
+  <fingerprint pattern="^SolarWinds Orion$">
+    <description>SolarWinds Orion</description>
+    <example>SolarWinds Orion</example>
+    <param pos="0" name="service.vendor" value="SolarWinds"/>
+    <param pos="0" name="service.product" value="Orion Platform"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:orion_platform:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^ClickShare Configurator$">
     <description>ClickShare Wireless Presenter</description>
     <example>ClickShare Configurator</example>
@@ -2192,7 +2223,7 @@
     <example hw.product="IQA22N">IQA22N IQEYE1A1613: Live Images</example>
     <example hw.product="IQeye703">IQeye703 IQEYE011750: Live Images</example>
     <param pos="0" name="hw.vendor" value="IQinVision"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
@@ -2214,7 +2245,7 @@
     <description>Genetec AutoVu SharpV ALPR Camera</description>
     <example>Genetec - SHARPV01111</example>
     <param pos="0" name="hw.vendor" value="Genetec"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="0" name="hw.product" value="AutoVu SharpV"/>
   </fingerprint>
 
@@ -2241,6 +2272,7 @@
     <example>TwonkyMedia server media browser</example>
     <param pos="0" name="service.vendor" value="Lynx Technology"/>
     <param pos="0" name="service.product" value="Twonky Media Server"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:lynxtechnology:twonky_server:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Spiceworks(?: Server Busy| Help Desk)?$">
@@ -2274,6 +2306,7 @@
     <example>SABnzbd - Log in</example>
     <param pos="0" name="service.vendor" value="SABnzbd"/>
     <param pos="0" name="service.product" value="SABnzbd"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:sabnzbd:sabnzbd:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Zabbix|.*: Zabbix)$">
@@ -2344,6 +2377,9 @@
     <description>OpenMediaVault</description>
     <example host.name="raspberrypi">openmediavault control panel - raspberrypi</example>
     <example host.name="raspberrypi">OpenMediaVault web administration interface - raspberrypi</example>
+    <param pos="0" name="service.vendor" value="OpenMediaVault"/>
+    <param pos="0" name="service.product" value="OpenMediaVault"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:openmediavault:openmediavault:-"/>
     <param pos="0" name="os.vendor" value="OpenMediaVault"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="OpenMediaVault"/>
@@ -2390,6 +2426,7 @@
     <param pos="0" name="service.vendor" value="CrushFTP"/>
     <param pos="0" name="service.product" value="CrushFTP Web Interface"/>
     <param pos="0" name="service.certainty" value="0.5"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:crushftp:crushftp:-"/>
   </fingerprint>
 
   <fingerprint pattern="^OpenEdge Explorer$">
@@ -2397,6 +2434,7 @@
     <example>OpenEdge Explorer</example>
     <param pos="0" name="service.vendor" value="Progress"/>
     <param pos="0" name="service.product" value="OpenEdge Explorer"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:progress:openedge:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Consul by HashiCorp$">
@@ -2442,7 +2480,8 @@
     <example>Swagger UI</example>
     <example>Swagger Editor</example>
     <param pos="0" name="service.vendor" value="Swagger"/>
-    <param pos="0" name="service.product" value="UI"/>
+    <param pos="0" name="service.product" value="Swagger UI"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:smartbear:swagger_ui:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Emby$">
@@ -2498,6 +2537,7 @@
     <example>SolarWinds Virtualization Manager</example>
     <param pos="0" name="service.vendor" value="SolarWinds"/>
     <param pos="0" name="service.product" value="Virtualization Manager"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:virtualization_manager:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Gitea: .*|LocalRepo|TurnKey Gitea)$">
@@ -2515,7 +2555,9 @@
     <description>Metasploit Pro (and Community Edition Web UI)</description>
     <example>Metasploit</example>
     <param pos="0" name="service.vendor" value="Rapid7"/>
-    <param pos="0" name="service.product" value="Metasploit Pro"/>
+    <param pos="0" name="service.product" value="Metasploit"/>
+    <param pos="0" name="service.edition" value="Pro"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:rapid7:metasploit:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Makito X Decoder$">
@@ -2559,6 +2601,7 @@
     <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"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:owncloud:owncloud:-"/>
   </fingerprint>
 
   <fingerprint pattern="^Octopus Deploy$">
@@ -2588,8 +2631,9 @@
     <example>TurnKey Moodle</example>
     <example>New Site</example>
     <param pos="0" name="service.vendor" value="Moodle"/>
-    <param pos="0" name="service.product" value="Moodle CMS"/>
+    <param pos="0" name="service.product" value="Moodle"/>
     <param pos="0" name="service.certainty" value="0.5"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:moodle:moodle:-"/>
   </fingerprint>
 
   <fingerprint pattern="^ArchiveTeam Warrior$">
@@ -2637,11 +2681,13 @@
     <param pos="0" name="service.product" value="Security Scanner"/>
   </fingerprint>
 
-  <fingerprint pattern="^Kodi$">
+  <fingerprint pattern="^(?:Chorus 2 - )?Kodi(?: web interface)?$">
     <description>Kodi Media Server</description>
     <example>Kodi</example>
+    <example>Chorus 2 - Kodi web interface</example>
     <param pos="0" name="service.vendor" value="Kodi"/>
     <param pos="0" name="service.product" value="Media Server"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:kodi:kodi:-"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Drupal|TurnKey Drupal\d+|Select an installation profile)$">
@@ -2652,6 +2698,7 @@
     <example>Select an installation profile</example>
     <param pos="0" name="service.vendor" value="Drupal"/>
     <param pos="0" name="service.product" value="CMS"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:drupal:drupal:-"/>
   </fingerprint>
 
   <fingerprint pattern="^LibreNMS$">
@@ -2707,10 +2754,140 @@
   <fingerprint pattern="^Pulse Connect Secure - SSL">
     <description>Pulse Secure VPN</description>
     <example>Pulse Connect Secure - SSL</example>
+    <param pos="0" name="service.vendor" value="Pulse Secure"/>
+    <param pos="0" name="service.product" value="Pulse Connect Secure"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:pulsesecure:pulse_connect_secure:-"/>
     <param pos="0" name="os.vendor" value="Pulse Secure"/>
     <param pos="0" name="os.family" value="SSL-VPN"/>
     <param pos="0" name="os.device" value="SSL-VPN"/>
-    <param pos="0" name="os.product" value="SSL-VPN"/>
+    <param pos="0" name="os.product" value="Pulse Connect Secure"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Jellyfin$">
+    <description>Jellyfin media server</description>
+    <example>Jellyfin</example>
+    <param pos="0" name="service.vendor" value="Jellyfin"/>
+    <param pos="0" name="service.product" value="Media Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="^proxmox - Proxmox Virtual Environment$">
+    <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="os.vendor" value="Proxmox"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Proxmox"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Sony Network Camera$">
+    <description>Sony Network Camera</description>
+    <example>Sony Network Camera</example>
+    <param pos="0" name="hw.vendor" value="Sony"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
+    <param pos="0" name="hw.product" value="Network Camera"/>
+  </fingerprint>
+
+  <fingerprint pattern="Lifesize&amp;reg;$">
+    <description>Lifesize TelePresence</description>
+    <example>Lifesize&amp;reg;</example>
+    <example>400 - Bad Request	Lifesize&amp;reg;</example>
+    <param pos="0" name="hw.vendor" value="Lifesize"/>
+    <param pos="0" name="hw.device" value="Video Conferencing"/>
+    <param pos="0" name="hw.product" value="TelePresence"/>
+    <param pos="0" name="os.vendor" value="Lifesize"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="TelePresence"/>
+    <param pos="0" name="os.device" value="Video Conferencing"/>
+  </fingerprint>
+
+  <fingerprint pattern="^AT&amp;amp;T VPN Gateway$">
+    <description>ATT VPN Gateway</description>
+    <example>AT&amp;amp;T VPN Gateway</example>
+    <param pos="0" name="hw.vendor" value="ATT"/>
+    <param pos="0" name="hw.device" value="VPN"/>
+    <param pos="0" name="hw.product" value="VPN Gateway"/>
+  </fingerprint>
+
+  <fingerprint pattern="^AT&amp;amp;T U\d+: '([^']+)'$">
+    <description>ATT VPN Gateway w Hostname</description>
+    <example host.name="Austin-Boston">AT&amp;amp;T U115: 'Austin-Boston'</example>
+    <param pos="0" name="hw.vendor" value="ATT"/>
+    <param pos="0" name="hw.device" value="VPN"/>
+    <param pos="0" name="hw.product" value="VPN Gateway"/>
+    <param pos="1" name="host.name"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(?:Symantec Encryption Verified Directory|Symantec Encryption Server.*)$">
+    <description>Symantec PGP Key Management Server</description>
+    <example>Symantec Encryption Verified Directory</example>
+    <example>Symantec Encryption Server - Page Not Found</example>
+    <example>Symantec Encryption Server - Login</example>
+    <param pos="0" name="hw.vendor" value="Symantec"/>
+    <param pos="0" name="hw.device" value="Security Appliance"/>
+    <param pos="0" name="hw.product" value="Key Management Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Riverbed Technology, Inc\.$">
+    <description>Riverbed Steelhead Appliance</description>
+    <example>Riverbed Technology, Inc.</example>
+    <param pos="0" name="hw.vendor" value="Riverbed"/>
+    <param pos="0" name="hw.device" value="Security Appliance"/>
+    <param pos="0" name="hw.product" value="Steelhead"/>
+    <param pos="0" name="os.product" value="RiOS"/>
+    <param pos="0" name="os.vendor" value="Riverbed"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:riverbed:rios:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^ClearPass - Aruba Networks$">
+    <description>ClearPass Policy Manager Appliance</description>
+    <example>ClearPass - Aruba Networks</example>
+    <param pos="0" name="hw.vendor" value="Aruba Networks"/>
+    <param pos="0" name="hw.device" value="Network Appliance"/>
+    <param pos="0" name="hw.product" value="ClearPass Policy Manager"/>
+    <param pos="0" name="service.vendor" value="Aruba Networks"/>
+    <param pos="0" name="service.device" value="Network Appliance"/>
+    <param pos="0" name="service.product" value="ClearPass Policy Manager"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:arubanetworks:clearpass_policy_manager:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^MSTR Collab Server$">
+    <description>MicroStrategy Collaboration Server</description>
+    <example>MSTR Collab Server</example>
+    <param pos="0" name="service.vendor" value="MicroStrategy"/>
+    <param pos="0" name="service.product" value="Collaboration Server"/>
+    <param pos="0" name="service.certainty" value="0.5"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Openfire Admin Console$">
+    <description>Openfire Admin Console</description>
+    <example>Openfire Admin Console</example>
+    <param pos="0" name="service.vendor" value="Ignite Realtime"/>
+    <param pos="0" name="service.product" value="OpenFire"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:igniterealtime:openfire:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^:: PBX in a Flash">
+    <description>PBX in a Flash</description>
+    <example>:: PBX in a Flash, Welcome!</example>
+    <param pos="0" name="hw.vendor" value="PIAF"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+    <param pos="0" name="hw.product" value="PIAF Virtual Appliance"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Hak5 Cloud C">
+    <description>Hak5 Cloud c2</description>
+    <example>Hak5 Cloud C²</example>
+    <param pos="0" name="service.vendor" value="Hak5"/>
+    <param pos="0" name="service.product" value="Cloud C2"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Metabase$">
+    <description>Metabase</description>
+    <example>Metabase</example>
+    <param pos="0" name="service.vendor" value="Metabase"/>
+    <param pos="0" name="service.product" value="Metabase"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:metabase:metabase:-"/>
   </fingerprint>
 
 </fingerprints>