recog 2.3.9 → 2.3.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/bin/recog_cleanup +0 -0
  3. data/cpe-remap.yaml +18 -2
  4. data/identifiers/service_product.txt +1 -0
  5. data/identifiers/vendor.txt +1 -0
  6. data/lib/recog/version.rb +1 -1
  7. data/update_cpes.py +3 -0
  8. data/xml/dns_versionbind.xml +116 -8
  9. data/xml/favicons.xml +3 -2
  10. data/xml/ftp_banners.xml +72 -10
  11. data/xml/html_title.xml +28 -0
  12. data/xml/http_servers.xml +418 -72
  13. data/xml/http_wwwauth.xml +7 -7
  14. data/xml/imap_banners.xml +43 -0
  15. data/xml/pop_banners.xml +57 -2
  16. data/xml/smtp_banners.xml +84 -2
  17. data/xml/snmp_sysdescr.xml +2 -1
  18. data/xml/ssh_banners.xml +7 -3
  19. data/xml/telnet_banners.xml +227 -7
  20. metadata +2 -2
data/xml/html_title.xml CHANGED
@@ -2,6 +2,26 @@
2
2
  <fingerprints matches="html_title" database_type="service" preference="0.90">
3
3
  <!-- HTML Title elements found in HTTP response bodies are matched against these patterns to fingerprint HTTP servers. -->
4
4
 
5
+ <fingerprint pattern="^301 Moved Permanently$">
6
+ <description>301 Moved Permanently - generic -- assert nothing.</description>
7
+ <example>301 Moved Permanently</example>
8
+ </fingerprint>
9
+
10
+ <fingerprint pattern="^400 Bad Request$">
11
+ <description>400 Bad Request - generic -- assert nothing.</description>
12
+ <example>400 Bad Request</example>
13
+ </fingerprint>
14
+
15
+ <fingerprint pattern="^401 Unauthorized$">
16
+ <description>401 Unauthorized - generic -- assert nothing.</description>
17
+ <example>401 Unauthorized</example>
18
+ </fingerprint>
19
+
20
+ <fingerprint pattern="^404 Not Found$">
21
+ <description>404 Not Found - generic -- assert nothing.</description>
22
+ <example>404 Not Found</example>
23
+ </fingerprint>
24
+
5
25
  <fingerprint pattern="^Index of /">
6
26
  <description>Apache HTTPD indexes</description>
7
27
  <example>Index of /</example>
@@ -1438,6 +1458,14 @@
1438
1458
  <param pos="0" name="service.cpe23" value="cpe:/a:novnc:novnc:-"/>
1439
1459
  </fingerprint>
1440
1460
 
1461
+ <fingerprint pattern="^VNC Viewer for Java$">
1462
+ <description>RealVNC built-in webserver</description>
1463
+ <example>VNC Viewer for Java</example>
1464
+ <param pos="0" name="service.vendor" value="RealVNC Ltd."/>
1465
+ <param pos="0" name="service.product" value="RealVNC"/>
1466
+ <param pos="0" name="service.cpe23" value="cpe:/a:realvnc:realvnc:-"/>
1467
+ </fingerprint>
1468
+
1441
1469
  <fingerprint pattern="^.* \[Jenkins\]$">
1442
1470
  <description>Jenkins Customized Dashboard</description>
1443
1471
  <example>Continuous Integrations [Jenkins]</example>
data/xml/http_servers.xml CHANGED
@@ -20,15 +20,18 @@
20
20
  <param pos="1" name="service.version"/>
21
21
  </fingerprint>
22
22
 
23
+ <!-- CentOS Web Panel is not part of the CentOS project and runs on CentOS,
24
+ RedHat, and CloudLinux.
25
+ -->
26
+
23
27
  <fingerprint pattern="(?i)^cwpsrv$">
24
28
  <description>CentOS Web Panel</description>
25
29
  <example>cwpsrv</example>
26
- <param pos="0" name="service.vendor" value="CentOS"/>
30
+ <param pos="0" name="service.vendor" value="CentOS WebPanel"/>
27
31
  <param pos="0" name="service.product" value="CentOS Web Panel"/>
28
- <param pos="0" name="os.vendor" value="CentOS"/>
32
+ <param pos="0" name="service.cpe23" value="cpe:/a:centos-webpanel:centos_web_panel:-"/>
29
33
  <param pos="0" name="os.family" value="Linux"/>
30
34
  <param pos="0" name="os.product" value="Linux"/>
31
- <param pos="0" name="os.cpe23" value="cpe:/o:centos:centos:-"/>
32
35
  </fingerprint>
33
36
 
34
37
  <fingerprint pattern="^Stronghold/(\d\.\d) Apache/([012][\d.]*)\s*(.*)$">
@@ -793,6 +796,7 @@
793
796
  <param pos="0" name="service.vendor" value="LiteSpeed Technologies"/>
794
797
  <param pos="0" name="service.product" value="LiteSpeed Web Server"/>
795
798
  <param pos="1" name="service.version"/>
799
+ <param pos="0" name="service.cpe23" value="cpe:/a:litespeedtech:litespeed_web_server:{service.version}"/>
796
800
  </fingerprint>
797
801
 
798
802
  <fingerprint pattern="^IdeaWebServer\/v?([\d.]+)$">
@@ -828,8 +832,9 @@
828
832
  <example service.version="15.1.6.31">Serv-U/15.1.6.31</example>
829
833
  <param pos="0" name="service.vendor" value="SolarWinds"/>
830
834
  <param pos="0" name="service.family" value="Serv-U"/>
831
- <param pos="0" name="service.product" value="FTP Server"/>
835
+ <param pos="0" name="service.product" value="Serv-U FTP Server"/>
832
836
  <param pos="1" name="service.version"/>
837
+ <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:serv-u_ftp_server:{service.version}"/>
833
838
  </fingerprint>
834
839
 
835
840
  <fingerprint pattern="^Wing FTP Server/([\d.]+)\([^)]*\)$">
@@ -1151,18 +1156,29 @@
1151
1156
  <fingerprint pattern="^Sun GlassFish Enterprise Server v(\S+)$">
1152
1157
  <description>Glassfish with version information</description>
1153
1158
  <example service.version="2.1">Sun GlassFish Enterprise Server v2.1</example>
1154
- <param pos="0" name="service.vendor" value="Sun"/>
1159
+ <param pos="0" name="service.vendor" value="Oracle"/>
1155
1160
  <param pos="0" name="service.product" value="GlassFish Server"/>
1156
1161
  <param pos="1" name="service.version"/>
1162
+ <param pos="0" name="service.cpe23" value="cpe:/a:oracle:glassfish_server:{service.version}"/>
1157
1163
  </fingerprint>
1158
1164
 
1159
1165
  <fingerprint pattern="^GlassFish Server Open Source Edition\s+(\S+)$">
1160
1166
  <description>Glassfish Open Source Edition with version information</description>
1161
1167
  <example service.version="4.1.2">GlassFish Server Open Source Edition 4.1.2</example>
1162
1168
  <example service.version="3.1.2.2">GlassFish Server Open Source Edition 3.1.2.2</example>
1163
- <param pos="0" name="service.vendor" value="Sun"/>
1169
+ <param pos="0" name="service.vendor" value="Oracle"/>
1170
+ <param pos="0" name="service.product" value="GlassFish Server"/>
1171
+ <param pos="1" name="service.version"/>
1172
+ <param pos="0" name="service.cpe23" value="cpe:/a:oracle:glassfish_server:{service.version}"/>
1173
+ </fingerprint>
1174
+
1175
+ <fingerprint pattern="^Oracle GlassFish Server ([\d.]+)$">
1176
+ <description>Oracle GlassFish Server</description>
1177
+ <example service.version="3.1.2.14">Oracle GlassFish Server 3.1.2.14</example>
1178
+ <param pos="0" name="service.vendor" value="Oracle"/>
1164
1179
  <param pos="0" name="service.product" value="GlassFish Server"/>
1165
1180
  <param pos="1" name="service.version"/>
1181
+ <param pos="0" name="service.cpe23" value="cpe:/a:oracle:glassfish_server:{service.version}"/>
1166
1182
  </fingerprint>
1167
1183
 
1168
1184
  <fingerprint pattern="^GlassFish$">
@@ -1343,9 +1359,11 @@
1343
1359
  <fingerprint pattern="^thttpd/(\d\.[\w.]+)-MX\s*.*$">
1344
1360
  <description>thttpd with SSL support</description>
1345
1361
  <example>thttpd/2.19-MX Jan 24 2006</example>
1362
+ <param pos="0" name="service.vendor" value="ACME"/>
1346
1363
  <param pos="0" name="service.product" value="thttpd"/>
1347
1364
  <param pos="0" name="service.family" value="thttpd"/>
1348
1365
  <param pos="1" name="service.version"/>
1366
+ <param pos="0" name="service.cpe23" value="cpe:/a:acme:thttpd:{service.version}"/>
1349
1367
  <param pos="0" name="thttpd.mx-patch" value="enabled"/>
1350
1368
  </fingerprint>
1351
1369
 
@@ -1367,9 +1385,11 @@
1367
1385
  <example>Lighttpd</example>
1368
1386
  <example service.version="1.4.16">lighttpd/1.4.16</example>
1369
1387
  <example>lighttpd/1.3.7 (Mar 23 2007/16:00:15)</example>
1388
+ <param pos="0" name="service.vendor" value="lighttpd"/>
1370
1389
  <param pos="0" name="service.product" value="lighttpd"/>
1371
1390
  <param pos="0" name="service.family" value="lighttpd"/>
1372
1391
  <param pos="1" name="service.version"/>
1392
+ <param pos="0" name="service.cpe23" value="cpe:/a:lighttpd:lighttpd:{service.version}"/>
1373
1393
  </fingerprint>
1374
1394
 
1375
1395
  <fingerprint pattern="^nginx$">
@@ -1584,13 +1604,28 @@
1584
1604
  -->
1585
1605
 
1586
1606
  <fingerprint pattern="^SAP J2EE Engine/(\d+\.\d+)$">
1587
- <description>SAP NetWeaver Web AS (Application Server)</description>
1607
+ <description>SAP NetWeaver Application Server Java - short version</description>
1588
1608
  <example service.version="7.01">SAP J2EE Engine/7.01</example>
1589
1609
  <param pos="0" name="service.vendor" value="SAP"/>
1590
- <param pos="0" name="service.product" value="NetWeaver Application Server"/>
1610
+ <param pos="0" name="service.product" value="NetWeaver Application Server Java"/>
1591
1611
  <param pos="0" name="service.family" value="NetWeaver"/>
1592
1612
  <param pos="1" name="service.version"/>
1593
- <param pos="0" name="service.cpe23" value="cpe:/a:sap:netweaver_application_server:{service.version}"/>
1613
+ <param pos="0" name="service.cpe23" value="cpe:/a:sap:netweaver_application_server_java:{service.version}"/>
1614
+ <param pos="0" name="service.component.vendor" value="SAP"/>
1615
+ <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
1616
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
1617
+ </fingerprint>
1618
+
1619
+ <fingerprint pattern="^SAP J2EE Engine$">
1620
+ <description>SAP NetWeaver Application Server Java - without version</description>
1621
+ <example>SAP J2EE Engine</example>
1622
+ <param pos="0" name="service.vendor" value="SAP"/>
1623
+ <param pos="0" name="service.product" value="NetWeaver Application Server Java"/>
1624
+ <param pos="0" name="service.family" value="NetWeaver"/>
1625
+ <param pos="0" name="service.cpe23" value="cpe:/a:sap:netweaver_application_server_java:-"/>
1626
+ <param pos="0" name="service.component.vendor" value="SAP"/>
1627
+ <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
1628
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
1594
1629
  </fingerprint>
1595
1630
 
1596
1631
  <fingerprint pattern="^SAP NetWeaver Application Server$">
@@ -1604,13 +1639,16 @@
1604
1639
 
1605
1640
  <fingerprint pattern="^SAP NetWeaver Application Server ([\d.]+) / AS Java ([\d.]+)$">
1606
1641
  <description>SAP NetWeaver Application Server Java</description>
1607
- <example service.version="7.22" service.component.version="7.30">SAP NetWeaver Application Server 7.22 / AS Java 7.30</example>
1642
+ <example service.version="7.30" service.component.version="7.22">SAP NetWeaver Application Server 7.22 / AS Java 7.30</example>
1608
1643
  <param pos="0" name="service.vendor" value="SAP"/>
1609
1644
  <param pos="0" name="service.product" value="NetWeaver Application Server Java"/>
1610
1645
  <param pos="0" name="service.family" value="NetWeaver"/>
1611
- <param pos="1" name="service.version"/>
1646
+ <param pos="2" name="service.version"/>
1612
1647
  <param pos="0" name="service.cpe23" value="cpe:/a:sap:netweaver_application_server_java:{service.version}"/>
1613
- <param pos="2" name="service.component.version"/>
1648
+ <param pos="0" name="service.component.vendor" value="SAP"/>
1649
+ <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
1650
+ <param pos="1" name="service.component.version"/>
1651
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:{service.component.version}"/>
1614
1652
  </fingerprint>
1615
1653
 
1616
1654
  <fingerprint pattern="^SAP NetWeaver Application Server ([\d.]+) / ICM ([\d.]+)$">
@@ -1619,8 +1657,11 @@
1619
1657
  <param pos="0" name="service.vendor" value="SAP"/>
1620
1658
  <param pos="0" name="service.product" value="NetWeaver Internet Communication Manager"/>
1621
1659
  <param pos="0" name="service.family" value="NetWeaver"/>
1622
- <param pos="1" name="service.version"/>
1623
- <param pos="2" name="service.component.version"/>
1660
+ <param pos="2" name="service.version"/>
1661
+ <param pos="0" name="service.component.vendor" value="SAP"/>
1662
+ <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
1663
+ <param pos="1" name="service.component.version"/>
1664
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:{service.component.version}"/>
1624
1665
  </fingerprint>
1625
1666
 
1626
1667
  <fingerprint pattern="^SAP NetWeaver Application Server \(ICM\)$">
@@ -1629,6 +1670,9 @@
1629
1670
  <param pos="0" name="service.vendor" value="SAP"/>
1630
1671
  <param pos="0" name="service.product" value="NetWeaver Internet Communication Manager"/>
1631
1672
  <param pos="0" name="service.family" value="NetWeaver"/>
1673
+ <param pos="0" name="service.component.vendor" value="SAP"/>
1674
+ <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
1675
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
1632
1676
  </fingerprint>
1633
1677
 
1634
1678
  <fingerprint pattern="^SAP NetWeaver Application Server / ABAP ([\d.]+)$">
@@ -1639,6 +1683,27 @@
1639
1683
  <param pos="0" name="service.family" value="NetWeaver"/>
1640
1684
  <param pos="1" name="service.version"/>
1641
1685
  <param pos="0" name="service.cpe23" value="cpe:/a:sap:netweaver_as_abap:{service.version}"/>
1686
+ <param pos="0" name="service.component.vendor" value="SAP"/>
1687
+ <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
1688
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
1689
+ </fingerprint>
1690
+
1691
+ <fingerprint pattern="^SAP Internet Graphics Server$">
1692
+ <description>SAP Internet Graphics Server</description>
1693
+ <example>SAP Internet Graphics Server</example>
1694
+ <param pos="0" name="service.vendor" value="SAP"/>
1695
+ <param pos="0" name="service.product" value="Internet Graphics Server"/>
1696
+ <param pos="0" name="service.component.vendor" value="SAP"/>
1697
+ <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
1698
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
1699
+ </fingerprint>
1700
+
1701
+ <fingerprint pattern="^SAP Message Server, release ([\d.]+) \(LNK\)$">
1702
+ <description>SAP Message Server</description>
1703
+ <example service.version="753">SAP Message Server, release 753 (LNK)</example>
1704
+ <param pos="0" name="service.vendor" value="SAP"/>
1705
+ <param pos="0" name="service.product" value="SAP Message Server"/>
1706
+ <param pos="1" name="service.version"/>
1642
1707
  </fingerprint>
1643
1708
 
1644
1709
  <fingerprint pattern="^SQLAnywhere/([\d.]+)$">
@@ -1654,11 +1719,12 @@
1654
1719
  <description>OpenVPN Access Server</description>
1655
1720
  <example>OpenVPN-AS</example>
1656
1721
  <param pos="0" name="service.vendor" value="OpenVPN"/>
1657
- <param pos="0" name="service.product" value="Access Server"/>
1722
+ <param pos="0" name="service.product" value="OpenVPN Access Server"/>
1723
+ <param pos="0" name="service.cpe23" value="cpe:/a:openvpn:openvpn_access_server:-"/>
1658
1724
  <param pos="0" name="hw.device" value="VPN"/>
1659
1725
  </fingerprint>
1660
1726
 
1661
- <fingerprint pattern="^SonicWALL (SSL-?VPN(?: (?:\d+))?) Web Server\.?$">
1727
+ <fingerprint pattern="^SonicWALL SSL-?VPN Web Server$">
1662
1728
  <description>SonicWALL SSL-VPN device</description>
1663
1729
  <example>SonicWALL SSLVPN Web Server</example>
1664
1730
  <example>SonicWALL SSL-VPN Web Server</example>
@@ -1668,7 +1734,8 @@
1668
1734
  <param pos="0" name="os.vendor" value="SonicWall"/>
1669
1735
  <param pos="0" name="os.device" value="VPN"/>
1670
1736
  <param pos="0" name="os.family" value="SSL-VPN"/>
1671
- <param pos="1" name="os.product"/>
1737
+ <param pos="0" name="os.product" value="SonicOS"/>
1738
+ <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
1672
1739
  <param pos="0" name="hw.vendor" value="SonicWall"/>
1673
1740
  <param pos="0" name="hw.device" value="VPN"/>
1674
1741
  </fingerprint>
@@ -1679,6 +1746,12 @@
1679
1746
  <param pos="0" name="service.vendor" value="SonicWall"/>
1680
1747
  <param pos="0" name="service.product" value="HTTP"/>
1681
1748
  <param pos="0" name="os.vendor" value="SonicWall"/>
1749
+ <param pos="0" name="os.device" value="VPN"/>
1750
+ <param pos="0" name="os.family" value="SSL-VPN"/>
1751
+ <param pos="0" name="os.product" value="SonicOS"/>
1752
+ <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
1753
+ <param pos="0" name="hw.vendor" value="SonicWall"/>
1754
+ <param pos="0" name="hw.device" value="VPN"/>
1682
1755
  </fingerprint>
1683
1756
 
1684
1757
  <fingerprint pattern="^NetCache appliance \(NetApp/+(\d+\.\d+[\w.]+)\)$">
@@ -1766,6 +1839,10 @@
1766
1839
  <param pos="0" name="hw.device" value="Printer"/>
1767
1840
  </fingerprint>
1768
1841
 
1842
+ <!-- This section needs to be reworked to extract module / version to make
1843
+ this information useful and mappable to CPE
1844
+ -->
1845
+
1769
1846
  <fingerprint pattern="^HP HTTP Server; (?:Hewlett-Packard )?HP ((\S+) \S+)">
1770
1847
  <description>HP Printer</description>
1771
1848
  <example os.product="Photosmart C309a" os.family="Photosmart">HP HTTP Server; HP Photosmart C309a series - CC335A; Serial Number: abc123; Vader Built:Wed Apr 15, 2009 11:40:58AM {abc123, ASIC id 0x00280004}</example>
@@ -1891,6 +1968,26 @@
1891
1968
  <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
1892
1969
  </fingerprint>
1893
1970
 
1971
+ <fingerprint pattern="^CE_E$">
1972
+ <description>Cisco Expressway-E (Edge)</description>
1973
+ <example>CE_E</example>
1974
+ <param pos="0" name="service.vendor" value="Cisco"/>
1975
+ <param pos="0" name="service.product" value="Expressway"/>
1976
+ <param pos="0" name="service.cpe23" value="cpe:/a:cisco:expressway:-"/>
1977
+ <param pos="0" name="hw.vendor" value="Cisco"/>
1978
+ <param pos="0" name="hw.device" value="VoIP"/>
1979
+ </fingerprint>
1980
+
1981
+ <fingerprint pattern="^CE_C$">
1982
+ <description>Cisco Expressway-C (Core)</description>
1983
+ <example>CE_C</example>
1984
+ <param pos="0" name="service.vendor" value="Cisco"/>
1985
+ <param pos="0" name="service.product" value="Expressway"/>
1986
+ <param pos="0" name="service.cpe23" value="cpe:/a:cisco:expressway:-"/>
1987
+ <param pos="0" name="hw.vendor" value="Cisco"/>
1988
+ <param pos="0" name="hw.device" value="VoIP"/>
1989
+ </fingerprint>
1990
+
1894
1991
  <fingerprint pattern="^CradlepointHTTPService/([\d\.]+)$">
1895
1992
  <description>Cradlepoint HTTP service</description>
1896
1993
  <example service.version="1.0.0">CradlepointHTTPService/1.0.0</example>
@@ -1983,7 +2080,7 @@
1983
2080
 
1984
2081
  <fingerprint pattern="^NS_(\d\.\d)$">
1985
2082
  <description>Citrix NetScaler</description>
1986
- <example>NS_6.1</example>
2083
+ <example service.version="6.1">NS_6.1</example>
1987
2084
  <param pos="0" name="os.vendor" value="Citrix"/>
1988
2085
  <param pos="0" name="os.family" value="NetScaler"/>
1989
2086
  <param pos="0" name="os.device" value="Network Management Device"/>
@@ -1996,6 +2093,14 @@
1996
2093
  <param pos="0" name="service.cpe23" value="cpe:/a:citrix:netscaler:{service.version}"/>
1997
2094
  </fingerprint>
1998
2095
 
2096
+ <fingerprint pattern="^Citrix-([\d.]+) \'[^']*\'$">
2097
+ <description>Citrix STUN server</description>
2098
+ <example service.version="3.2.5.9">Citrix-3.2.5.9 'Marshal West'</example>
2099
+ <param pos="0" name="service.vendor" value="Citrix"/>
2100
+ <param pos="0" name="service.product" value="STUN Server"/>
2101
+ <param pos="1" name="service.version"/>
2102
+ </fingerprint>
2103
+
1999
2104
  <fingerprint pattern="^Rumpus$">
2000
2105
  <description>Rumpus FTP Server, Web File Manager interface</description>
2001
2106
  <example>Rumpus</example>
@@ -2070,12 +2175,44 @@
2070
2175
  <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:-"/>
2071
2176
  </fingerprint>
2072
2177
 
2073
- <fingerprint pattern="^RealVNC/(?:\S+)$">
2178
+ <fingerprint pattern="^VNC Server (Enterprise|Personal) Edition/(?:E|P)([\d.]+) \(r([\d.]+)\)$">
2179
+ <description>RealVNC built-in webserver - Enterprise edition</description>
2180
+ <example service.version="4.5.1" service.version.version="27892">VNC Server Enterprise Edition/E4.5.1 (r27892)</example>
2181
+ <example service.edition="Personal">VNC Server Personal Edition/P4.5.3 (r39012)</example>
2182
+ <param pos="0" name="service.vendor" value="RealVNC Ltd."/>
2183
+ <param pos="0" name="service.product" value="RealVNC"/>
2184
+ <param pos="1" name="service.edition"/>
2185
+ <param pos="2" name="service.version"/>
2186
+ <param pos="3" name="service.version.version"/>
2187
+ <param pos="0" name="service.cpe23" value="cpe:/a:realvnc:realvnc:{service.version}"/>
2188
+ </fingerprint>
2189
+
2190
+ <fingerprint pattern="^RealVNC/E([\d.]+)$">
2191
+ <description>RealVNC built-in webserver - Enterprise edition, short variant</description>
2192
+ <example service.version="4">RealVNC/E4</example>
2193
+ <param pos="0" name="service.vendor" value="RealVNC Ltd."/>
2194
+ <param pos="0" name="service.product" value="RealVNC"/>
2195
+ <param pos="1" name="service.version"/>
2196
+ <param pos="0" name="service.version.version" value="Enterprise"/>
2197
+ <param pos="0" name="service.cpe23" value="cpe:/a:realvnc:realvnc:{service.version}"/>
2198
+ </fingerprint>
2199
+
2200
+ <fingerprint pattern="^RealVNC/([\d.]+)$">
2074
2201
  <description>RealVNC built-in webserver</description>
2075
- <example>RealVNC/4.0</example>
2202
+ <example service.version="4.0">RealVNC/4.0</example>
2076
2203
  <param pos="0" name="service.vendor" value="RealVNC Ltd."/>
2077
2204
  <param pos="0" name="service.product" value="RealVNC"/>
2078
- <param pos="0" name="service.cpe23" value="cpe:/a:realvnc:realvnc:-"/>
2205
+ <param pos="1" name="service.version"/>
2206
+ <param pos="0" name="service.cpe23" value="cpe:/a:realvnc:realvnc:{service.version}"/>
2207
+ </fingerprint>
2208
+
2209
+ <fingerprint pattern="^TigerVNC/([\d.]+)$">
2210
+ <description>TigerVNC built-in webserver</description>
2211
+ <example service.version="4.0">TigerVNC/4.0</example>
2212
+ <param pos="0" name="service.vendor" value="TigerVNC"/>
2213
+ <param pos="0" name="service.product" value="TigerVNC"/>
2214
+ <param pos="1" name="service.version"/>
2215
+ <param pos="0" name="service.cpe23" value="cpe:/a:tigervnc:tigervnc:{service.version}"/>
2079
2216
  </fingerprint>
2080
2217
 
2081
2218
  <fingerprint pattern="^SecureTransport (\d+[\d\.]+) \(build: (\d+)\)$">
@@ -2222,8 +2359,8 @@
2222
2359
 
2223
2360
  <fingerprint pattern="(?i)^SimpleHTTP/((?:\d+\.)*\d+)\s*Python/((?:\d+\.)*\d+)$">
2224
2361
  <description>SimpleHTTPRequestHandler Python class is a simple HTTP request handler.</description>
2225
- <example>SimpleHTTP/0.6 Python/2.7.6</example>
2226
- <example>SimpleHTTP/0.6 Python/3.4.0</example>
2362
+ <example service.version="0.6">SimpleHTTP/0.6 Python/2.7.6</example>
2363
+ <example python.version="3.4.0">SimpleHTTP/0.6 Python/3.4.0</example>
2227
2364
  <param pos="0" name="service.vendor" value="Python Software Foundation"/>
2228
2365
  <param pos="0" name="service.product" value="SimpleHTTP"/>
2229
2366
  <param pos="0" name="service.family" value="Python"/>
@@ -2292,9 +2429,10 @@
2292
2429
  <fingerprint pattern="^GoAhead-(?:Webs|http)$">
2293
2430
  <description>GoAhead-Webs - no version</description>
2294
2431
  <example>GoAhead-Webs</example>
2295
- <param pos="0" name="service.vendor" value="Oracle"/>
2432
+ <param pos="0" name="service.vendor" value="EmbedThis"/>
2296
2433
  <param pos="0" name="service.product" value="GoAhead Webserver"/>
2297
2434
  <param pos="0" name="service.family" value="GoAhead Webserver"/>
2435
+ <param pos="0" name="service.cpe23" value="cpe:/a:embedthis:goahead:-"/>
2298
2436
  </fingerprint>
2299
2437
 
2300
2438
  <fingerprint pattern="(?i)^GoAhead(?:-Webs|-http)?\/([\d.]+)(?: PeerSec-MatrixSSL\/[\d.]+-OPEN)?$">
@@ -2363,7 +2501,7 @@
2363
2501
  </fingerprint>
2364
2502
 
2365
2503
  <fingerprint pattern="^Sophos Email Appliance$">
2366
- <description>Embedded web server for a rack-mounted email appliance that blocks spam and malware.</description>
2504
+ <description>Sophos - Embedded web server for a rack-mounted email appliance that blocks spam and malware.</description>
2367
2505
  <example>Sophos Email Appliance</example>
2368
2506
  <param pos="0" name="service.vendor" value="Sophos"/>
2369
2507
  <param pos="0" name="service.product" value="Email Appliance"/>
@@ -2394,18 +2532,19 @@
2394
2532
  </fingerprint>
2395
2533
 
2396
2534
  <fingerprint pattern="^mini_httpd/((?:\d+\.)*\d+) \S*$">
2397
- <description>A small HTTP server</description>
2535
+ <description>ACME mini_httpd with version and date</description>
2398
2536
  <example>mini_httpd/1.14 23jun2000</example>
2399
2537
  <example>mini_httpd/1 23jun2000</example>
2400
- <param pos="0" name="service.vendor" value="ACME Laboratories"/>
2538
+ <param pos="0" name="service.vendor" value="ACME"/>
2401
2539
  <param pos="0" name="service.product" value="mini_httpd"/>
2402
2540
  <param pos="0" name="service.family" value="mini_httpd"/>
2403
2541
  <param pos="1" name="service.version"/>
2542
+ <param pos="0" name="service.cpe23" value="cpe:/a:acme:mini_httpd:{service.version}"/>
2404
2543
  </fingerprint>
2405
2544
 
2406
2545
  <fingerprint pattern="^thin ((?:\d+\.)*\d+) codename .+$">
2407
- <description>A Ruby-based web server.</description>
2408
- <example>thin 1.2.4 codename Flaming Astroboy</example>
2546
+ <description>Marc-André Cournoyer's thin webserver</description>
2547
+ <example service.version="1.2.4">thin 1.2.4 codename Flaming Astroboy</example>
2409
2548
  <example>thin 1 codename Flaming Astroboy</example>
2410
2549
  <param pos="0" name="service.product" value="Thin"/>
2411
2550
  <param pos="0" name="service.family" value="Thin"/>
@@ -2425,11 +2564,13 @@
2425
2564
 
2426
2565
  <fingerprint pattern="^Mongrel ((?:\d+\.)*\d+)$">
2427
2566
  <description>Ruby-based web server and HTTP library.</description>
2428
- <example>Mongrel 1.1.5</example>
2567
+ <example service.version="1.1.5">Mongrel 1.1.5</example>
2429
2568
  <example>Mongrel 1</example>
2569
+ <param pos="0" name="service.vendor" value="Zed Shaw"/>
2430
2570
  <param pos="0" name="service.product" value="Mongrel"/>
2431
2571
  <param pos="0" name="service.family" value="Mongrel"/>
2432
2572
  <param pos="1" name="service.version"/>
2573
+ <param pos="0" name="service.cpe23" value="cpe:/a:zed_shaw:mongrel:{service.version}"/>
2433
2574
  </fingerprint>
2434
2575
 
2435
2576
  <fingerprint pattern="^Microplex emHTTPD/((?:\d+\.)*\d+)$">
@@ -2468,7 +2609,7 @@
2468
2609
 
2469
2610
  <fingerprint pattern="^JC-SHTTPD/((?:\d+\.)*\d+)$">
2470
2611
  <description>An embedded web server.</description>
2471
- <example>JC-SHTTPD/1.17.20</example>
2612
+ <example service.version="1.17.20">JC-SHTTPD/1.17.20</example>
2472
2613
  <example>JC-SHTTPD/1</example>
2473
2614
  <param pos="0" name="service.product" value="JC-SHTTPD"/>
2474
2615
  <param pos="0" name="service.family" value="JC-SHTTPD"/>
@@ -2527,27 +2668,34 @@
2527
2668
  variety of products including printers, PDUs, etc.
2528
2669
  -->
2529
2670
 
2530
- <fingerprint pattern="^\$ProjectRevision: 4.0.2.38 \$$">
2531
- <description>This banner is seen on some HP LaserJet printers.</description>
2671
+ <fingerprint pattern="^\$ProjectRevision:[\s\w:]* ([\d\.]+) \$$">
2672
+ <description>This banner is used to see if devices have Treck TCP/IP</description>
2532
2673
  <example>$ProjectRevision: 4.0.2.38 $</example>
2533
- <param pos="0" name="os.vendor" value="HP"/>
2534
- <param pos="0" name="os.device" value="Printer"/>
2535
- <param pos="0" name="os.family" value="LaserJet"/>
2674
+ <example>$ProjectRevision: 4.2 $</example>
2675
+ <example>$ProjectRevision: 6.0.1.5 $</example>
2676
+ <example>$ProjectRevision: Last Checkpoint: 4.2.2.13 $</example>
2677
+ <param pos="0" name="service.vendor" value="Treck"/>
2678
+ <param pos="0" name="service.product" value="TCP/IP"/>
2679
+ <param pos="1" name="service.version"/>
2680
+ <param pos="0" name="service.cpe23" value="cpe:/a:treck:tcp\/ip:{service.version}"/>
2536
2681
  </fingerprint>
2537
2682
 
2538
2683
  <fingerprint pattern="^WEBrick/([\d\.]+) .*$">
2539
2684
  <description>WEBrick default setup</description>
2540
- <example>WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)</example>
2541
- <param pos="0" name="service.vendor" value="Ruby"/>
2685
+ <example service.version="1.3.1">WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)</example>
2686
+ <param pos="0" name="service.vendor" value="Ruby-Lang"/>
2542
2687
  <param pos="0" name="service.product" value="WEBrick"/>
2543
2688
  <param pos="1" name="service.version"/>
2689
+ <param pos="0" name="service.cpe23" value="cpe:/a:ruby-lang:webrick:{service.version}"/>
2544
2690
  </fingerprint>
2545
2691
 
2546
2692
  <fingerprint pattern="^Aspen/(\S+)">
2547
2693
  <description>Aspen web server</description>
2548
2694
  <example service.version="0.8">Aspen/0.8</example>
2695
+ <param pos="0" name="service.vendor" value="Aspen"/>
2549
2696
  <param pos="0" name="service.product" value="Aspen"/>
2550
2697
  <param pos="1" name="service.version"/>
2698
+ <param pos="0" name="service.cpe23" value="cpe:/a:aspen:aspen:{service.version}"/>
2551
2699
  </fingerprint>
2552
2700
 
2553
2701
  <fingerprint pattern="^Boa/([\d\.]+\S*)">
@@ -2557,8 +2705,10 @@
2557
2705
  <example service.version="0.93.15">Boa/0.93.15 (with Intersil Extensions)</example>
2558
2706
  <example service.version="0.92p">Boa/0.92p OS-9 Version</example>
2559
2707
  <example service.version="0.93.15">Boa/0.93.15</example>
2708
+ <param pos="0" name="service.vendor" value="Boa"/>
2560
2709
  <param pos="0" name="service.product" value="Boa"/>
2561
2710
  <param pos="1" name="service.version"/>
2711
+ <param pos="0" name="service.cpe23" value="cpe:/a:boa:boa:{service.version}"/>
2562
2712
  </fingerprint>
2563
2713
 
2564
2714
  <!-- HiSilicon is OEMd by a number of DVR manufacturers -->
@@ -2718,8 +2868,10 @@
2718
2868
  <fingerprint pattern="^gSOAP/([\d\.]+)$">
2719
2869
  <description>gSOAP</description>
2720
2870
  <example service.version="2.7">gSOAP/2.7</example>
2871
+ <param pos="0" name="service.vendor" value="Genivia"/>
2721
2872
  <param pos="0" name="service.product" value="gSOAP"/>
2722
2873
  <param pos="1" name="service.version"/>
2874
+ <param pos="0" name="service.cpe23" value="cpe:/a:genivia:gsoap:{service.version}"/>
2723
2875
  </fingerprint>
2724
2876
 
2725
2877
  <!-- Apple QuickTime streaming server -->
@@ -2797,12 +2949,14 @@
2797
2949
  <fingerprint pattern="^Sunny WebBox$">
2798
2950
  <description>Sunny WebBox</description>
2799
2951
  <example>Sunny WebBox</example>
2800
- <param pos="0" name="service.vendor" value="SMA Solar Technology Ag"/>
2952
+ <param pos="0" name="service.vendor" value="SMA"/>
2801
2953
  <param pos="0" name="service.family" value="Sunny"/>
2802
- <param pos="0" name="service.product" value="WebBox"/>
2954
+ <param pos="0" name="service.product" value="Sunny WebBox"/>
2955
+ <param pos="0" name="hw.vendor" value="SMA"/>
2803
2956
  <param pos="0" name="hw.family" value="Sunny"/>
2804
- <param pos="0" name="hw.product" value="WebBox"/>
2957
+ <param pos="0" name="hw.product" value="Sunny WebBox"/>
2805
2958
  <param pos="0" name="hw.device" value="Power device"/>
2959
+ <param pos="0" name="hw.cpe23" value="cpe:/h:sma:sunny_webbox:-"/>
2806
2960
  <param pos="0" name="os.vendor" value="Microsoft"/>
2807
2961
  <param pos="0" name="os.family" value="Windows"/>
2808
2962
  <param pos="0" name="os.product" value="Windows CE"/>
@@ -2916,11 +3070,13 @@
2916
3070
 
2917
3071
  <fingerprint pattern="(?i)^Linux/(\S+) UPnP/[\d\.]+ miniupnpd/([\d\.]+)$">
2918
3072
  <description>Linux MiniUPnPd UPnP Server</description>
2919
- <example>Linux/Cross_compiled UPnP/1.0 miniupnpd/1.0</example>
3073
+ <example service.version="1.0">Linux/Cross_compiled UPnP/1.0 miniupnpd/1.0</example>
2920
3074
  <example>Linux/2.6.29.6-217.2.3.fc11.i686.PAE UPnP/1.0 miniupnpd/1.0</example>
2921
3075
  <example>Linux/2.4.21 UPnP/1.0 miniupnpd/1.0</example>
3076
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
2922
3077
  <param pos="0" name="service.product" value="MiniUPnP"/>
2923
3078
  <param pos="2" name="service.version"/>
3079
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
2924
3080
  <param pos="0" name="os.vendor" value="Linux"/>
2925
3081
  <param pos="0" name="os.product" value="Linux"/>
2926
3082
  <param pos="1" name="os.version"/>
@@ -2929,28 +3085,32 @@
2929
3085
 
2930
3086
  <fingerprint pattern="^Tomato UPnP/\S+ MiniUPnPd/(\S+)$">
2931
3087
  <description>Tomato UPnP Server</description>
2932
- <example>Tomato UPnP/1.0 MiniUPnPd/1.2</example>
2933
- <example>Tomato UPnP/1.0 MiniUPnPd/1.4</example>
2934
- <param pos="0" name="service.vendor" value="Tomato"/>
3088
+ <example service.version="1.2">Tomato UPnP/1.0 MiniUPnPd/1.2</example>
3089
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
2935
3090
  <param pos="0" name="service.product" value="MiniUPnP"/>
2936
3091
  <param pos="1" name="service.version"/>
3092
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
2937
3093
  </fingerprint>
2938
3094
 
2939
- <fingerprint pattern="(?i)^(RT-\w+) UPnP/\S+ MiniUPnPd/(\S+)$">
3095
+ <fingerprint pattern="(?i)^(RT-\w+) UPnP/\S+ MiniUPnPd/([\d.]+)$">
2940
3096
  <description>Asus WAP UPnP Server</description>
2941
- <example>RT-G32 UPnP/1.0 MiniUPnPd/1.2</example>
3097
+ <example service.version="1.2">RT-G32 UPnP/1.0 MiniUPnPd/1.2</example>
3098
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
2942
3099
  <param pos="0" name="service.product" value="MiniUPnP"/>
2943
3100
  <param pos="2" name="service.version"/>
3101
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
2944
3102
  <param pos="0" name="os.vendor" value="Asus"/>
2945
3103
  <param pos="1" name="os.product"/>
2946
3104
  <param pos="0" name="os.device" value="WAP"/>
2947
3105
  </fingerprint>
2948
3106
 
2949
- <fingerprint pattern="(?i)^DrayTek/Vigor(\S+) UPnP/\S+ miniupnpd/(\S+)$">
3107
+ <fingerprint pattern="(?i)^DrayTek/Vigor(\S+) UPnP/\S+ miniupnpd/([\d.]+)$">
2950
3108
  <description>DrayTek Vigor router UPnP Server</description>
2951
- <example hw.model="2130">DrayTek/Vigor2130 UPnP/1.0 miniupnpd/1.0</example>
3109
+ <example service.version="1.0" hw.model="2130">DrayTek/Vigor2130 UPnP/1.0 miniupnpd/1.0</example>
3110
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
2952
3111
  <param pos="0" name="service.product" value="MiniUPnP"/>
2953
3112
  <param pos="2" name="service.version"/>
3113
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
2954
3114
  <param pos="0" name="hw.vendor" value="DrayTek"/>
2955
3115
  <param pos="0" name="hw.product" value="Vigor"/>
2956
3116
  <param pos="1" name="hw.model"/>
@@ -2964,26 +3124,30 @@
2964
3124
  <param pos="0" name="hw.device" value="Broadband router"/>
2965
3125
  </fingerprint>
2966
3126
 
2967
- <fingerprint pattern="(?i)^OpenWRT/kamikaze UPnP/\S+ MiniUPnPd/(\S+)$">
3127
+ <fingerprint pattern="(?i)^OpenWRT/kamikaze UPnP/\S+ MiniUPnPd/([\d.]+)$">
2968
3128
  <description>OpenWRT Kamikaze WAP UPnP Server</description>
2969
- <example>OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.5</example>
2970
- <example>OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.2</example>
2971
- <example>OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.4</example>
3129
+ <example service.version="1.5">OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.5</example>
3130
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
2972
3131
  <param pos="0" name="service.product" value="MiniUPnP"/>
2973
3132
  <param pos="1" name="service.version"/>
3133
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
2974
3134
  <param pos="0" name="os.vendor" value="Linux"/>
2975
3135
  <param pos="0" name="os.family" value="OpenWRT"/>
2976
3136
  <param pos="0" name="os.product" value="Kamikaze"/>
2977
3137
  <param pos="0" name="os.device" value="WAP"/>
2978
3138
  </fingerprint>
2979
3139
 
2980
- <fingerprint pattern="(?i)^Netgear/\S+ UPnP/\S+ miniupnpd/(\S+)$">
3140
+ <fingerprint pattern="(?i)^Netgear/\S+ UPnP/\S+ miniupnpd/([\d.]+)$">
2981
3141
  <description>Netgear DG834G or WNDR3300 WAP UPnP Server</description>
2982
- <example>Netgear/1.0 UPnP/1.0 miniupnpd/1.0</example>
3142
+ <example service.version="1.0">Netgear/1.0 UPnP/1.0 miniupnpd/1.0</example>
3143
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
2983
3144
  <param pos="0" name="service.product" value="MiniUPnP"/>
2984
3145
  <param pos="1" name="service.version"/>
3146
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
2985
3147
  <param pos="0" name="os.vendor" value="Netgear"/>
2986
3148
  <param pos="0" name="os.device" value="WAP"/>
3149
+ <param pos="0" name="hw.vendor" value="Netgear"/>
3150
+ <param pos="0" name="hw.device" value="WAP"/>
2987
3151
  </fingerprint>
2988
3152
 
2989
3153
  <fingerprint pattern="^[^/]+/(\S+) DLNADOC/\S+ UPnP/\S+ MiniDLNA/(\S+)$">
@@ -3003,8 +3167,10 @@
3003
3167
  <description>miniupnpd on a Debian variant</description>
3004
3168
  <example os.version="wheezy/sid" service.version="1.8">Debian/wheezy/sid UPnP/1.1 MiniUPnPd/1.8</example>
3005
3169
  <example os.version="4.0" service.version="1.0">Debian/4.0 UPnP/1.0 miniupnpd/1.0</example>
3170
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3006
3171
  <param pos="0" name="service.product" value="MiniUPnP"/>
3007
3172
  <param pos="2" name="service.version"/>
3173
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3008
3174
  <param pos="0" name="os.vendor" value="Debian"/>
3009
3175
  <param pos="0" name="os.product" value="Linux"/>
3010
3176
  <param pos="0" name="os.certainty" value="0.5"/>
@@ -3017,8 +3183,10 @@
3017
3183
  <example os.version="10" service.version="1.4">Fedora/10 UPnP/1.0 MiniUPnPd/1.4</example>
3018
3184
  <example os.version="8" service.version="1.0">Fedora/8 UPnP/1.0 miniupnpd/1.0</example>
3019
3185
  <example os.version="6" service.version="1.0">FedoraCore/6 UPnP/1.0 miniupnpd/1.0</example>
3186
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3020
3187
  <param pos="0" name="service.product" value="MiniUPnP"/>
3021
3188
  <param pos="2" name="service.version"/>
3189
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3022
3190
  <param pos="0" name="os.family" value="Linux"/>
3023
3191
  <param pos="0" name="os.vendor" value="Red Hat"/>
3024
3192
  <param pos="0" name="os.product" value="Fedora Core Linux"/>
@@ -3032,8 +3200,10 @@
3032
3200
  <example os.version="10.10" service.version="1.0">Ubuntu/10.10 UPnP/1.0 miniupnpd/1.0</example>
3033
3201
  <example os.version="7.10" service.version="1.0">Ubuntu/7.10 UPnP/1.0 miniupnpd/1.0</example>
3034
3202
  <example os.version="9.04" service.version="1.0">Ubuntu/9.04 UPnP/1.0 miniupnpd/1.0</example>
3203
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3035
3204
  <param pos="0" name="service.product" value="MiniUPnP"/>
3036
3205
  <param pos="2" name="service.version"/>
3206
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3037
3207
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3038
3208
  <param pos="0" name="os.product" value="Linux"/>
3039
3209
  <param pos="1" name="os.version"/>
@@ -3043,8 +3213,10 @@
3043
3213
  <fingerprint pattern="(?i)^Ubuntu\/bionic UPnP/\S+ MiniUPnPd/(\S+)$">
3044
3214
  <description>miniupnpd on an Ubuntu bionic/18.04</description>
3045
3215
  <example os.version="18.04" service.version="1.4">Ubuntu/bionic UPnP/1.0 MiniUPnPd/1.4</example>
3216
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3046
3217
  <param pos="0" name="service.product" value="MiniUPnP"/>
3047
3218
  <param pos="1" name="service.version"/>
3219
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3048
3220
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3049
3221
  <param pos="0" name="os.product" value="Linux"/>
3050
3222
  <param pos="0" name="os.version" value="18.04"/>
@@ -3054,8 +3226,10 @@
3054
3226
  <fingerprint pattern="(?i)^Ubuntu\/yakkety UPnP/\S+ MiniUPnPd/(\S+)$">
3055
3227
  <description>miniupnpd on an Ubuntu yakkety/16.10</description>
3056
3228
  <example os.version="16.10" service.version="1.4">Ubuntu/yakkety UPnP/1.0 MiniUPnPd/1.4</example>
3229
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3057
3230
  <param pos="0" name="service.product" value="MiniUPnP"/>
3058
3231
  <param pos="1" name="service.version"/>
3232
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3059
3233
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3060
3234
  <param pos="0" name="os.product" value="Linux"/>
3061
3235
  <param pos="0" name="os.version" value="16.10"/>
@@ -3065,8 +3239,10 @@
3065
3239
  <fingerprint pattern="(?i)^Ubuntu\/xenial UPnP/\S+ MiniUPnPd/(\S+)$">
3066
3240
  <description>miniupnpd on an Ubuntu xenial/16.04</description>
3067
3241
  <example os.version="16.04" service.version="1.4">Ubuntu/xenial UPnP/1.0 MiniUPnPd/1.4</example>
3242
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3068
3243
  <param pos="0" name="service.product" value="MiniUPnP"/>
3069
3244
  <param pos="1" name="service.version"/>
3245
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3070
3246
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3071
3247
  <param pos="0" name="os.product" value="Linux"/>
3072
3248
  <param pos="0" name="os.version" value="16.04"/>
@@ -3076,8 +3252,10 @@
3076
3252
  <fingerprint pattern="(?i)^Ubuntu\/utopic UPnP/\S+ MiniUPnPd/(\S+)$">
3077
3253
  <description>miniupnpd on an Ubuntu utopic/14.10</description>
3078
3254
  <example os.version="14.10" service.version="1.4">Ubuntu/utopic UPnP/1.0 MiniUPnPd/1.4</example>
3255
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3079
3256
  <param pos="0" name="service.product" value="MiniUPnP"/>
3080
3257
  <param pos="1" name="service.version"/>
3258
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3081
3259
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3082
3260
  <param pos="0" name="os.product" value="Linux"/>
3083
3261
  <param pos="0" name="os.version" value="14.10"/>
@@ -3087,8 +3265,10 @@
3087
3265
  <fingerprint pattern="(?i)^Ubuntu\/trusty UPnP/\S+ MiniUPnPd/(\S+)$">
3088
3266
  <description>miniupnpd on an Ubuntu trusty/14.04</description>
3089
3267
  <example os.version="14.04" service.version="1.4">Ubuntu/trusty UPnP/1.0 MiniUPnPd/1.4</example>
3268
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3090
3269
  <param pos="0" name="service.product" value="MiniUPnP"/>
3091
3270
  <param pos="1" name="service.version"/>
3271
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3092
3272
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3093
3273
  <param pos="0" name="os.product" value="Linux"/>
3094
3274
  <param pos="0" name="os.version" value="14.04"/>
@@ -3098,8 +3278,10 @@
3098
3278
  <fingerprint pattern="(?i)^Ubuntu\/saucy UPnP/\S+ MiniUPnPd/(\S+)$">
3099
3279
  <description>miniupnpd on an Ubuntu saucy/13.10</description>
3100
3280
  <example os.version="13.10" service.version="1.4">Ubuntu/saucy UPnP/1.0 MiniUPnPd/1.4</example>
3281
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3101
3282
  <param pos="0" name="service.product" value="MiniUPnP"/>
3102
3283
  <param pos="1" name="service.version"/>
3284
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3103
3285
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3104
3286
  <param pos="0" name="os.product" value="Linux"/>
3105
3287
  <param pos="0" name="os.version" value="13.10"/>
@@ -3109,8 +3291,10 @@
3109
3291
  <fingerprint pattern="(?i)^Ubuntu\/raring UPnP/\S+ MiniUPnPd/(\S+)$">
3110
3292
  <description>miniupnpd on an Ubuntu raring/13.04</description>
3111
3293
  <example os.version="13.04" service.version="1.4">Ubuntu/raring UPnP/1.0 MiniUPnPd/1.4</example>
3294
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3112
3295
  <param pos="0" name="service.product" value="MiniUPnP"/>
3113
3296
  <param pos="1" name="service.version"/>
3297
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3114
3298
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3115
3299
  <param pos="0" name="os.product" value="Linux"/>
3116
3300
  <param pos="0" name="os.version" value="13.04"/>
@@ -3120,8 +3304,10 @@
3120
3304
  <fingerprint pattern="(?i)^Ubuntu\/quantal UPnP/\S+ MiniUPnPd/(\S+)$">
3121
3305
  <description>miniupnpd on an Ubuntu quantal/12.10</description>
3122
3306
  <example os.version="12.10" service.version="1.4">Ubuntu/quantal UPnP/1.0 MiniUPnPd/1.4</example>
3307
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3123
3308
  <param pos="0" name="service.product" value="MiniUPnP"/>
3124
3309
  <param pos="1" name="service.version"/>
3310
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3125
3311
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3126
3312
  <param pos="0" name="os.product" value="Linux"/>
3127
3313
  <param pos="0" name="os.version" value="12.10"/>
@@ -3131,8 +3317,10 @@
3131
3317
  <fingerprint pattern="(?i)^Ubuntu\/precise UPnP/\S+ MiniUPnPd/(\S+)$">
3132
3318
  <description>miniupnpd on an Ubuntu precise/12.04</description>
3133
3319
  <example os.version="12.04" service.version="1.4">Ubuntu/precise UPnP/1.0 MiniUPnPd/1.4</example>
3320
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3134
3321
  <param pos="0" name="service.product" value="MiniUPnP"/>
3135
3322
  <param pos="1" name="service.version"/>
3323
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3136
3324
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3137
3325
  <param pos="0" name="os.product" value="Linux"/>
3138
3326
  <param pos="0" name="os.version" value="12.04"/>
@@ -3142,8 +3330,10 @@
3142
3330
  <fingerprint pattern="(?i)^Ubuntu\/oneiric UPnP/\S+ MiniUPnPd/(\S+)$">
3143
3331
  <description>miniupnpd on an Ubuntu oneiric/11.10</description>
3144
3332
  <example os.version="11.10" service.version="1.4">Ubuntu/oneiric UPnP/1.0 MiniUPnPd/1.4</example>
3333
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3145
3334
  <param pos="0" name="service.product" value="MiniUPnP"/>
3146
3335
  <param pos="1" name="service.version"/>
3336
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3147
3337
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3148
3338
  <param pos="0" name="os.product" value="Linux"/>
3149
3339
  <param pos="0" name="os.version" value="11.10"/>
@@ -3153,8 +3343,10 @@
3153
3343
  <fingerprint pattern="(?i)^Ubuntu\/natty UPnP/\S+ MiniUPnPd/(\S+)$">
3154
3344
  <description>miniupnpd on an Ubuntu natty/11.04</description>
3155
3345
  <example os.version="11.04" service.version="1.4">Ubuntu/natty UPnP/1.0 MiniUPnPd/1.4</example>
3346
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3156
3347
  <param pos="0" name="service.product" value="MiniUPnP"/>
3157
3348
  <param pos="1" name="service.version"/>
3349
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3158
3350
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3159
3351
  <param pos="0" name="os.product" value="Linux"/>
3160
3352
  <param pos="0" name="os.version" value="11.04"/>
@@ -3164,8 +3356,10 @@
3164
3356
  <fingerprint pattern="(?i)^Ubuntu\/maverick UPnP/\S+ MiniUPnPd/(\S+)$">
3165
3357
  <description>miniupnpd on an Ubuntu maverick/10.10</description>
3166
3358
  <example os.version="10.10" service.version="1.4">Ubuntu/maverick UPnP/1.0 MiniUPnPd/1.4</example>
3359
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3167
3360
  <param pos="0" name="service.product" value="MiniUPnP"/>
3168
3361
  <param pos="1" name="service.version"/>
3362
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3169
3363
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3170
3364
  <param pos="0" name="os.product" value="Linux"/>
3171
3365
  <param pos="0" name="os.version" value="10.10"/>
@@ -3175,8 +3369,10 @@
3175
3369
  <fingerprint pattern="(?i)^Ubuntu\/lucid UPnP/\S+ MiniUPnPd/(\S+)$">
3176
3370
  <description>miniupnpd on an Ubuntu lucid/10.04</description>
3177
3371
  <example os.version="10.04" service.version="1.4">Ubuntu/lucid UPnP/1.0 MiniUPnPd/1.4</example>
3372
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3178
3373
  <param pos="0" name="service.product" value="MiniUPnP"/>
3179
3374
  <param pos="1" name="service.version"/>
3375
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3180
3376
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3181
3377
  <param pos="0" name="os.product" value="Linux"/>
3182
3378
  <param pos="0" name="os.version" value="10.04"/>
@@ -3186,8 +3382,10 @@
3186
3382
  <fingerprint pattern="(?i)^Ubuntu\/karmic UPnP/\S+ MiniUPnPd/(\S+)$">
3187
3383
  <description>miniupnpd on an Ubuntu karmic/9.10</description>
3188
3384
  <example os.version="9.10" service.version="1.4">Ubuntu/karmic UPnP/1.0 MiniUPnPd/1.4</example>
3385
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3189
3386
  <param pos="0" name="service.product" value="MiniUPnP"/>
3190
3387
  <param pos="1" name="service.version"/>
3388
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3191
3389
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3192
3390
  <param pos="0" name="os.product" value="Linux"/>
3193
3391
  <param pos="0" name="os.version" value="9.10"/>
@@ -3197,8 +3395,10 @@
3197
3395
  <fingerprint pattern="(?i)^Ubuntu\/jaunty UPnP/\S+ MiniUPnPd/(\S+)$">
3198
3396
  <description>miniupnpd on an Ubuntu jaunty/9.04</description>
3199
3397
  <example os.version="9.04" service.version="1.4">Ubuntu/jaunty UPnP/1.0 MiniUPnPd/1.4</example>
3398
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3200
3399
  <param pos="0" name="service.product" value="MiniUPnP"/>
3201
3400
  <param pos="1" name="service.version"/>
3401
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3202
3402
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3203
3403
  <param pos="0" name="os.product" value="Linux"/>
3204
3404
  <param pos="0" name="os.version" value="9.04"/>
@@ -3208,8 +3408,10 @@
3208
3408
  <fingerprint pattern="(?i)^Ubuntu\/hardy UPnP/\S+ MiniUPnPd/(\S+)$">
3209
3409
  <description>miniupnpd on an Ubuntu hardy/8.04</description>
3210
3410
  <example os.version="8.04" service.version="1.4">Ubuntu/hardy UPnP/1.0 MiniUPnPd/1.4</example>
3411
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3211
3412
  <param pos="0" name="service.product" value="MiniUPnP"/>
3212
3413
  <param pos="1" name="service.version"/>
3414
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3213
3415
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3214
3416
  <param pos="0" name="os.product" value="Linux"/>
3215
3417
  <param pos="0" name="os.version" value="8.04"/>
@@ -3219,8 +3421,10 @@
3219
3421
  <fingerprint pattern="(?i)^Linux Mips (\S+) UPnP/\S+ MiniUPnPd/(\S+)$">
3220
3422
  <description>Linux MIPS UPnP Server</description>
3221
3423
  <example>Linux Mips 2.4.20 UPnP/1.0 MiniUPnPd/1.2</example>
3424
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3222
3425
  <param pos="0" name="service.product" value="MiniUPnP"/>
3223
3426
  <param pos="2" name="service.version"/>
3427
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3224
3428
  <param pos="0" name="os.vendor" value="Linux"/>
3225
3429
  <param pos="0" name="os.product" value="Linux"/>
3226
3430
  <param pos="1" name="os.version"/>
@@ -3234,8 +3438,10 @@
3234
3438
  <param pos="0" name="os.product" value="SmoothWall"/>
3235
3439
  <param pos="1" name="os.version"/>
3236
3440
  <param pos="0" name="os.cpe23" value="cpe:/o:smoothwall:smoothwall:{os.version}"/>
3441
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3237
3442
  <param pos="0" name="service.product" value="MiniUPnP"/>
3238
3443
  <param pos="2" name="service.version"/>
3444
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3239
3445
  </fingerprint>
3240
3446
 
3241
3447
  <fingerprint pattern="^(\S+) \d+/Service Pack \d+, UPnP/[\d\.]+, TVersity Media Server$">
@@ -3298,25 +3504,13 @@
3298
3504
 
3299
3505
  <fingerprint pattern="^Windows_7-x86-(\S+), UPnP/[\d\.]+, PMS/([\d\.]+)$">
3300
3506
  <description>PlayStation3 Media Server UPnP Server - Windows 7 x86</description>
3301
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.20</example>
3507
+ <example service.version="1.20">Windows_7-x86-6.1, UPnP/1.0, PMS/1.20</example>
3302
3508
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.22.0</example>
3303
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.25.1</example>
3304
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.51.0</example>
3305
3509
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.20.412</example>
3306
3510
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.71.0</example>
3307
3511
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.20.409</example>
3308
3512
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.72.0</example>
3309
3513
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.10.51</example>
3310
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.40.0</example>
3311
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.53.0</example>
3312
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.52.0</example>
3313
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.50.1</example>
3314
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.30.1</example>
3315
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.50.0</example>
3316
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.54.0</example>
3317
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.52.1</example>
3318
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.60.0</example>
3319
- <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.70.1</example>
3320
3514
  <param pos="0" name="service.vendor" value="Sony"/>
3321
3515
  <param pos="0" name="service.product" value="PMS"/>
3322
3516
  <param pos="2" name="service.version"/>
@@ -3422,10 +3616,59 @@
3422
3616
  <param pos="0" name="os.device" value="Router"/>
3423
3617
  </fingerprint>
3424
3618
 
3425
- <fingerprint pattern="^TBS/R2 UPnP/[\d\.]+ MiniUPnPd/[\d\.]+$">
3619
+ <fingerprint pattern="Linux, WEBACCESS/1.0, (DIR-\d+\w*) Ver (\S+)$">
3620
+ <description>D-Link DIR-XXX Router - WEBACCESS variant</description>
3621
+ <example hw.product="DIR-850L">Linux, WEBACCESS/1.0, DIR-850L Ver 1.09</example>
3622
+ <example os.version="1.14WW">Linux, WEBACCESS/1.0, DIR-850L Ver 1.14WW</example>
3623
+ <example os.version="1.04">Linux, WEBACCESS/1.0, DIR-645 Ver 1.04</example>
3624
+ <param pos="0" name="hw.vendor" value="D-Link"/>
3625
+ <param pos="1" name="hw.product"/>
3626
+ <param pos="0" name="hw.device" value="Router"/>
3627
+ <param pos="0" name="os.vendor" value="D-Link"/>
3628
+ <param pos="2" name="os.version"/>
3629
+ <param pos="0" name="os.device" value="Router"/>
3630
+ </fingerprint>
3631
+
3632
+ <fingerprint pattern="Linux, HTTP/1.1, (DIR-\d+\w*) Ver (\S+)$">
3633
+ <description>D-Link DIR-XXX Router - HTTP variant</description>
3634
+ <example hw.product="DIR-815" os.version="1.04">Linux, HTTP/1.1, DIR-815 Ver 1.04</example>
3635
+ <param pos="0" name="hw.vendor" value="D-Link"/>
3636
+ <param pos="1" name="hw.product"/>
3637
+ <param pos="0" name="hw.device" value="Router"/>
3638
+ <param pos="0" name="os.vendor" value="D-Link"/>
3639
+ <param pos="2" name="os.version"/>
3640
+ <param pos="0" name="os.device" value="Router"/>
3641
+ </fingerprint>
3642
+
3643
+ <fingerprint pattern="Linux, WEBACCESS/1.0, (DSL-\d+\w*) Ver (\S+)$">
3644
+ <description>D-Link DSL-XXX Router - WEBACCESS variant</description>
3645
+ <example hw.product="DSL-2890AL" os.version="AU_1.02.10">Linux, WEBACCESS/1.0, DSL-2890AL Ver AU_1.02.10</example>
3646
+ <example hw.product="DSL-2890AL" os.version="1.01">Linux, WEBACCESS/1.0, DSL-2890AL Ver 1.01</example>
3647
+ <param pos="0" name="hw.vendor" value="D-Link"/>
3648
+ <param pos="1" name="hw.product"/>
3649
+ <param pos="0" name="hw.device" value="Router"/>
3650
+ <param pos="0" name="os.vendor" value="D-Link"/>
3651
+ <param pos="2" name="os.version"/>
3652
+ <param pos="0" name="os.device" value="Router"/>
3653
+ </fingerprint>
3654
+
3655
+ <fingerprint pattern="^TBS/R2 UPnP/[\d\.]+ MiniUPnPd/([\d\.]+)$">
3426
3656
  <description>D-Link generic</description>
3427
- <example>TBS/R2 UPnP/1.0 MiniUPnPd/1.2</example>
3657
+ <example service.version="1.2">TBS/R2 UPnP/1.0 MiniUPnPd/1.2</example>
3428
3658
  <param pos="0" name="hw.vendor" value="D-Link"/>
3659
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3660
+ <param pos="0" name="service.product" value="MiniUPnP"/>
3661
+ <param pos="1" name="service.version"/>
3662
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3663
+ </fingerprint>
3664
+
3665
+ <fingerprint pattern="^alphapd/(\d\.[\d.]+)$">
3666
+ <description>D-Link alphapd - likely DCS series cameras</description>
3667
+ <example service.version="2.1.8">alphapd/2.1.8</example>
3668
+ <param pos="0" name="hw.vendor" value="D-Link"/>
3669
+ <param pos="0" name="service.vendor" value="D-Link"/>
3670
+ <param pos="0" name="service.product" value="alphapd"/>
3671
+ <param pos="1" name="service.version"/>
3429
3672
  </fingerprint>
3430
3673
 
3431
3674
  <fingerprint pattern="^ipos/([\d\.]+) UPnP/[\d\.]+ (TL-\w+)/(\S+)$">
@@ -3612,12 +3855,16 @@
3612
3855
  <param pos="1" name="hw.version"/>
3613
3856
  </fingerprint>
3614
3857
 
3615
- <fingerprint pattern="^Roku UPnP/\S+ MiniUPnPd/\S+$">
3858
+ <fingerprint pattern="^Roku UPnP/\S+ MiniUPnPd/([\d\.]+)$">
3616
3859
  <description>Roku without a version</description>
3617
- <example>Roku UPnP/1.0 MiniUPnPd/1.4</example>
3860
+ <example service.version="1.4">Roku UPnP/1.0 MiniUPnPd/1.4</example>
3618
3861
  <param pos="0" name="hw.vendor" value="Roku"/>
3619
3862
  <param pos="0" name="hw.product" value="Roku"/>
3620
3863
  <param pos="0" name="hw.device" value="Media Server"/>
3864
+ <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3865
+ <param pos="0" name="service.product" value="MiniUPnP"/>
3866
+ <param pos="1" name="service.version"/>
3867
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3621
3868
  </fingerprint>
3622
3869
 
3623
3870
  <fingerprint pattern="^UPnP/\S+, DLNADOC/\S+, Platinum/(\S+)$">
@@ -3833,4 +4080,103 @@
3833
4080
  <param pos="0" name="hw.device" value="Broadband router"/>
3834
4081
  </fingerprint>
3835
4082
 
4083
+ <fingerprint pattern="^IX Series IX21\d\d \(magellan-sec\) Software, Version ([^, ]+), (?:MAINTENANCE )?RELEASE SOFTWARE$">
4084
+ <description>NEC Univerge Router - enterprise class with VPN, UTM, etc</description>
4085
+ <example hw.version="10.2.20">IX Series IX2106 (magellan-sec) Software, Version 10.2.20, RELEASE SOFTWARE</example>
4086
+ <example>IX Series IX2105 (magellan-sec) Software, Version 9.6.12A, MAINTENANCE RELEASE SOFTWARE</example>
4087
+ <param pos="0" name="hw.vendor" value="NEC"/>
4088
+ <param pos="0" name="hw.product" value="Univerge"/>
4089
+ <param pos="1" name="hw.version"/>
4090
+ <param pos="0" name="hw.device" value="Router"/>
4091
+ <param pos="0" name="hw.cpe23" value="cpe:/h:nec:univerge:{hw.version}"/>
4092
+ </fingerprint>
4093
+
4094
+ <fingerprint pattern="^Caddy$">
4095
+ <description>CaddyServer Caddy - golang based httpd</description>
4096
+ <example>Caddy</example>
4097
+ <param pos="0" name="service.vendor" value="CaddyServer"/>
4098
+ <param pos="0" name="service.product" value="Caddy"/>
4099
+ <param pos="0" name="service.cpe23" value="cpe:/a:caddyserver:caddy:-"/>
4100
+ </fingerprint>
4101
+
4102
+ <fingerprint pattern="^MoxaHttp/(\d\.\d)$">
4103
+ <description>Moxa devices - service used on multiple families of devices</description>
4104
+ <example service.version="2.3">MoxaHttp/2.3</example>
4105
+ <example>MoxaHttp/2.2</example>
4106
+ <example>MoxaHttp/1.0</example>
4107
+ <param pos="0" name="service.vendor" value="Moxa"/>
4108
+ <param pos="0" name="service.product" value="httpd"/>
4109
+ <param pos="1" name="service.version"/>
4110
+ <param pos="0" name="hw.vendor" value="Moxa"/>
4111
+ <param pos="0" name="os.vendor" value="Moxa"/>
4112
+ </fingerprint>
4113
+
4114
+ <fingerprint pattern="^proxygen-bolt$">
4115
+ <description>Facebook Proxygen httpd software</description>
4116
+ <example>proxygen-bolt</example>
4117
+ <param pos="0" name="service.vendor" value="Facebook"/>
4118
+ <param pos="0" name="service.product" value="Proxygen"/>
4119
+ <param pos="0" name="service.cpe23" value="cpe:/a:facebook:proxygen:-"/>
4120
+ </fingerprint>
4121
+
4122
+ <fingerprint pattern="^Kerio Connect ([\d.]+)(?: patch (\d))?$">
4123
+ <description>GFI Kerio Connect</description>
4124
+ <example service.version="8.2.2">Kerio Connect 8.2.2</example>
4125
+ <example service.version="9.2.12" service.version.version="1">Kerio Connect 9.2.12 patch 1</example>
4126
+ <param pos="0" name="service.vendor" value="GFI"/>
4127
+ <param pos="0" name="service.product" value="Kerio Connect"/>
4128
+ <param pos="1" name="service.version"/>
4129
+ <param pos="2" name="service.version.version"/>
4130
+ </fingerprint>
4131
+
4132
+ <fingerprint pattern="^Kerio Control Embedded Web Server$">
4133
+ <description>GFI Kerio Control - embedded web server</description>
4134
+ <example>Kerio Control Embedded Web Server</example>
4135
+ <param pos="0" name="service.vendor" value="GFI"/>
4136
+ <param pos="0" name="service.product" value="Kerio Control"/>
4137
+ <param pos="0" name="service.cpe23" value="cpe:/a:gfi:kerio_control:-"/>
4138
+ </fingerprint>
4139
+
4140
+ <fingerprint pattern="^Mongoose/([\d.]+)$">
4141
+ <description>Cesanta Mongoose embedded web server / networking library</description>
4142
+ <example service.version="6.7.1">Mongoose/6.7.1</example>
4143
+ <param pos="0" name="service.vendor" value="Cesanta"/>
4144
+ <param pos="0" name="service.product" value="Mongoose"/>
4145
+ <param pos="1" name="service.version"/>
4146
+ <param pos="0" name="service.cpe23" value="cpe:/a:cesanta:mongoose:{service.version}"/>
4147
+ </fingerprint>
4148
+
4149
+ <fingerprint pattern="^kangle/([\d.]+)$">
4150
+ <description>Bangteng Kangle web server</description>
4151
+ <example service.version="3.5.21.9">kangle/3.5.21.9</example>
4152
+ <param pos="0" name="service.vendor" value="Bangteng"/>
4153
+ <param pos="0" name="service.product" value="Kangle"/>
4154
+ <param pos="1" name="service.version"/>
4155
+ </fingerprint>
4156
+
4157
+ <fingerprint pattern="^Werkzeug/([\d.]+) Python/([\d.]+)$">
4158
+ <description>PalletsProjects Werkzeug web server</description>
4159
+ <example service.version="0.14.1" python.version="3.6.9">Werkzeug/0.14.1 Python/3.6.9</example>
4160
+ <param pos="0" name="service.vendor" value="PalletsProjects"/>
4161
+ <param pos="0" name="service.product" value="Werkzeug"/>
4162
+ <param pos="1" name="service.version"/>
4163
+ <param pos="0" name="service.cpe23" value="cpe:/a:palletsprojects:werkzeug:{service.version}"/>
4164
+ <param pos="2" name="python.version"/>
4165
+ </fingerprint>
4166
+
4167
+ <!-- This is a version of ACME mini_httpd where the value 'mini_httpd' has been
4168
+ replaced with a UUID in the Server header AND body of the response. It
4169
+ is likely vendor or product specific.
4170
+ -->
4171
+
4172
+ <fingerprint pattern="^[a-f\d]{7,8}-[a-f\d]{3,4}-[a-f\d]{3,4}-[a-f\d]{3,4}-[a-f\d]{10,12}$">
4173
+ <description>ACME mini_httpd with randomized Server header</description>
4174
+ <example>a74b7cd4-4a4e-4115-7a48-1c7ebb4ae45b</example>
4175
+ <example>f09f73f0-cac6-422-3660-32ac658c5ae7</example>
4176
+ <example>f24ddd9c-e2a6-23c-ec95-4563173bbe</example>
4177
+ <param pos="0" name="service.vendor" value="ACME"/>
4178
+ <param pos="0" name="service.product" value="mini_httpd"/>
4179
+ <param pos="0" name="service.cpe23" value="cpe:/a:acme:mini_httpd:-"/>
4180
+ </fingerprint>
4181
+
3836
4182
  </fingerprints>