recog 2.3.15 → 2.3.20

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 (53) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +26 -0
  3. data/.snyk +10 -0
  4. data/LICENSE +1 -1
  5. data/bin/recog_standardize +8 -2
  6. data/cpe-remap.yaml +314 -170
  7. data/identifiers/README.md +24 -10
  8. data/identifiers/fields.txt +104 -0
  9. data/identifiers/hw_device.txt +5 -4
  10. data/identifiers/hw_family.txt +17 -0
  11. data/identifiers/hw_product.txt +87 -6
  12. data/identifiers/os_architecture.txt +0 -10
  13. data/identifiers/os_device.txt +12 -31
  14. data/identifiers/os_family.txt +2 -94
  15. data/identifiers/os_product.txt +45 -124
  16. data/identifiers/service_family.txt +14 -37
  17. data/identifiers/service_product.txt +283 -88
  18. data/identifiers/vendor.txt +99 -192
  19. data/lib/recog/version.rb +1 -1
  20. data/requirements.txt +1 -1
  21. data/update_cpes.py +110 -49
  22. data/xml/apache_modules.xml +60 -0
  23. data/xml/dns_versionbind.xml +40 -17
  24. data/xml/favicons.xml +163 -20
  25. data/xml/ftp_banners.xml +25 -25
  26. data/xml/hp_pjl_id.xml +1 -1
  27. data/xml/html_title.xml +561 -51
  28. data/xml/http_cookies.xml +266 -61
  29. data/xml/http_servers.xml +472 -96
  30. data/xml/http_wwwauth.xml +53 -26
  31. data/xml/ldap_searchresult.xml +10 -6
  32. data/xml/mdns_device-info_txt.xml +308 -10
  33. data/xml/ntp_banners.xml +15 -1
  34. data/xml/operating_system.xml +1 -0
  35. data/xml/rtsp_servers.xml +7 -0
  36. data/xml/sip_banners.xml +346 -8
  37. data/xml/sip_user_agents.xml +321 -7
  38. data/xml/smb_native_lm.xml +32 -1
  39. data/xml/smb_native_os.xml +158 -33
  40. data/xml/smtp_banners.xml +48 -7
  41. data/xml/smtp_expn.xml +1 -0
  42. data/xml/smtp_help.xml +2 -0
  43. data/xml/smtp_vrfy.xml +3 -1
  44. data/xml/snmp_sysdescr.xml +211 -42
  45. data/xml/ssh_banners.xml +127 -14
  46. data/xml/telnet_banners.xml +44 -14
  47. data/xml/tls_jarm.xml +140 -0
  48. data/xml/x509_issuers.xml +179 -7
  49. data/xml/x509_subjects.xml +252 -35
  50. metadata +6 -5
  51. data/identifiers/software_class.txt +0 -26
  52. data/identifiers/software_family.txt +0 -91
  53. data/identifiers/software_product.txt +0 -333
data/xml/http_servers.xml CHANGED
@@ -2,6 +2,85 @@
2
2
  <fingerprints matches="http_header.server" protocol="http" database_type="service" preference="0.90">
3
3
  <!-- HTTP Server headers are matched against these patterns to fingerprint HTTP servers. -->
4
4
 
5
+ <fingerprint pattern="^Mastodon$">
6
+ <description>Mastodon</description>
7
+ <example>Mastodon</example>
8
+ <param pos="0" name="service.product" value="Mastodon"/>
9
+ </fingerprint>
10
+
11
+ <fingerprint pattern="^Logitech Media Server \(([0-9.]+) - [0-9]+\)$">
12
+ <description>Logitech Media server</description>
13
+ <example service.version="7.9.3">Logitech Media Server (7.9.3 - 1586752599)</example>
14
+ <param pos="0" name="service.vendor" value="Logitech"/>
15
+ <param pos="0" name="service.product" value="Squeezebox"/>
16
+ <param pos="1" name="service.version"/>
17
+ </fingerprint>
18
+
19
+ <fingerprint pattern="^libwww-perl-daemon/([.0-9]+)$">
20
+ <description>Perl web server</description>
21
+ <example service.version="1.36">libwww-perl-daemon/1.36</example>
22
+ <param pos="0" name="service.vendor" value="Perl"/>
23
+ <param pos="0" name="service.product" value="perl"/>
24
+ <param pos="1" name="service.version"/>
25
+ <param pos="0" name="service.cpe23" value="cpe:/a:perl:perl:{service.version}"/>
26
+ </fingerprint>
27
+
28
+ <fingerprint pattern="^BASHttpd/([\d.]+)">
29
+ <description>BASHttpd</description>
30
+ <example service.version="4.3.24">BASHttpd/4.3.24-release</example>
31
+ <param pos="0" name="service.product" value="bashttpd"/>
32
+ <param pos="0" name="service.vendor" value="Avleen Vig"/>
33
+ <param pos="1" name="service.version"/>
34
+ </fingerprint>
35
+
36
+ <fingerprint pattern="^monit ([\d.]+)$">
37
+ <description>Monit</description>
38
+ <example service.version="5.6">monit 5.6</example>
39
+ <param pos="0" name="service.vendor" value="Tildeslash"/>
40
+ <param pos="0" name="service.product" value="Monit"/>
41
+ <param pos="1" name="service.version"/>
42
+ <param pos="0" name="service.cpe23" value="cpe:/a:tildeslash:monit:{service.version}"/>
43
+ </fingerprint>
44
+
45
+ <fingerprint pattern="^envoy$">
46
+ <description>Envoy Proxy Envoy</description>
47
+ <example>envoy</example>
48
+ <param pos="0" name="service.vendor" value="Envoy Proxy"/>
49
+ <param pos="0" name="service.product" value="Envoy"/>
50
+ <param pos="0" name="service.cpe23" value="cpe:/a:envoyproxy:envoy:-"/>
51
+ </fingerprint>
52
+
53
+ <fingerprint pattern="^istio-envoy$">
54
+ <description>Istio custom Envoy Proxy</description>
55
+ <example>istio-envoy</example>
56
+ <param pos="0" name="service.vendor" value="Istio"/>
57
+ <param pos="0" name="service.product" value="Envoy"/>
58
+ </fingerprint>
59
+
60
+ <fingerprint pattern="^Etherpad">
61
+ <description>Etherpad</description>
62
+ <example>Etherpad 44370f1 (http://etherpad.org)</example>
63
+ <param pos="0" name="service.vendor" value="etherpad"/>
64
+ <param pos="0" name="service.product" value="etherpad"/>
65
+ <param pos="0" name="service.cpe23" value="cpe:/a:etherpad:etherpad:-"/>
66
+ </fingerprint>
67
+
68
+ <fingerprint pattern="^Artifactory/([\d.]+)$">
69
+ <description>JFrog’s Artifactory repository management</description>
70
+ <example service.version="4.16.0">Artifactory/4.16.0</example>
71
+ <param pos="0" name="service.vendor" value="JFrog"/>
72
+ <param pos="0" name="service.product" value="Artifactory"/>
73
+ <param pos="1" name="service.version"/>
74
+ <param pos="0" name="service.cpe23" value="cpe:/a:jfrog:artifactory:{service.version}"/>
75
+ </fingerprint>
76
+
77
+ <fingerprint pattern="^Cowboy$">
78
+ <description>Cowboy HTTP server</description>
79
+ <example>Cowboy</example>
80
+ <param pos="0" name="service.vendor" value="ninenines"/>
81
+ <param pos="0" name="service.product" value="Cowboy"/>
82
+ </fingerprint>
83
+
5
84
  <fingerprint pattern="(?i)^AirTunes/([\d\.]+)$">
6
85
  <description>Apple AirTunes/AirPlay, more generally RTSP used by a variety of wireless a/v products</description>
7
86
  <example service.version="220.68">AirTunes/220.68</example>
@@ -18,6 +97,15 @@
18
97
  <param pos="0" name="service.vendor" value="cPanel"/>
19
98
  <param pos="0" name="service.product" value="cPanel Service Daemon"/>
20
99
  <param pos="1" name="service.version"/>
100
+ <param pos="0" name="service.cpe23" value="cpe:/a:cpanel:cpanel:{service.version}"/>
101
+ </fingerprint>
102
+
103
+ <fingerprint pattern="^sw-cp-server$">
104
+ <description>Plesk Control Panel Server</description>
105
+ <example>sw-cp-server</example>
106
+ <param pos="0" name="service.vendor" value="Parallels"/>
107
+ <param pos="0" name="service.product" value="Plesk"/>
108
+ <param pos="0" name="service.cpe23" value="cpe:/a:parallels:parallels_plesk_panel:-"/>
21
109
  </fingerprint>
22
110
 
23
111
  <!-- CentOS Web Panel is not part of the CentOS project and runs on CentOS,
@@ -285,6 +373,7 @@
285
373
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:10.0"/>
286
374
  <param pos="0" name="os.vendor" value="Microsoft"/>
287
375
  <param pos="0" name="os.family" value="Windows"/>
376
+ <param pos="0" name="os.certainty" value="0.5"/>
288
377
  </fingerprint>
289
378
 
290
379
  <fingerprint pattern="^Microsoft-IIS/([\d\.]+)$">
@@ -440,7 +529,7 @@
440
529
  <param pos="0" name="service.component.vendor" value="Red Hat"/>
441
530
  <param pos="0" name="service.component.product" value="JBossWeb"/>
442
531
  <param pos="2" name="service.component.version"/>
443
- <param pos="0" name="service.component.cpe23" value="cpe:/a:redhat:jboss_web_framework_kit:{service.component.version}"/>
532
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:redhat:jbossweb:{service.component.version}"/>
444
533
  </fingerprint>
445
534
 
446
535
  <fingerprint pattern="^Servlet\/[\d\.]+; JBossAS-(.*)$">
@@ -963,14 +1052,14 @@
963
1052
  <example>ReeCam IP Camera</example>
964
1053
  <param pos="0" name="hw.vendor" value="Shenzhen Reecam Tech. Ltd."/>
965
1054
  <param pos="0" name="hw.product" value="ReeCam"/>
966
- <param pos="0" name="hw.device" value="Web cam"/>
1055
+ <param pos="0" name="hw.device" value="IP Camera"/>
967
1056
  </fingerprint>
968
1057
 
969
1058
  <fingerprint pattern="^Netwave IP Camera$">
970
1059
  <description>Netwave cameras</description>
971
1060
  <example>Netwave IP Camera</example>
972
1061
  <param pos="0" name="hw.vendor" value="Netwave"/>
973
- <param pos="0" name="hw.device" value="Web cam"/>
1062
+ <param pos="0" name="hw.device" value="IP Camera"/>
974
1063
  </fingerprint>
975
1064
 
976
1065
  <fingerprint pattern="^Cougar/([0-9.]*)$">
@@ -1013,7 +1102,7 @@
1013
1102
  <example>camera</example>
1014
1103
  <example>IPCamera Login</example>
1015
1104
  <example>Mini Dome IP Camera</example>
1016
- <param pos="0" name="hw.device" value="Web cam"/>
1105
+ <param pos="0" name="hw.device" value="IP Camera"/>
1017
1106
  </fingerprint>
1018
1107
 
1019
1108
  <fingerprint pattern="^ASP.NET$">
@@ -1275,13 +1364,13 @@
1275
1364
  <param pos="0" name="service.vendor" value="HP"/>
1276
1365
  <param pos="0" name="service.product" value="iLO"/>
1277
1366
  <param pos="0" name="service.family" value="iLO"/>
1278
- <param pos="0" name="service.cpe23" value="cpe:/a:hp:integrated_lights_out:-"/>
1279
1367
  <param pos="0" name="hw.vendor" value="HP"/>
1280
1368
  <param pos="0" name="hw.device" value="Lights Out Management"/>
1281
1369
  <param pos="0" name="os.vendor" value="HP"/>
1282
1370
  <param pos="0" name="os.product" value="iLO"/>
1283
1371
  <param pos="0" name="os.family" value="iLO"/>
1284
1372
  <param pos="0" name="os.device" value="Lights Out Management"/>
1373
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_firmware:-"/>
1285
1374
  </fingerprint>
1286
1375
 
1287
1376
  <!--
@@ -1357,8 +1446,8 @@
1357
1446
  </fingerprint>
1358
1447
 
1359
1448
  <fingerprint pattern="^thttpd/(\d\.[\w.]+)-MX\s*.*$">
1360
- <description>thttpd with SSL support</description>
1361
- <example>thttpd/2.19-MX Jan 24 2006</example>
1449
+ <description>ACME thttpd with SSL support</description>
1450
+ <example service.version="2.19">thttpd/2.19-MX Jan 24 2006</example>
1362
1451
  <param pos="0" name="service.vendor" value="ACME"/>
1363
1452
  <param pos="0" name="service.product" value="thttpd"/>
1364
1453
  <param pos="0" name="service.family" value="thttpd"/>
@@ -1368,15 +1457,17 @@
1368
1457
  </fingerprint>
1369
1458
 
1370
1459
  <fingerprint pattern="^thttpd(?:/(\d\.[\w.]+)\s*.*)?$">
1371
- <description>thttpd</description>
1460
+ <description>ACME thttpd</description>
1372
1461
  <example>thttpd</example>
1373
- <example>thttpd/2.04 10aug98</example>
1374
- <example>thttpd/2.20b</example>
1462
+ <example service.version="2.04">thttpd/2.04 10aug98</example>
1463
+ <example service.version="2.20b">thttpd/2.20b</example>
1375
1464
  <example>thttpd/2.21b PHP/20030920</example>
1376
- <example>thttpd/2.23beta1 26may2002</example>
1465
+ <example service.version="2.23beta1">thttpd/2.23beta1 26may2002</example>
1466
+ <param pos="0" name="service.vendor" value="ACME"/>
1377
1467
  <param pos="0" name="service.product" value="thttpd"/>
1378
1468
  <param pos="0" name="service.family" value="thttpd"/>
1379
1469
  <param pos="1" name="service.version"/>
1470
+ <param pos="0" name="service.cpe23" value="cpe:/a:acme:thttpd:{service.version}"/>
1380
1471
  </fingerprint>
1381
1472
 
1382
1473
  <fingerprint pattern="(?i)^lighttpd(?:/(\d[\d.]+))?.*$">
@@ -1490,22 +1581,51 @@
1490
1581
 
1491
1582
  <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X1-Win32 AbyssLib/(?:\d\.[\d.]+)$">
1492
1583
  <description>Aprelium Technologies Abyss Web Server X1 (free personal edition) on Windows</description>
1493
- <example>Abyss/2.0.0.20-X1-Win32 AbyssLib/2.0.0.20</example>
1494
- <example>Abyss/2.3.2-X1-Win32 AbyssLib/2.3.2</example>
1584
+ <example service.version="2.0.0.20">Abyss/2.0.0.20-X1-Win32 AbyssLib/2.0.0.20</example>
1585
+ <example service.version="2.3.2">Abyss/2.3.2-X1-Win32 AbyssLib/2.3.2</example>
1495
1586
  <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
1496
1587
  <param pos="0" name="service.product" value="Abyss Web Server X1"/>
1497
1588
  <param pos="0" name="service.family" value="Abyss Web Server"/>
1498
1589
  <param pos="1" name="service.version"/>
1590
+ <param pos="0" name="service.cpe23" value="cpe:/a:aprelium:abyss_web_server_x1:{service.version}"/>
1499
1591
  <param pos="0" name="os.vendor" value="Microsoft"/>
1500
1592
  <param pos="0" name="os.family" value="Windows"/>
1501
1593
  <param pos="0" name="os.product" value="Windows"/>
1502
1594
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1503
1595
  </fingerprint>
1504
1596
 
1597
+ <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X1-Linux AbyssLib/(?:\d\.[\d.]+)$">
1598
+ <description>Aprelium Technologies Abyss Web Server X1 (free personal edition) on Linux</description>
1599
+ <example service.version="2.14">Abyss/2.14-X1-Linux AbyssLib/2.14</example>
1600
+ <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
1601
+ <param pos="0" name="service.product" value="Abyss Web Server X1"/>
1602
+ <param pos="0" name="service.family" value="Abyss Web Server"/>
1603
+ <param pos="1" name="service.version"/>
1604
+ <param pos="0" name="service.cpe23" value="cpe:/a:aprelium:abyss_web_server_x1:{service.version}"/>
1605
+ <param pos="0" name="os.family" value="Linux"/>
1606
+ <param pos="0" name="os.product" value="Linux"/>
1607
+ </fingerprint>
1608
+
1609
+ <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X1-[mM]acOS (?:X )?AbyssLib/(?:\d\.[\d.]+)$">
1610
+ <description>Aprelium Technologies Abyss Web Server X1 (free personal edition) on macOS</description>
1611
+ <example service.version="2.12.1">Abyss/2.12.1-X1-MacOS X AbyssLib/2.12</example>
1612
+ <example service.version="2.14">Abyss/2.14-X1-macOS AbyssLib/2.14</example>
1613
+ <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
1614
+ <param pos="0" name="service.product" value="Abyss Web Server X1"/>
1615
+ <param pos="0" name="service.family" value="Abyss Web Server"/>
1616
+ <param pos="1" name="service.version"/>
1617
+ <param pos="0" name="service.cpe23" value="cpe:/a:aprelium:abyss_web_server_x1:{service.version}"/>
1618
+ <param pos="0" name="os.vendor" value="Apple"/>
1619
+ <param pos="0" name="os.family" value="Mac OS X"/>
1620
+ <param pos="0" name="os.product" value="Mac OS X"/>
1621
+ <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
1622
+ </fingerprint>
1623
+
1505
1624
  <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X2-Win32 AbyssLib/(?:\d\.[\d.]+)$">
1506
1625
  <description>Aprelium Technologies Abyss Web Server X2 (licensed professional edition) on Windows</description>
1626
+ <example>Abyss/2.14.2-X2-Win32 AbyssLib/2.14</example>
1507
1627
  <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
1508
- <param pos="0" name="service.product" value="Abyss Web Server X1"/>
1628
+ <param pos="0" name="service.product" value="Abyss Web Server X2"/>
1509
1629
  <param pos="0" name="service.family" value="Abyss Web Server"/>
1510
1630
  <param pos="1" name="service.version"/>
1511
1631
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -1514,6 +1634,30 @@
1514
1634
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1515
1635
  </fingerprint>
1516
1636
 
1637
+ <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X2-Linux AbyssLib/(?:\d\.[\d.]+)$">
1638
+ <description>Aprelium Technologies Abyss Web Server X2 (licensed professional edition) on Linux</description>
1639
+ <example service.version="2.14.2">Abyss/2.14.2-X2-Linux AbyssLib/2.14</example>
1640
+ <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
1641
+ <param pos="0" name="service.product" value="Abyss Web Server X2"/>
1642
+ <param pos="0" name="service.family" value="Abyss Web Server"/>
1643
+ <param pos="1" name="service.version"/>
1644
+ <param pos="0" name="os.family" value="Linux"/>
1645
+ <param pos="0" name="os.product" value="Linux"/>
1646
+ </fingerprint>
1647
+
1648
+ <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X2-macOS AbyssLib/(?:\d\.[\d.]+)$">
1649
+ <description>Aprelium Technologies Abyss Web Server X2 (licensed professional edition) on macOS</description>
1650
+ <example service.version="2.14.2">Abyss/2.14.2-X2-macOS AbyssLib/2.14</example>
1651
+ <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
1652
+ <param pos="0" name="service.product" value="Abyss Web Server X2"/>
1653
+ <param pos="0" name="service.family" value="Abyss Web Server"/>
1654
+ <param pos="1" name="service.version"/>
1655
+ <param pos="0" name="os.vendor" value="Apple"/>
1656
+ <param pos="0" name="os.family" value="Mac OS X"/>
1657
+ <param pos="0" name="os.product" value="Mac OS X"/>
1658
+ <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
1659
+ </fingerprint>
1660
+
1517
1661
  <fingerprint pattern="^Microsoft (Commerce Server\s*(?:2002|2007)?, (?:Enterprise|Standard|Evaluation|Developer) Edition)$">
1518
1662
  <description>Microsoft Commerce Server</description>
1519
1663
  <param pos="0" name="service.vendor" value="Microsoft"/>
@@ -1527,6 +1671,7 @@
1527
1671
 
1528
1672
  <fingerprint pattern="^NetWare-Enterprise-Web-Server/(\d+\.\d+)$">
1529
1673
  <description>NetWare Enterprise Web Server (runs on NetWare 5.1)</description>
1674
+ <example service.version="5.1">NetWare-Enterprise-Web-Server/5.1</example>
1530
1675
  <param pos="0" name="service.vendor" value="Novell"/>
1531
1676
  <param pos="0" name="service.product" value="NetWare Enterprise Web Server"/>
1532
1677
  <param pos="0" name="service.family" value="NetWare Enterprise Web Server"/>
@@ -1693,6 +1838,7 @@
1693
1838
  <example>SAP Internet Graphics Server</example>
1694
1839
  <param pos="0" name="service.vendor" value="SAP"/>
1695
1840
  <param pos="0" name="service.product" value="Internet Graphics Server"/>
1841
+ <param pos="0" name="service.cpe23" value="cpe:/a:sap:internet_graphics_server:-"/>
1696
1842
  <param pos="0" name="service.component.vendor" value="SAP"/>
1697
1843
  <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
1698
1844
  <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
@@ -1733,7 +1879,7 @@
1733
1879
  <param pos="0" name="service.family" value="SSL-VPN"/>
1734
1880
  <param pos="0" name="os.vendor" value="SonicWall"/>
1735
1881
  <param pos="0" name="os.device" value="VPN"/>
1736
- <param pos="0" name="os.family" value="SSL-VPN"/>
1882
+ <param pos="0" name="os.family" value="SonicOS"/>
1737
1883
  <param pos="0" name="os.product" value="SonicOS"/>
1738
1884
  <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
1739
1885
  <param pos="0" name="hw.vendor" value="SonicWall"/>
@@ -1767,7 +1913,7 @@
1767
1913
  <param pos="0" name="service.product" value="NetCache"/>
1768
1914
  <param pos="1" name="service.version"/>
1769
1915
  <param pos="0" name="os.vendor" value="Blue Coat"/>
1770
- <param pos="0" name="os.device" value="Web proxy"/>
1916
+ <param pos="0" name="os.device" value="Web Proxy"/>
1771
1917
  <param pos="0" name="os.family" value="NetCache"/>
1772
1918
  <param pos="0" name="os.product" value="NetCache"/>
1773
1919
  </fingerprint>
@@ -1781,16 +1927,20 @@
1781
1927
  <param pos="0" name="os.vendor" value="NetApp"/>
1782
1928
  <param pos="0" name="os.family" value="Data ONTAP"/>
1783
1929
  <param pos="0" name="os.product" value="Data ONTAP"/>
1784
- <param pos="0" name="os.device" value="File server"/>
1785
1930
  <param pos="1" name="os.version"/>
1931
+ <param pos="0" name="os.device" value="NAS"/>
1786
1932
  <param pos="0" name="os.cpe23" value="cpe:/o:netapp:data_ontap:{os.version}"/>
1933
+ <param pos="0" name="hw.vendor" value="NetApp"/>
1934
+ <param pos="0" name="hw.family" value="Data ONTAP"/>
1935
+ <param pos="0" name="hw.device" value="NAS"/>
1936
+ <param pos="0" name="hw.product" value="Data ONTAP"/>
1787
1937
  </fingerprint>
1788
1938
 
1789
1939
  <fingerprint pattern="^BlueCoat-Security-Appliance$">
1790
1940
  <description>Blue Coat security appliance</description>
1791
1941
  <example>BlueCoat-Security-Appliance</example>
1792
1942
  <param pos="0" name="os.vendor" value="Blue Coat"/>
1793
- <param pos="0" name="os.device" value="Web proxy"/>
1943
+ <param pos="0" name="os.device" value="Web Proxy"/>
1794
1944
  <param pos="0" name="os.family" value="Blue Coat"/>
1795
1945
  <param pos="0" name="os.product" value="Appliance"/>
1796
1946
  </fingerprint>
@@ -1960,7 +2110,7 @@
1960
2110
  <param pos="0" name="os.vendor" value="Cisco"/>
1961
2111
  <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
1962
2112
  <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
1963
- <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance:-"/>
2113
+ <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:-"/>
1964
2114
  <param pos="0" name="hw.vendor" value="Cisco"/>
1965
2115
  <param pos="0" name="hw.family" value="Adaptive Security Appliance"/>
1966
2116
  <param pos="0" name="hw.product" value="Adaptive Security Appliance"/>
@@ -2085,6 +2235,7 @@
2085
2235
  <param pos="0" name="os.family" value="NetScaler"/>
2086
2236
  <param pos="0" name="os.device" value="Network Management Device"/>
2087
2237
  <param pos="0" name="os.product" value="NetScaler"/>
2238
+ <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_firmware:-"/>
2088
2239
  <param pos="0" name="service.vendor" value="Citrix"/>
2089
2240
  <param pos="0" name="service.family" value="NetScaler"/>
2090
2241
  <param pos="0" name="service.device" value="Network Management Device"/>
@@ -2153,7 +2304,7 @@
2153
2304
  <fingerprint pattern="^D-Link MiniAVServer$">
2154
2305
  <description>D-Link embedded web server for web cams</description>
2155
2306
  <param pos="0" name="os.vendor" value="D-Link"/>
2156
- <param pos="0" name="os.device" value="Web cam"/>
2307
+ <param pos="0" name="os.device" value="IP Camera"/>
2157
2308
  </fingerprint>
2158
2309
 
2159
2310
  <fingerprint pattern="^ListManagerWeb/(\S+) .*$">
@@ -2368,6 +2519,34 @@
2368
2519
  <param pos="2" name="python.version"/>
2369
2520
  </fingerprint>
2370
2521
 
2522
+ <fingerprint pattern="^Python/(\d\.[\d.]+) aiohttp/(\d[\w.]+)$">
2523
+ <description>AIOHTTP Project AIOHTTP</description>
2524
+ <example service.version="3.7.4.post0">Python/3.8 aiohttp/3.7.4.post0</example>
2525
+ <example python.version="3.4">Python/3.4 aiohttp/1.0.5</example>
2526
+ <param pos="0" name="service.vendor" value="AIOHTTP Project"/>
2527
+ <param pos="0" name="service.product" value="AIOHTTP"/>
2528
+ <param pos="2" name="service.version"/>
2529
+ <param pos="0" name="service.cpe23" value="cpe:/a:aiohttp_project:aiohttp:{service.version}"/>
2530
+ <param pos="1" name="python.version"/>
2531
+ </fingerprint>
2532
+
2533
+ <fingerprint pattern="^uvicorn$">
2534
+ <description>Encode uvicorn</description>
2535
+ <example>uvicorn</example>
2536
+ <param pos="0" name="service.vendor" value="Encode"/>
2537
+ <param pos="0" name="service.product" value="uvicorn"/>
2538
+ <param pos="0" name="service.cpe23" value="cpe:/a:encode:uvicorn:-"/>
2539
+ </fingerprint>
2540
+
2541
+ <fingerprint pattern="^Grandstream (GXP[^\s]+) ([\d\.]+)$">
2542
+ <description>Grandstream IP Phone</description>
2543
+ <example hw.product="GXP2020" hw.version="1.2.5.3">Grandstream GXP2020 1.2.5.3</example>
2544
+ <param pos="0" name="hw.vendor" value="Grandstream"/>
2545
+ <param pos="0" name="hw.device" value="VoIP"/>
2546
+ <param pos="2" name="hw.version"/>
2547
+ <param pos="1" name="hw.product"/>
2548
+ </fingerprint>
2549
+
2371
2550
  <fingerprint pattern="^HP Web Jetadmin/((?:\d+\.)*\d+)\s*(.*)$">
2372
2551
  <description>Apache variant for web access to HP printers.</description>
2373
2552
  <example>HP Web Jetadmin/2.0.50 (Win32) mod_auth_sspi/1.0.1 mod_ssl/2.0.50 OpenSSL/0.9.6m</example>
@@ -2411,6 +2590,17 @@
2411
2590
  <param pos="0" name="service.family" value="Web PN Server"/>
2412
2591
  </fingerprint>
2413
2592
 
2593
+ <fingerprint pattern="^ScreenConnect/([\d.]+)-(\d+)(?: Microsoft-HTTPAPI/2.0)?$">
2594
+ <description>ConnectWise Control formerly ScreenConnect</description>
2595
+ <example service.version="6.3.13446.6374">ScreenConnect/6.3.13446.6374-4039728469 Microsoft-HTTPAPI/2.0</example>
2596
+ <example service.version.version="3841999031">ScreenConnect/19.3.25270.7185-3841999031</example>
2597
+ <param pos="0" name="service.vendor" value="ConnectWise"/>
2598
+ <param pos="0" name="service.product" value="Control"/>
2599
+ <param pos="1" name="service.version"/>
2600
+ <param pos="2" name="service.version.version"/>
2601
+ <param pos="0" name="service.cpe23" value="cpe:/a:connectwise:control:{service.version}"/>
2602
+ </fingerprint>
2603
+
2414
2604
  <fingerprint pattern="^Lotus Expeditor Web Container/((?:\d+\.)*\d+)$">
2415
2605
  <description>Expeditor is a framework used by IBM in many products in the Lotus brand, such as Sametime and Notes.</description>
2416
2606
  <example>Lotus Expeditor Web Container/6.1</example>
@@ -2529,6 +2719,19 @@
2529
2719
  <param pos="0" name="service.product" value="Twisted Web"/>
2530
2720
  <param pos="0" name="service.family" value="Twisted Web"/>
2531
2721
  <param pos="1" name="service.version"/>
2722
+ <param pos="0" name="service.cpe23" value="cpe:/a:twistedmatrix:twistedweb:{service.version}"/>
2723
+ </fingerprint>
2724
+
2725
+ <fingerprint pattern="^Twisted/([\d.]+) TwistedWeb/([\d.]+)$">
2726
+ <description>Twisted Matrix Labs - TwistedWeb - verbose variant</description>
2727
+ <example service.version="13.0.0">Twisted/13.0.0 TwistedWeb/9.0.0</example>
2728
+ <example service.version.version="9.0.0">Twisted/17.9.0 TwistedWeb/9.0.0</example>
2729
+ <param pos="0" name="service.vendor" value="TwistedMatrix"/>
2730
+ <param pos="0" name="service.product" value="Twisted Web"/>
2731
+ <param pos="0" name="service.family" value="Twisted Web"/>
2732
+ <param pos="1" name="service.version"/>
2733
+ <param pos="2" name="service.version.version"/>
2734
+ <param pos="0" name="service.cpe23" value="cpe:/a:twistedmatrix:twistedweb:{service.version}"/>
2532
2735
  </fingerprint>
2533
2736
 
2534
2737
  <fingerprint pattern="^mini_httpd/((?:\d+\.)*\d+) \S*$">
@@ -2583,7 +2786,7 @@
2583
2786
  <param pos="0" name="service.family" value="emHTTPD"/>
2584
2787
  <param pos="1" name="service.version"/>
2585
2788
  <param pos="0" name="os.vendor" value="Microplex"/>
2586
- <param pos="0" name="os.device" value="Print server"/>
2789
+ <param pos="0" name="os.device" value="Print Server"/>
2587
2790
  </fingerprint>
2588
2791
 
2589
2792
  <fingerprint pattern="^UPS_Server/((?:\d+\.)*\d+)$">
@@ -2646,10 +2849,13 @@
2646
2849
  <fingerprint pattern="^PanWeb Server/ -">
2647
2850
  <description>HTTP and HTTPS server found on Palo Alto Networks devices</description>
2648
2851
  <example>PanWeb Server/ -</example>
2852
+ <param pos="0" name="hw.vendor" value="Palo Alto Networks"/>
2649
2853
  <param pos="0" name="service.vendor" value="Palo Alto Networks"/>
2650
2854
  <param pos="0" name="service.product" value="PA Firewall"/>
2855
+ <param pos="0" name="service.device" value="Firewall"/>
2651
2856
  <param pos="0" name="os.vendor" value="Palo Alto Networks"/>
2652
- <param pos="0" name="os.product" value="PA Firewall"/>
2857
+ <param pos="0" name="os.product" value="PAN-OS"/>
2858
+ <param pos="0" name="os.family" value="PAN-OS"/>
2653
2859
  <param pos="0" name="os.device" value="Firewall"/>
2654
2860
  <param pos="0" name="os.cpe23" value="cpe:/o:paloaltonetworks:pan-os:-"/>
2655
2861
  </fingerprint>
@@ -2768,8 +2974,8 @@
2768
2974
 
2769
2975
  -->
2770
2976
 
2771
- <fingerprint pattern="^(?:(?:\d+.){3}\d+):\d{1,4}$">
2772
- <description>A banner consisting of an IP address and port -- assert nothing.</description>
2977
+ <fingerprint pattern="^(?:(?:\d{1,3}\.){3}\d{1,3}):\d{1,4}$">
2978
+ <description>A banner consisting of an IPv4 address and port -- assert nothing.</description>
2773
2979
  <example>192.168.0.4:9999</example>
2774
2980
  </fingerprint>
2775
2981
 
@@ -2785,21 +2991,27 @@
2785
2991
 
2786
2992
  <!-- Service provider equipment (CDNs, etc) -->
2787
2993
 
2788
- <fingerprint pattern="^AkamaiGHost$">
2994
+ <fingerprint pattern="^(?:Akamai)?GHost$">
2789
2995
  <description>Akamai Global Host</description>
2790
2996
  <example>AkamaiGHost</example>
2997
+ <example>GHost</example>
2791
2998
  <param pos="0" name="service.vendor" value="Akamai"/>
2792
2999
  <param pos="0" name="service.product" value="GHost"/>
3000
+ <param pos="0" name="service.cpe23" value="cpe:/a:akamai:akamaighost:-"/>
2793
3001
  <param pos="0" name="os.vendor" value="Akamai"/>
2794
- <param pos="0" name="os.device" value="Web proxy"/>
3002
+ <param pos="0" name="os.family" value="Linux"/>
3003
+ <param pos="0" name="os.device" value="Web Proxy"/>
2795
3004
  </fingerprint>
2796
3005
 
3006
+ <!-- Banner used for many Google services such as search, Gmail, etc. -->
3007
+
2797
3008
  <fingerprint pattern="^gws$">
2798
3009
  <description>Google Web Services</description>
2799
3010
  <example>gws</example>
2800
3011
  <param pos="0" name="service.vendor" value="Google"/>
2801
- <param pos="0" name="service.product" value="Google Web Services"/>
2802
3012
  <param pos="0" name="service.family" value="Google Web Server"/>
3013
+ <param pos="0" name="service.product" value="Google Web Services"/>
3014
+ <param pos="0" name="service.cpe23" value="cpe:/a:google:web_server:-"/>
2803
3015
  </fingerprint>
2804
3016
 
2805
3017
  <fingerprint pattern="^GFE/((?:\d+\.)*\d+)$">
@@ -2807,8 +3019,8 @@
2807
3019
  <example>GFE/1.3</example>
2808
3020
  <example>GFE/1</example>
2809
3021
  <param pos="0" name="service.vendor" value="Google"/>
2810
- <param pos="0" name="service.product" value="Google Front End"/>
2811
3022
  <param pos="0" name="service.family" value="Google Web Server"/>
3023
+ <param pos="0" name="service.product" value="Google Front End"/>
2812
3024
  <param pos="1" name="service.version"/>
2813
3025
  </fingerprint>
2814
3026
 
@@ -2816,8 +3028,9 @@
2816
3028
  <description>Amazon CloudFront web load balancer endpoint</description>
2817
3029
  <example>CloudFront</example>
2818
3030
  <param pos="0" name="service.vendor" value="Amazon"/>
3031
+ <param pos="0" name="service.family" value="Web Services"/>
2819
3032
  <param pos="0" name="service.product" value="CloudFront Load Balancer"/>
2820
- <param pos="0" name="service.family" value="CloudFront"/>
3033
+ <param pos="0" name="service.cpe23" value="cpe:/a:amazon:amazon_cloudfront:-"/>
2821
3034
  </fingerprint>
2822
3035
 
2823
3036
  <fingerprint pattern="^Amazon-Cloud-Drive$">
@@ -2831,13 +3044,16 @@
2831
3044
  <description>Amazon S3 (Simple Cloud Storage Service)</description>
2832
3045
  <example>AmazonS3</example>
2833
3046
  <param pos="0" name="service.vendor" value="Amazon"/>
3047
+ <param pos="0" name="service.family" value="Web Services"/>
2834
3048
  <param pos="0" name="service.product" value="S3"/>
3049
+ <param pos="0" name="service.cpe23" value="cpe:/a:amazon:amazon_simple_storage_service:-"/>
2835
3050
  </fingerprint>
2836
3051
 
2837
3052
  <fingerprint pattern="^Amazon SimpleDB$">
2838
3053
  <description>Amazon SimpleDB / Simple Database Service</description>
2839
3054
  <example>Amazon SimpleDB</example>
2840
3055
  <param pos="0" name="service.vendor" value="Amazon"/>
3056
+ <param pos="0" name="service.family" value="Web Services"/>
2841
3057
  <param pos="0" name="service.product" value="SimpleDB"/>
2842
3058
  </fingerprint>
2843
3059
 
@@ -2845,6 +3061,7 @@
2845
3061
  <description>Amazon Snowball</description>
2846
3062
  <example>AmazonSnowball</example>
2847
3063
  <param pos="0" name="service.vendor" value="Amazon"/>
3064
+ <param pos="0" name="service.family" value="Web Services"/>
2848
3065
  <param pos="0" name="service.product" value="Snowball"/>
2849
3066
  </fingerprint>
2850
3067
 
@@ -2852,8 +3069,10 @@
2852
3069
  <description>Amazon Elastic Load Balancing</description>
2853
3070
  <example service.version="2.0">awselb/2.0</example>
2854
3071
  <param pos="0" name="service.vendor" value="Amazon"/>
2855
- <param pos="0" name="service.family" value="Elastic Load Balancing"/>
3072
+ <param pos="0" name="service.family" value="Web Services"/>
3073
+ <param pos="0" name="service.product" value="Elastic Load Balancing"/>
2856
3074
  <param pos="1" name="service.version"/>
3075
+ <param pos="0" name="service.cpe23" value="cpe:/a:amazon:elastic_load_balancing:{service.version}"/>
2857
3076
  </fingerprint>
2858
3077
 
2859
3078
  <fingerprint pattern="^cloudflare(?:-nginx)?$">
@@ -2863,6 +3082,7 @@
2863
3082
  <param pos="0" name="service.vendor" value="CloudFlare"/>
2864
3083
  <param pos="0" name="service.product" value="CloudFlare Load Balancer"/>
2865
3084
  <param pos="0" name="service.family" value="CloudFlare"/>
3085
+ <param pos="0" name="service.cpe23" value="cpe:/a:cloudflare:load_balancing:-"/>
2866
3086
  </fingerprint>
2867
3087
 
2868
3088
  <fingerprint pattern="^gSOAP/([\d\.]+)$">
@@ -2925,6 +3145,7 @@
2925
3145
  <param pos="0" name="service.product" value="Intel(R) Active Management Technology"/>
2926
3146
  <param pos="0" name="service.family" value="Intel(R) Active Management Technology"/>
2927
3147
  <param pos="1" name="service.version"/>
3148
+ <param pos="0" name="service.cpe23" value="cpe:/a:intel:active_management_technology:{service.version}"/>
2928
3149
  </fingerprint>
2929
3150
 
2930
3151
  <fingerprint pattern="^(?:AMT|Intel\(R\) Active Management Technology)$">
@@ -2934,6 +3155,7 @@
2934
3155
  <param pos="0" name="service.vendor" value="Intel"/>
2935
3156
  <param pos="0" name="service.product" value="Intel(R) Active Management Technology"/>
2936
3157
  <param pos="0" name="service.family" value="Intel(R) Active Management Technology"/>
3158
+ <param pos="0" name="service.cpe23" value="cpe:/a:intel:active_management_technology:-"/>
2937
3159
  </fingerprint>
2938
3160
 
2939
3161
  <fingerprint pattern="^Intel\(R\) Standard Manageability\s(\d+\.\d+\.\d+\.\d+|\d+\.\d+\.\d+|\d+\.\d+)">
@@ -2944,6 +3166,7 @@
2944
3166
  <param pos="0" name="service.product" value="Intel(R) Standard Manageability"/>
2945
3167
  <param pos="0" name="service.family" value="Intel(R) Active Management Technology"/>
2946
3168
  <param pos="1" name="service.version"/>
3169
+ <param pos="0" name="service.cpe23" value="cpe:/a:intel:standard_manageability:{service.version}"/>
2947
3170
  </fingerprint>
2948
3171
 
2949
3172
  <fingerprint pattern="^Sunny WebBox$">
@@ -2955,7 +3178,7 @@
2955
3178
  <param pos="0" name="hw.vendor" value="SMA"/>
2956
3179
  <param pos="0" name="hw.family" value="Sunny"/>
2957
3180
  <param pos="0" name="hw.product" value="Sunny WebBox"/>
2958
- <param pos="0" name="hw.device" value="Power device"/>
3181
+ <param pos="0" name="hw.device" value="Power Device"/>
2959
3182
  <param pos="0" name="hw.cpe23" value="cpe:/h:sma:sunny_webbox:-"/>
2960
3183
  <param pos="0" name="os.vendor" value="Microsoft"/>
2961
3184
  <param pos="0" name="os.family" value="Windows"/>
@@ -2968,7 +3191,7 @@
2968
3191
  <example>EnergyICT RTU 101-F25CE1-1524</example>
2969
3192
  <param pos="0" name="hw.family" value="Honeywell"/>
2970
3193
  <param pos="0" name="hw.product" value="RTU"/>
2971
- <param pos="0" name="hw.device" value="Power device"/>
3194
+ <param pos="0" name="hw.device" value="Power Device"/>
2972
3195
  </fingerprint>
2973
3196
 
2974
3197
  <fingerprint pattern="^AV-TECH AV787 Video Web Server$">
@@ -3013,6 +3236,7 @@
3013
3236
  <param pos="0" name="service.family" value="Gateway"/>
3014
3237
  <param pos="0" name="service.product" value="Gateway"/>
3015
3238
  <param pos="1" name="service.version"/>
3239
+ <param pos="0" name="service.cpe23" value="cpe:/a:konghq:kong_gateway:{service.version}"/>
3016
3240
  </fingerprint>
3017
3241
 
3018
3242
  <fingerprint pattern="^kong/([\d.-]+)-enterprise-edition$">
@@ -3023,6 +3247,7 @@
3023
3247
  <param pos="0" name="service.family" value="Gateway"/>
3024
3248
  <param pos="0" name="service.product" value="Gateway"/>
3025
3249
  <param pos="1" name="service.version"/>
3250
+ <param pos="0" name="service.cpe23" value="cpe:/a:konghq:kong_gateway:{service.version}"/>
3026
3251
  </fingerprint>
3027
3252
 
3028
3253
  <!-- Tridium previously had a product with the 'Niagra' spelling -->
@@ -3068,15 +3293,26 @@
3068
3293
  <param pos="1" name="host.name"/>
3069
3294
  </fingerprint>
3070
3295
 
3296
+ <fingerprint pattern="^airCube$">
3297
+ <description>Ubiquiti airMAX airCube accessory</description>
3298
+ <example>airCube</example>
3299
+ <param pos="0" name="os.vendor" value="Ubiquiti"/>
3300
+ <param pos="0" name="os.family" value="Linux"/>
3301
+ <param pos="0" name="hw.vendor" value="Ubiquiti"/>
3302
+ <param pos="0" name="hw.family" value="airMAX"/>
3303
+ <param pos="0" name="hw.product" value="airCube"/>
3304
+ <param pos="0" name="hw.device" value="WAP"/>
3305
+ </fingerprint>
3306
+
3071
3307
  <fingerprint pattern="(?i)^Linux/(\S+) UPnP/[\d\.]+ miniupnpd/([\d\.]+)$">
3072
3308
  <description>Linux MiniUPnPd UPnP Server</description>
3073
3309
  <example service.version="1.0">Linux/Cross_compiled UPnP/1.0 miniupnpd/1.0</example>
3074
3310
  <example>Linux/2.6.29.6-217.2.3.fc11.i686.PAE UPnP/1.0 miniupnpd/1.0</example>
3075
3311
  <example>Linux/2.4.21 UPnP/1.0 miniupnpd/1.0</example>
3076
3312
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3077
- <param pos="0" name="service.product" value="MiniUPnP"/>
3313
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3078
3314
  <param pos="2" name="service.version"/>
3079
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3315
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3080
3316
  <param pos="0" name="os.vendor" value="Linux"/>
3081
3317
  <param pos="0" name="os.product" value="Linux"/>
3082
3318
  <param pos="1" name="os.version"/>
@@ -3087,18 +3323,18 @@
3087
3323
  <description>Tomato UPnP Server</description>
3088
3324
  <example service.version="1.2">Tomato UPnP/1.0 MiniUPnPd/1.2</example>
3089
3325
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3090
- <param pos="0" name="service.product" value="MiniUPnP"/>
3326
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3091
3327
  <param pos="1" name="service.version"/>
3092
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3328
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3093
3329
  </fingerprint>
3094
3330
 
3095
3331
  <fingerprint pattern="(?i)^(RT-\w+) UPnP/\S+ MiniUPnPd/([\d.]+)$">
3096
3332
  <description>Asus WAP UPnP Server</description>
3097
3333
  <example service.version="1.2">RT-G32 UPnP/1.0 MiniUPnPd/1.2</example>
3098
3334
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3099
- <param pos="0" name="service.product" value="MiniUPnP"/>
3335
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3100
3336
  <param pos="2" name="service.version"/>
3101
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3337
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3102
3338
  <param pos="0" name="os.vendor" value="Asus"/>
3103
3339
  <param pos="1" name="os.product"/>
3104
3340
  <param pos="0" name="os.device" value="WAP"/>
@@ -3108,9 +3344,9 @@
3108
3344
  <description>DrayTek Vigor router UPnP Server</description>
3109
3345
  <example service.version="1.0" hw.model="2130">DrayTek/Vigor2130 UPnP/1.0 miniupnpd/1.0</example>
3110
3346
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3111
- <param pos="0" name="service.product" value="MiniUPnP"/>
3347
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3112
3348
  <param pos="2" name="service.version"/>
3113
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3349
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3114
3350
  <param pos="0" name="hw.vendor" value="DrayTek"/>
3115
3351
  <param pos="0" name="hw.product" value="Vigor"/>
3116
3352
  <param pos="1" name="hw.model"/>
@@ -3121,16 +3357,16 @@
3121
3357
  <description>Huawei Echolife / Home Gateway (and possibly other) devices with UPnP</description>
3122
3358
  <example>Linux UPnP/1.0 Huawei-ATP-IGD</example>
3123
3359
  <param pos="0" name="hw.vendor" value="Huawei"/>
3124
- <param pos="0" name="hw.device" value="Broadband router"/>
3360
+ <param pos="0" name="hw.device" value="Broadband Router"/>
3125
3361
  </fingerprint>
3126
3362
 
3127
3363
  <fingerprint pattern="(?i)^OpenWRT/kamikaze UPnP/\S+ MiniUPnPd/([\d.]+)$">
3128
3364
  <description>OpenWRT Kamikaze WAP UPnP Server</description>
3129
3365
  <example service.version="1.5">OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.5</example>
3130
3366
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3131
- <param pos="0" name="service.product" value="MiniUPnP"/>
3367
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3132
3368
  <param pos="1" name="service.version"/>
3133
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3369
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3134
3370
  <param pos="0" name="os.vendor" value="Linux"/>
3135
3371
  <param pos="0" name="os.family" value="OpenWRT"/>
3136
3372
  <param pos="0" name="os.product" value="Kamikaze"/>
@@ -3141,9 +3377,9 @@
3141
3377
  <description>Netgear DG834G or WNDR3300 WAP UPnP Server</description>
3142
3378
  <example service.version="1.0">Netgear/1.0 UPnP/1.0 miniupnpd/1.0</example>
3143
3379
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3144
- <param pos="0" name="service.product" value="MiniUPnP"/>
3380
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3145
3381
  <param pos="1" name="service.version"/>
3146
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3382
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3147
3383
  <param pos="0" name="os.vendor" value="Netgear"/>
3148
3384
  <param pos="0" name="os.device" value="WAP"/>
3149
3385
  <param pos="0" name="hw.vendor" value="Netgear"/>
@@ -3168,9 +3404,9 @@
3168
3404
  <example os.version="wheezy/sid" service.version="1.8">Debian/wheezy/sid UPnP/1.1 MiniUPnPd/1.8</example>
3169
3405
  <example os.version="4.0" service.version="1.0">Debian/4.0 UPnP/1.0 miniupnpd/1.0</example>
3170
3406
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3171
- <param pos="0" name="service.product" value="MiniUPnP"/>
3407
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3172
3408
  <param pos="2" name="service.version"/>
3173
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3409
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3174
3410
  <param pos="0" name="os.vendor" value="Debian"/>
3175
3411
  <param pos="0" name="os.product" value="Linux"/>
3176
3412
  <param pos="0" name="os.certainty" value="0.5"/>
@@ -3184,9 +3420,9 @@
3184
3420
  <example os.version="8" service.version="1.0">Fedora/8 UPnP/1.0 miniupnpd/1.0</example>
3185
3421
  <example os.version="6" service.version="1.0">FedoraCore/6 UPnP/1.0 miniupnpd/1.0</example>
3186
3422
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3187
- <param pos="0" name="service.product" value="MiniUPnP"/>
3423
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3188
3424
  <param pos="2" name="service.version"/>
3189
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3425
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3190
3426
  <param pos="0" name="os.family" value="Linux"/>
3191
3427
  <param pos="0" name="os.vendor" value="Red Hat"/>
3192
3428
  <param pos="0" name="os.product" value="Fedora Core Linux"/>
@@ -3201,9 +3437,9 @@
3201
3437
  <example os.version="7.10" service.version="1.0">Ubuntu/7.10 UPnP/1.0 miniupnpd/1.0</example>
3202
3438
  <example os.version="9.04" service.version="1.0">Ubuntu/9.04 UPnP/1.0 miniupnpd/1.0</example>
3203
3439
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3204
- <param pos="0" name="service.product" value="MiniUPnP"/>
3440
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3205
3441
  <param pos="2" name="service.version"/>
3206
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3442
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3207
3443
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3208
3444
  <param pos="0" name="os.product" value="Linux"/>
3209
3445
  <param pos="1" name="os.version"/>
@@ -3214,9 +3450,9 @@
3214
3450
  <description>miniupnpd on an Ubuntu bionic/18.04</description>
3215
3451
  <example os.version="18.04" service.version="1.4">Ubuntu/bionic UPnP/1.0 MiniUPnPd/1.4</example>
3216
3452
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3217
- <param pos="0" name="service.product" value="MiniUPnP"/>
3453
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3218
3454
  <param pos="1" name="service.version"/>
3219
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3455
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3220
3456
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3221
3457
  <param pos="0" name="os.product" value="Linux"/>
3222
3458
  <param pos="0" name="os.version" value="18.04"/>
@@ -3227,9 +3463,9 @@
3227
3463
  <description>miniupnpd on an Ubuntu yakkety/16.10</description>
3228
3464
  <example os.version="16.10" service.version="1.4">Ubuntu/yakkety UPnP/1.0 MiniUPnPd/1.4</example>
3229
3465
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3230
- <param pos="0" name="service.product" value="MiniUPnP"/>
3466
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3231
3467
  <param pos="1" name="service.version"/>
3232
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3468
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3233
3469
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3234
3470
  <param pos="0" name="os.product" value="Linux"/>
3235
3471
  <param pos="0" name="os.version" value="16.10"/>
@@ -3240,9 +3476,9 @@
3240
3476
  <description>miniupnpd on an Ubuntu xenial/16.04</description>
3241
3477
  <example os.version="16.04" service.version="1.4">Ubuntu/xenial UPnP/1.0 MiniUPnPd/1.4</example>
3242
3478
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3243
- <param pos="0" name="service.product" value="MiniUPnP"/>
3479
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3244
3480
  <param pos="1" name="service.version"/>
3245
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3481
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3246
3482
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3247
3483
  <param pos="0" name="os.product" value="Linux"/>
3248
3484
  <param pos="0" name="os.version" value="16.04"/>
@@ -3253,9 +3489,9 @@
3253
3489
  <description>miniupnpd on an Ubuntu utopic/14.10</description>
3254
3490
  <example os.version="14.10" service.version="1.4">Ubuntu/utopic UPnP/1.0 MiniUPnPd/1.4</example>
3255
3491
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3256
- <param pos="0" name="service.product" value="MiniUPnP"/>
3492
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3257
3493
  <param pos="1" name="service.version"/>
3258
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3494
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3259
3495
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3260
3496
  <param pos="0" name="os.product" value="Linux"/>
3261
3497
  <param pos="0" name="os.version" value="14.10"/>
@@ -3266,9 +3502,9 @@
3266
3502
  <description>miniupnpd on an Ubuntu trusty/14.04</description>
3267
3503
  <example os.version="14.04" service.version="1.4">Ubuntu/trusty UPnP/1.0 MiniUPnPd/1.4</example>
3268
3504
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3269
- <param pos="0" name="service.product" value="MiniUPnP"/>
3505
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3270
3506
  <param pos="1" name="service.version"/>
3271
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3507
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3272
3508
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3273
3509
  <param pos="0" name="os.product" value="Linux"/>
3274
3510
  <param pos="0" name="os.version" value="14.04"/>
@@ -3279,9 +3515,9 @@
3279
3515
  <description>miniupnpd on an Ubuntu saucy/13.10</description>
3280
3516
  <example os.version="13.10" service.version="1.4">Ubuntu/saucy UPnP/1.0 MiniUPnPd/1.4</example>
3281
3517
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3282
- <param pos="0" name="service.product" value="MiniUPnP"/>
3518
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3283
3519
  <param pos="1" name="service.version"/>
3284
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3520
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3285
3521
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3286
3522
  <param pos="0" name="os.product" value="Linux"/>
3287
3523
  <param pos="0" name="os.version" value="13.10"/>
@@ -3292,9 +3528,9 @@
3292
3528
  <description>miniupnpd on an Ubuntu raring/13.04</description>
3293
3529
  <example os.version="13.04" service.version="1.4">Ubuntu/raring UPnP/1.0 MiniUPnPd/1.4</example>
3294
3530
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3295
- <param pos="0" name="service.product" value="MiniUPnP"/>
3531
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3296
3532
  <param pos="1" name="service.version"/>
3297
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3533
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3298
3534
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3299
3535
  <param pos="0" name="os.product" value="Linux"/>
3300
3536
  <param pos="0" name="os.version" value="13.04"/>
@@ -3305,9 +3541,9 @@
3305
3541
  <description>miniupnpd on an Ubuntu quantal/12.10</description>
3306
3542
  <example os.version="12.10" service.version="1.4">Ubuntu/quantal UPnP/1.0 MiniUPnPd/1.4</example>
3307
3543
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3308
- <param pos="0" name="service.product" value="MiniUPnP"/>
3544
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3309
3545
  <param pos="1" name="service.version"/>
3310
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3546
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3311
3547
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3312
3548
  <param pos="0" name="os.product" value="Linux"/>
3313
3549
  <param pos="0" name="os.version" value="12.10"/>
@@ -3318,9 +3554,9 @@
3318
3554
  <description>miniupnpd on an Ubuntu precise/12.04</description>
3319
3555
  <example os.version="12.04" service.version="1.4">Ubuntu/precise UPnP/1.0 MiniUPnPd/1.4</example>
3320
3556
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3321
- <param pos="0" name="service.product" value="MiniUPnP"/>
3557
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3322
3558
  <param pos="1" name="service.version"/>
3323
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3559
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3324
3560
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3325
3561
  <param pos="0" name="os.product" value="Linux"/>
3326
3562
  <param pos="0" name="os.version" value="12.04"/>
@@ -3331,9 +3567,9 @@
3331
3567
  <description>miniupnpd on an Ubuntu oneiric/11.10</description>
3332
3568
  <example os.version="11.10" service.version="1.4">Ubuntu/oneiric UPnP/1.0 MiniUPnPd/1.4</example>
3333
3569
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3334
- <param pos="0" name="service.product" value="MiniUPnP"/>
3570
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3335
3571
  <param pos="1" name="service.version"/>
3336
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3572
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3337
3573
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3338
3574
  <param pos="0" name="os.product" value="Linux"/>
3339
3575
  <param pos="0" name="os.version" value="11.10"/>
@@ -3344,9 +3580,9 @@
3344
3580
  <description>miniupnpd on an Ubuntu natty/11.04</description>
3345
3581
  <example os.version="11.04" service.version="1.4">Ubuntu/natty UPnP/1.0 MiniUPnPd/1.4</example>
3346
3582
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3347
- <param pos="0" name="service.product" value="MiniUPnP"/>
3583
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3348
3584
  <param pos="1" name="service.version"/>
3349
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3585
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3350
3586
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3351
3587
  <param pos="0" name="os.product" value="Linux"/>
3352
3588
  <param pos="0" name="os.version" value="11.04"/>
@@ -3357,9 +3593,9 @@
3357
3593
  <description>miniupnpd on an Ubuntu maverick/10.10</description>
3358
3594
  <example os.version="10.10" service.version="1.4">Ubuntu/maverick UPnP/1.0 MiniUPnPd/1.4</example>
3359
3595
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3360
- <param pos="0" name="service.product" value="MiniUPnP"/>
3596
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3361
3597
  <param pos="1" name="service.version"/>
3362
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3598
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3363
3599
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3364
3600
  <param pos="0" name="os.product" value="Linux"/>
3365
3601
  <param pos="0" name="os.version" value="10.10"/>
@@ -3370,9 +3606,9 @@
3370
3606
  <description>miniupnpd on an Ubuntu lucid/10.04</description>
3371
3607
  <example os.version="10.04" service.version="1.4">Ubuntu/lucid UPnP/1.0 MiniUPnPd/1.4</example>
3372
3608
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3373
- <param pos="0" name="service.product" value="MiniUPnP"/>
3609
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3374
3610
  <param pos="1" name="service.version"/>
3375
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3611
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3376
3612
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3377
3613
  <param pos="0" name="os.product" value="Linux"/>
3378
3614
  <param pos="0" name="os.version" value="10.04"/>
@@ -3383,9 +3619,9 @@
3383
3619
  <description>miniupnpd on an Ubuntu karmic/9.10</description>
3384
3620
  <example os.version="9.10" service.version="1.4">Ubuntu/karmic UPnP/1.0 MiniUPnPd/1.4</example>
3385
3621
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3386
- <param pos="0" name="service.product" value="MiniUPnP"/>
3622
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3387
3623
  <param pos="1" name="service.version"/>
3388
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3624
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3389
3625
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3390
3626
  <param pos="0" name="os.product" value="Linux"/>
3391
3627
  <param pos="0" name="os.version" value="9.10"/>
@@ -3396,9 +3632,9 @@
3396
3632
  <description>miniupnpd on an Ubuntu jaunty/9.04</description>
3397
3633
  <example os.version="9.04" service.version="1.4">Ubuntu/jaunty UPnP/1.0 MiniUPnPd/1.4</example>
3398
3634
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3399
- <param pos="0" name="service.product" value="MiniUPnP"/>
3635
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3400
3636
  <param pos="1" name="service.version"/>
3401
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3637
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3402
3638
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3403
3639
  <param pos="0" name="os.product" value="Linux"/>
3404
3640
  <param pos="0" name="os.version" value="9.04"/>
@@ -3409,9 +3645,9 @@
3409
3645
  <description>miniupnpd on an Ubuntu hardy/8.04</description>
3410
3646
  <example os.version="8.04" service.version="1.4">Ubuntu/hardy UPnP/1.0 MiniUPnPd/1.4</example>
3411
3647
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3412
- <param pos="0" name="service.product" value="MiniUPnP"/>
3648
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3413
3649
  <param pos="1" name="service.version"/>
3414
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3650
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3415
3651
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3416
3652
  <param pos="0" name="os.product" value="Linux"/>
3417
3653
  <param pos="0" name="os.version" value="8.04"/>
@@ -3422,9 +3658,9 @@
3422
3658
  <description>Linux MIPS UPnP Server</description>
3423
3659
  <example>Linux Mips 2.4.20 UPnP/1.0 MiniUPnPd/1.2</example>
3424
3660
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3425
- <param pos="0" name="service.product" value="MiniUPnP"/>
3661
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3426
3662
  <param pos="2" name="service.version"/>
3427
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3663
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3428
3664
  <param pos="0" name="os.vendor" value="Linux"/>
3429
3665
  <param pos="0" name="os.product" value="Linux"/>
3430
3666
  <param pos="1" name="os.version"/>
@@ -3439,9 +3675,9 @@
3439
3675
  <param pos="1" name="os.version"/>
3440
3676
  <param pos="0" name="os.cpe23" value="cpe:/o:smoothwall:smoothwall:{os.version}"/>
3441
3677
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3442
- <param pos="0" name="service.product" value="MiniUPnP"/>
3678
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3443
3679
  <param pos="2" name="service.version"/>
3444
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3680
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3445
3681
  </fingerprint>
3446
3682
 
3447
3683
  <fingerprint pattern="^(\S+) \d+/Service Pack \d+, UPnP/[\d\.]+, TVersity Media Server$">
@@ -3657,9 +3893,9 @@
3657
3893
  <example service.version="1.2">TBS/R2 UPnP/1.0 MiniUPnPd/1.2</example>
3658
3894
  <param pos="0" name="hw.vendor" value="D-Link"/>
3659
3895
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3660
- <param pos="0" name="service.product" value="MiniUPnP"/>
3896
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3661
3897
  <param pos="1" name="service.version"/>
3662
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
3898
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3663
3899
  </fingerprint>
3664
3900
 
3665
3901
  <fingerprint pattern="^alphapd/(\d\.[\d.]+)$">
@@ -3691,6 +3927,16 @@
3691
3927
  <param pos="0" name="os.device" value="WAP"/>
3692
3928
  </fingerprint>
3693
3929
 
3930
+ <fingerprint pattern="^Router Webserver$">
3931
+ <description>TP-Link Router httpd - seen on Wireless N and portable 3G routers</description>
3932
+ <example>Router Webserver</example>
3933
+ <param pos="0" name="service.vendor" value="TP-LINK"/>
3934
+ <param pos="0" name="os.vendor" value="TP-LINK"/>
3935
+ <param pos="0" name="os.device" value="Router"/>
3936
+ <param pos="0" name="hw.vendor" value="TP-LINK"/>
3937
+ <param pos="0" name="hw.device" value="Router"/>
3938
+ </fingerprint>
3939
+
3694
3940
  <fingerprint pattern="^Linux/(\S+\_eureka_1), UPnP/[\d\.]+, Portable SDK for UPnP devices/(\S+)$">
3695
3941
  <description>Siqura Video Encoder</description>
3696
3942
  <example>Linux/2.6.37_eureka_1, UPnP/1.0, Portable SDK for UPnP devices/1.6.6</example>
@@ -3708,7 +3954,7 @@
3708
3954
  <description>Steinsvik Orbit IP Camera (Truen TCAM Rebrand)</description>
3709
3955
  <example>Linux/2.6.28.9-Mozart-8G, UPnP/1.0, Portable SDK for UPnP devices/1.6.6</example>
3710
3956
  <param pos="0" name="hw.vendor" value="Steinsvik"/>
3711
- <param pos="0" name="hw.device" value="Web cam"/>
3957
+ <param pos="0" name="hw.device" value="IP Camera"/>
3712
3958
  <param pos="0" name="hw.product" value="Orbit IP Camera"/>
3713
3959
  <param pos="0" name="os.vendor" value="Steinsvik"/>
3714
3960
  <param pos="0" name="os.family" value="Linux"/>
@@ -3738,9 +3984,9 @@
3738
3984
  <description>Axis Network Camera</description>
3739
3985
  <example>Linux/4.9.94-axis5, UPnP/1.0, Portable SDK for UPnP devices/1.6.22</example>
3740
3986
  <param pos="0" name="hw.vendor" value="AXIS"/>
3741
- <param pos="0" name="hw.device" value="Web cam"/>
3987
+ <param pos="0" name="hw.device" value="IP Camera"/>
3742
3988
  <param pos="0" name="os.vendor" value="AXIS"/>
3743
- <param pos="0" name="os.device" value="Web cam"/>
3989
+ <param pos="0" name="os.device" value="IP Camera"/>
3744
3990
  <param pos="0" name="os.family" value="Linux"/>
3745
3991
  <param pos="0" name="os.product" value="Linux"/>
3746
3992
  <param pos="1" name="os.version"/>
@@ -3862,9 +4108,9 @@
3862
4108
  <param pos="0" name="hw.product" value="Roku"/>
3863
4109
  <param pos="0" name="hw.device" value="Media Server"/>
3864
4110
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3865
- <param pos="0" name="service.product" value="MiniUPnP"/>
4111
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3866
4112
  <param pos="1" name="service.version"/>
3867
- <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnp:{service.version}"/>
4113
+ <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
3868
4114
  </fingerprint>
3869
4115
 
3870
4116
  <fingerprint pattern="^UPnP/\S+, DLNADOC/\S+, Platinum/(\S+)$">
@@ -3987,7 +4233,7 @@
3987
4233
  <description>ANNKE IP Camera</description>
3988
4234
  <example>MWS 0.01</example>
3989
4235
  <param pos="0" name="hw.vendor" value="ANNKE"/>
3990
- <param pos="0" name="hw.device" value="Web cam"/>
4236
+ <param pos="0" name="hw.device" value="IP Camera"/>
3991
4237
  <param pos="0" name="hw.product" value="IP Camera"/>
3992
4238
  </fingerprint>
3993
4239
 
@@ -4001,6 +4247,24 @@
4001
4247
  <param pos="0" name="service.cpe23" value="cpe:/a:xiph:icecast:{service.version}"/>
4002
4248
  </fingerprint>
4003
4249
 
4250
+ <fingerprint pattern="^Tableau$">
4251
+ <description>Tableau Tableau Server web interface</description>
4252
+ <example>Tableau</example>
4253
+ <param pos="0" name="service.vendor" value="Tableau"/>
4254
+ <param pos="0" name="service.product" value="Tableau Server"/>
4255
+ <param pos="0" name="service.cpe23" value="cpe:/a:tableau:tableau_server:-"/>
4256
+ </fingerprint>
4257
+
4258
+ <fingerprint pattern="^WowzaStreamingEngine/(\d\.[\w.]+)$">
4259
+ <description>Wowza Streaming Engine</description>
4260
+ <example service.version="4.7.7">WowzaStreamingEngine/4.7.7</example>
4261
+ <example service.version="4.6.0.04x">WowzaStreamingEngine/4.6.0.04x</example>
4262
+ <param pos="0" name="service.vendor" value="Wowza"/>
4263
+ <param pos="0" name="service.product" value="Streaming Engine"/>
4264
+ <param pos="1" name="service.version"/>
4265
+ <param pos="0" name="service.cpe23" value="cpe:/a:wowza:streaming_engine:{service.version}"/>
4266
+ </fingerprint>
4267
+
4004
4268
  <fingerprint pattern="^Couchbase Sync Gateway/([\d.]+) CE$">
4005
4269
  <description>Couchbase Sync Gateway Community Edition</description>
4006
4270
  <example service.version="2.5.0">Couchbase Sync Gateway/2.5.0 CE</example>
@@ -4063,6 +4327,17 @@
4063
4327
  <param pos="0" name="service.cpe23" value="cpe:/a:axtls_project:axtls:{service.version}"/>
4064
4328
  </fingerprint>
4065
4329
 
4330
+ <fingerprint pattern="^CommuniGatePro/(\d\.[\w.]+)$">
4331
+ <description>Communigate Communigate Pro</description>
4332
+ <example service.version="5.2.20">CommuniGatePro/5.2.20</example>
4333
+ <example service.version="6.2.16v">CommuniGatePro/6.2.16v</example>
4334
+ <param pos="0" name="service.vendor" value="Communigate"/>
4335
+ <param pos="0" name="service.family" value="Pro"/>
4336
+ <param pos="0" name="service.product" value="Communigate Pro"/>
4337
+ <param pos="1" name="service.version"/>
4338
+ <param pos="0" name="service.cpe23" value="cpe:/a:communigate:communigate_pro:{service.version}"/>
4339
+ </fingerprint>
4340
+
4066
4341
  <fingerprint pattern="^tinyproxy/([\d.]+)$">
4067
4342
  <description>TinyProxy Project tinyproxy</description>
4068
4343
  <example service.version="1.8.2">tinyproxy/1.8.2</example>
@@ -4077,7 +4352,7 @@
4077
4352
  <example>Xfinity Broadband Router Server</example>
4078
4353
  <param pos="0" name="hw.vendor" value="Comcast"/>
4079
4354
  <param pos="0" name="hw.product" value="Xfinity Broadband Router"/>
4080
- <param pos="0" name="hw.device" value="Broadband router"/>
4355
+ <param pos="0" name="hw.device" value="Broadband Router"/>
4081
4356
  </fingerprint>
4082
4357
 
4083
4358
  <fingerprint pattern="^IX Series IX21\d\d \(magellan-sec\) Software, Version ([^, ]+), (?:MAINTENANCE )?RELEASE SOFTWARE$">
@@ -4164,6 +4439,67 @@
4164
4439
  <param pos="2" name="python.version"/>
4165
4440
  </fingerprint>
4166
4441
 
4442
+ <fingerprint pattern="^pve-api-daemon/[\d.]+">
4443
+ <description>Proxmox api daemon</description>
4444
+ <example>pve-api-daemon/3.0</example>
4445
+ <param pos="0" name="service.vendor" value="Proxmox"/>
4446
+ <param pos="0" name="service.product" value="Virtual Environment"/>
4447
+ <param pos="0" name="service.cpe23" value="cpe:/a:proxmox:virtual_environment:-"/>
4448
+ <param pos="0" name="os.vendor" value="Proxmox"/>
4449
+ <param pos="0" name="os.family" value="Linux"/>
4450
+ <param pos="0" name="os.product" value="Proxmox"/>
4451
+ </fingerprint>
4452
+
4453
+ <fingerprint pattern="^Cherokee/([\d.]+) \(Debian\)$">
4454
+ <description>Cherokee Web Server - Debian variant</description>
4455
+ <example service.version="1.2.104">Cherokee/1.2.104 (Debian)</example>
4456
+ <param pos="0" name="service.vendor" value="Cherokee Project"/>
4457
+ <param pos="0" name="service.product" value="Cherokee"/>
4458
+ <param pos="1" name="service.version"/>
4459
+ <param pos="0" name="service.cpe23" value="cpe:/a:cherokee-project:cherokee:{service.version}"/>
4460
+ <param pos="0" name="os.vendor" value="Debian"/>
4461
+ <param pos="0" name="os.product" value="Linux"/>
4462
+ <param pos="0" name="os.certainty" value="0.5"/>
4463
+ <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
4464
+ </fingerprint>
4465
+
4466
+ <fingerprint pattern="^Cherokee/([\d.]+) \(Ubuntu\)$">
4467
+ <description>Cherokee Web Server - Ubuntu variant</description>
4468
+ <example service.version="1.2.104">Cherokee/1.2.104 (Ubuntu)</example>
4469
+ <param pos="0" name="service.vendor" value="Cherokee Project"/>
4470
+ <param pos="0" name="service.product" value="Cherokee"/>
4471
+ <param pos="1" name="service.version"/>
4472
+ <param pos="0" name="service.cpe23" value="cpe:/a:cherokee-project:cherokee:{service.version}"/>
4473
+ <param pos="0" name="os.vendor" value="Ubuntu"/>
4474
+ <param pos="0" name="os.product" value="Linux"/>
4475
+ <param pos="0" name="os.certainty" value="0.5"/>
4476
+ <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:-"/>
4477
+ </fingerprint>
4478
+
4479
+ <fingerprint pattern="^Cherokee/([\d.]+) \(Gentoo Linux\)$">
4480
+ <description>Cherokee Web Server - Gentoo variant</description>
4481
+ <example service.version="1.2.104">Cherokee/1.2.104 (Gentoo Linux)</example>
4482
+ <param pos="0" name="service.vendor" value="Cherokee Project"/>
4483
+ <param pos="0" name="service.product" value="Cherokee"/>
4484
+ <param pos="1" name="service.version"/>
4485
+ <param pos="0" name="service.cpe23" value="cpe:/a:cherokee-project:cherokee:{service.version}"/>
4486
+ <param pos="0" name="os.vendor" value="Gentoo"/>
4487
+ <param pos="0" name="os.product" value="Linux"/>
4488
+ <param pos="0" name="os.certainty" value="0.5"/>
4489
+ <param pos="0" name="os.cpe23" value="cpe:/o:gentoo:linux:-"/>
4490
+ </fingerprint>
4491
+
4492
+ <fingerprint pattern="^Cherokee(?:/([\d.]+))?(?: \(UNIX\))?$">
4493
+ <description>Cherokee Web Server</description>
4494
+ <example>Cherokee</example>
4495
+ <example service.version="0.2.7">Cherokee/0.2.7</example>
4496
+ <example service.version="1.2.101">Cherokee/1.2.101 (UNIX)</example>
4497
+ <param pos="0" name="service.vendor" value="Cherokee Project"/>
4498
+ <param pos="0" name="service.product" value="Cherokee"/>
4499
+ <param pos="1" name="service.version"/>
4500
+ <param pos="0" name="service.cpe23" value="cpe:/a:cherokee-project:cherokee:{service.version}"/>
4501
+ </fingerprint>
4502
+
4167
4503
  <!-- This is a version of ACME mini_httpd where the value 'mini_httpd' has been
4168
4504
  replaced with a UUID in the Server header AND body of the response. It
4169
4505
  is likely vendor or product specific.
@@ -4179,4 +4515,44 @@
4179
4515
  <param pos="0" name="service.cpe23" value="cpe:/a:acme:mini_httpd:-"/>
4180
4516
  </fingerprint>
4181
4517
 
4518
+ <fingerprint pattern="^Unspecified, UPnP/[\d\.]+, Unspecified$">
4519
+ <description>UPNP server</description>
4520
+ <example>Unspecified, UPnP/1.0, Unspecified</example>
4521
+ <param pos="0" name="service.family" value="UPnP"/>
4522
+ </fingerprint>
4523
+
4524
+ <fingerprint pattern="^WNR2000v([0-9]) UPnP/[\d\.]+ miniupnpd/([\d\.]+)$">
4525
+ <description>Netgear WNR2000v5 Router UPnP</description>
4526
+ <example hw.version="5" service.version="1.0">WNR2000v5 UPnP/1.0 miniupnpd/1.0</example>
4527
+ <param pos="1" name="hw.version"/>
4528
+ <param pos="2" name="service.version"/>
4529
+ <param pos="0" name="service.vendor" value="Netgear"/>
4530
+ <param pos="0" name="service.family" value="UPnP"/>
4531
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
4532
+ <param pos="0" name="hw.vendor" value="Netgear"/>
4533
+ <param pos="0" name="hw.product" value="WNR2000"/>
4534
+ <param pos="0" name="hw.device" value="Router"/>
4535
+ <param pos="0" name="hw.cpe23" value="cpe:/h:netgear:wnr2000:{hw.version}"/>
4536
+ </fingerprint>
4537
+
4538
+ <fingerprint pattern="^ev-compat$">
4539
+ <description>PELCO CAMERA DEVICE</description>
4540
+ <example>ev-compat</example>
4541
+ <param pos="0" name="service.vendor" value="Pelco"/>
4542
+ <param pos="0" name="service.family" value="UPnP"/>
4543
+ <param pos="0" name="hw.vendor" value="Pelco"/>
4544
+ <param pos="0" name="hw.device" value="IP Camera"/>
4545
+ </fingerprint>
4546
+
4547
+ <fingerprint pattern="^xxxxxxxx-xxxxx$">
4548
+ <description>Fortinet - device unknown</description>
4549
+ <example>xxxxxxxx-xxxxx</example>
4550
+ <param pos="0" name="os.vendor" value="Fortinet"/>
4551
+ <param pos="0" name="os.family" value="FortiOS"/>
4552
+ <param pos="0" name="os.product" value="FortiOS"/>
4553
+ <param pos="0" name="os.device" value="Firewall"/>
4554
+ <param pos="0" name="os.cpe23" value="cpe:/o:fortinet:fortios:-"/>
4555
+ <param pos="0" name="hw.vendor" value="Fortinet"/>
4556
+ </fingerprint>
4557
+
4182
4558
  </fingerprints>