recog 2.3.19 → 2.3.20

Sign up to get free protection for your applications and to get access to all the features.
Files changed (38) hide show
  1. checksums.yaml +4 -4
  2. data/bin/recog_standardize +6 -0
  3. data/cpe-remap.yaml +314 -211
  4. data/identifiers/README.md +24 -10
  5. data/identifiers/fields.txt +104 -0
  6. data/identifiers/hw_family.txt +5 -0
  7. data/identifiers/hw_product.txt +11 -0
  8. data/identifiers/os_device.txt +0 -1
  9. data/identifiers/os_family.txt +1 -0
  10. data/identifiers/os_product.txt +12 -8
  11. data/identifiers/service_family.txt +7 -1
  12. data/identifiers/service_product.txt +52 -3
  13. data/identifiers/vendor.txt +23 -1
  14. data/lib/recog/version.rb +1 -1
  15. data/requirements.txt +1 -1
  16. data/update_cpes.py +15 -2
  17. data/xml/apache_modules.xml +60 -0
  18. data/xml/dns_versionbind.xml +1 -1
  19. data/xml/favicons.xml +13 -3
  20. data/xml/ftp_banners.xml +4 -6
  21. data/xml/html_title.xml +362 -29
  22. data/xml/http_cookies.xml +179 -62
  23. data/xml/http_servers.xml +331 -81
  24. data/xml/http_wwwauth.xml +25 -6
  25. data/xml/ldap_searchresult.xml +1 -0
  26. data/xml/ntp_banners.xml +7 -1
  27. data/xml/sip_banners.xml +2 -0
  28. data/xml/sip_user_agents.xml +1 -0
  29. data/xml/smtp_banners.xml +41 -5
  30. data/xml/smtp_expn.xml +1 -0
  31. data/xml/smtp_vrfy.xml +1 -0
  32. data/xml/snmp_sysdescr.xml +52 -11
  33. data/xml/ssh_banners.xml +9 -3
  34. data/xml/telnet_banners.xml +10 -5
  35. data/xml/tls_jarm.xml +3 -2
  36. data/xml/x509_issuers.xml +155 -2
  37. data/xml/x509_subjects.xml +157 -20
  38. metadata +3 -2
data/xml/http_servers.xml CHANGED
@@ -2,6 +2,29 @@
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
+
5
28
  <fingerprint pattern="^BASHttpd/([\d.]+)">
6
29
  <description>BASHttpd</description>
7
30
  <example service.version="4.3.24">BASHttpd/4.3.24-release</example>
@@ -19,6 +42,45 @@
19
42
  <param pos="0" name="service.cpe23" value="cpe:/a:tildeslash:monit:{service.version}"/>
20
43
  </fingerprint>
21
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
+
22
84
  <fingerprint pattern="(?i)^AirTunes/([\d\.]+)$">
23
85
  <description>Apple AirTunes/AirPlay, more generally RTSP used by a variety of wireless a/v products</description>
24
86
  <example service.version="220.68">AirTunes/220.68</example>
@@ -35,6 +97,15 @@
35
97
  <param pos="0" name="service.vendor" value="cPanel"/>
36
98
  <param pos="0" name="service.product" value="cPanel Service Daemon"/>
37
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:-"/>
38
109
  </fingerprint>
39
110
 
40
111
  <!-- CentOS Web Panel is not part of the CentOS project and runs on CentOS,
@@ -1293,13 +1364,13 @@
1293
1364
  <param pos="0" name="service.vendor" value="HP"/>
1294
1365
  <param pos="0" name="service.product" value="iLO"/>
1295
1366
  <param pos="0" name="service.family" value="iLO"/>
1296
- <param pos="0" name="service.cpe23" value="cpe:/a:hp:integrated_lights_out:-"/>
1297
1367
  <param pos="0" name="hw.vendor" value="HP"/>
1298
1368
  <param pos="0" name="hw.device" value="Lights Out Management"/>
1299
1369
  <param pos="0" name="os.vendor" value="HP"/>
1300
1370
  <param pos="0" name="os.product" value="iLO"/>
1301
1371
  <param pos="0" name="os.family" value="iLO"/>
1302
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:-"/>
1303
1374
  </fingerprint>
1304
1375
 
1305
1376
  <!--
@@ -1375,8 +1446,8 @@
1375
1446
  </fingerprint>
1376
1447
 
1377
1448
  <fingerprint pattern="^thttpd/(\d\.[\w.]+)-MX\s*.*$">
1378
- <description>thttpd with SSL support</description>
1379
- <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>
1380
1451
  <param pos="0" name="service.vendor" value="ACME"/>
1381
1452
  <param pos="0" name="service.product" value="thttpd"/>
1382
1453
  <param pos="0" name="service.family" value="thttpd"/>
@@ -1386,15 +1457,17 @@
1386
1457
  </fingerprint>
1387
1458
 
1388
1459
  <fingerprint pattern="^thttpd(?:/(\d\.[\w.]+)\s*.*)?$">
1389
- <description>thttpd</description>
1460
+ <description>ACME thttpd</description>
1390
1461
  <example>thttpd</example>
1391
- <example>thttpd/2.04 10aug98</example>
1392
- <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>
1393
1464
  <example>thttpd/2.21b PHP/20030920</example>
1394
- <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"/>
1395
1467
  <param pos="0" name="service.product" value="thttpd"/>
1396
1468
  <param pos="0" name="service.family" value="thttpd"/>
1397
1469
  <param pos="1" name="service.version"/>
1470
+ <param pos="0" name="service.cpe23" value="cpe:/a:acme:thttpd:{service.version}"/>
1398
1471
  </fingerprint>
1399
1472
 
1400
1473
  <fingerprint pattern="(?i)^lighttpd(?:/(\d[\d.]+))?.*$">
@@ -1508,8 +1581,8 @@
1508
1581
 
1509
1582
  <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X1-Win32 AbyssLib/(?:\d\.[\d.]+)$">
1510
1583
  <description>Aprelium Technologies Abyss Web Server X1 (free personal edition) on Windows</description>
1511
- <example>Abyss/2.0.0.20-X1-Win32 AbyssLib/2.0.0.20</example>
1512
- <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>
1513
1586
  <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
1514
1587
  <param pos="0" name="service.product" value="Abyss Web Server X1"/>
1515
1588
  <param pos="0" name="service.family" value="Abyss Web Server"/>
@@ -1521,19 +1594,70 @@
1521
1594
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1522
1595
  </fingerprint>
1523
1596
 
1524
- <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X2-Win32 AbyssLib/(?:\d\.[\d.]+)$">
1525
- <description>Aprelium Technologies Abyss Web Server X2 (licensed professional edition) on Windows</description>
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>
1526
1600
  <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
1527
1601
  <param pos="0" name="service.product" value="Abyss Web Server X1"/>
1528
1602
  <param pos="0" name="service.family" value="Abyss Web Server"/>
1529
1603
  <param pos="1" name="service.version"/>
1530
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
+
1624
+ <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X2-Win32 AbyssLib/(?:\d\.[\d.]+)$">
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>
1627
+ <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
1628
+ <param pos="0" name="service.product" value="Abyss Web Server X2"/>
1629
+ <param pos="0" name="service.family" value="Abyss Web Server"/>
1630
+ <param pos="1" name="service.version"/>
1531
1631
  <param pos="0" name="os.vendor" value="Microsoft"/>
1532
1632
  <param pos="0" name="os.family" value="Windows"/>
1533
1633
  <param pos="0" name="os.product" value="Windows"/>
1534
1634
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1535
1635
  </fingerprint>
1536
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
+
1537
1661
  <fingerprint pattern="^Microsoft (Commerce Server\s*(?:2002|2007)?, (?:Enterprise|Standard|Evaluation|Developer) Edition)$">
1538
1662
  <description>Microsoft Commerce Server</description>
1539
1663
  <param pos="0" name="service.vendor" value="Microsoft"/>
@@ -1547,6 +1671,7 @@
1547
1671
 
1548
1672
  <fingerprint pattern="^NetWare-Enterprise-Web-Server/(\d+\.\d+)$">
1549
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>
1550
1675
  <param pos="0" name="service.vendor" value="Novell"/>
1551
1676
  <param pos="0" name="service.product" value="NetWare Enterprise Web Server"/>
1552
1677
  <param pos="0" name="service.family" value="NetWare Enterprise Web Server"/>
@@ -1754,7 +1879,7 @@
1754
1879
  <param pos="0" name="service.family" value="SSL-VPN"/>
1755
1880
  <param pos="0" name="os.vendor" value="SonicWall"/>
1756
1881
  <param pos="0" name="os.device" value="VPN"/>
1757
- <param pos="0" name="os.family" value="SSL-VPN"/>
1882
+ <param pos="0" name="os.family" value="SonicOS"/>
1758
1883
  <param pos="0" name="os.product" value="SonicOS"/>
1759
1884
  <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
1760
1885
  <param pos="0" name="hw.vendor" value="SonicWall"/>
@@ -1985,7 +2110,7 @@
1985
2110
  <param pos="0" name="os.vendor" value="Cisco"/>
1986
2111
  <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
1987
2112
  <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
1988
- <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:-"/>
1989
2114
  <param pos="0" name="hw.vendor" value="Cisco"/>
1990
2115
  <param pos="0" name="hw.family" value="Adaptive Security Appliance"/>
1991
2116
  <param pos="0" name="hw.product" value="Adaptive Security Appliance"/>
@@ -2110,6 +2235,7 @@
2110
2235
  <param pos="0" name="os.family" value="NetScaler"/>
2111
2236
  <param pos="0" name="os.device" value="Network Management Device"/>
2112
2237
  <param pos="0" name="os.product" value="NetScaler"/>
2238
+ <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_firmware:-"/>
2113
2239
  <param pos="0" name="service.vendor" value="Citrix"/>
2114
2240
  <param pos="0" name="service.family" value="NetScaler"/>
2115
2241
  <param pos="0" name="service.device" value="Network Management Device"/>
@@ -2393,6 +2519,25 @@
2393
2519
  <param pos="2" name="python.version"/>
2394
2520
  </fingerprint>
2395
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
+
2396
2541
  <fingerprint pattern="^Grandstream (GXP[^\s]+) ([\d\.]+)$">
2397
2542
  <description>Grandstream IP Phone</description>
2398
2543
  <example hw.product="GXP2020" hw.version="1.2.5.3">Grandstream GXP2020 1.2.5.3</example>
@@ -2445,6 +2590,17 @@
2445
2590
  <param pos="0" name="service.family" value="Web PN Server"/>
2446
2591
  </fingerprint>
2447
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
+
2448
2604
  <fingerprint pattern="^Lotus Expeditor Web Container/((?:\d+\.)*\d+)$">
2449
2605
  <description>Expeditor is a framework used by IBM in many products in the Lotus brand, such as Sametime and Notes.</description>
2450
2606
  <example>Lotus Expeditor Web Container/6.1</example>
@@ -2563,6 +2719,19 @@
2563
2719
  <param pos="0" name="service.product" value="Twisted Web"/>
2564
2720
  <param pos="0" name="service.family" value="Twisted Web"/>
2565
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}"/>
2566
2735
  </fingerprint>
2567
2736
 
2568
2737
  <fingerprint pattern="^mini_httpd/((?:\d+\.)*\d+) \S*$">
@@ -2680,10 +2849,13 @@
2680
2849
  <fingerprint pattern="^PanWeb Server/ -">
2681
2850
  <description>HTTP and HTTPS server found on Palo Alto Networks devices</description>
2682
2851
  <example>PanWeb Server/ -</example>
2852
+ <param pos="0" name="hw.vendor" value="Palo Alto Networks"/>
2683
2853
  <param pos="0" name="service.vendor" value="Palo Alto Networks"/>
2684
2854
  <param pos="0" name="service.product" value="PA Firewall"/>
2855
+ <param pos="0" name="service.device" value="Firewall"/>
2685
2856
  <param pos="0" name="os.vendor" value="Palo Alto Networks"/>
2686
- <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"/>
2687
2859
  <param pos="0" name="os.device" value="Firewall"/>
2688
2860
  <param pos="0" name="os.cpe23" value="cpe:/o:paloaltonetworks:pan-os:-"/>
2689
2861
  </fingerprint>
@@ -2802,8 +2974,8 @@
2802
2974
 
2803
2975
  -->
2804
2976
 
2805
- <fingerprint pattern="^(?:(?:\d+.){3}\d+):\d{1,4}$">
2806
- <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>
2807
2979
  <example>192.168.0.4:9999</example>
2808
2980
  </fingerprint>
2809
2981
 
@@ -2819,21 +2991,27 @@
2819
2991
 
2820
2992
  <!-- Service provider equipment (CDNs, etc) -->
2821
2993
 
2822
- <fingerprint pattern="^AkamaiGHost$">
2994
+ <fingerprint pattern="^(?:Akamai)?GHost$">
2823
2995
  <description>Akamai Global Host</description>
2824
2996
  <example>AkamaiGHost</example>
2997
+ <example>GHost</example>
2825
2998
  <param pos="0" name="service.vendor" value="Akamai"/>
2826
2999
  <param pos="0" name="service.product" value="GHost"/>
3000
+ <param pos="0" name="service.cpe23" value="cpe:/a:akamai:akamaighost:-"/>
2827
3001
  <param pos="0" name="os.vendor" value="Akamai"/>
3002
+ <param pos="0" name="os.family" value="Linux"/>
2828
3003
  <param pos="0" name="os.device" value="Web Proxy"/>
2829
3004
  </fingerprint>
2830
3005
 
3006
+ <!-- Banner used for many Google services such as search, Gmail, etc. -->
3007
+
2831
3008
  <fingerprint pattern="^gws$">
2832
3009
  <description>Google Web Services</description>
2833
3010
  <example>gws</example>
2834
3011
  <param pos="0" name="service.vendor" value="Google"/>
2835
- <param pos="0" name="service.product" value="Google Web Services"/>
2836
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:-"/>
2837
3015
  </fingerprint>
2838
3016
 
2839
3017
  <fingerprint pattern="^GFE/((?:\d+\.)*\d+)$">
@@ -2841,8 +3019,8 @@
2841
3019
  <example>GFE/1.3</example>
2842
3020
  <example>GFE/1</example>
2843
3021
  <param pos="0" name="service.vendor" value="Google"/>
2844
- <param pos="0" name="service.product" value="Google Front End"/>
2845
3022
  <param pos="0" name="service.family" value="Google Web Server"/>
3023
+ <param pos="0" name="service.product" value="Google Front End"/>
2846
3024
  <param pos="1" name="service.version"/>
2847
3025
  </fingerprint>
2848
3026
 
@@ -2850,8 +3028,9 @@
2850
3028
  <description>Amazon CloudFront web load balancer endpoint</description>
2851
3029
  <example>CloudFront</example>
2852
3030
  <param pos="0" name="service.vendor" value="Amazon"/>
3031
+ <param pos="0" name="service.family" value="Web Services"/>
2853
3032
  <param pos="0" name="service.product" value="CloudFront Load Balancer"/>
2854
- <param pos="0" name="service.family" value="CloudFront"/>
3033
+ <param pos="0" name="service.cpe23" value="cpe:/a:amazon:amazon_cloudfront:-"/>
2855
3034
  </fingerprint>
2856
3035
 
2857
3036
  <fingerprint pattern="^Amazon-Cloud-Drive$">
@@ -2865,13 +3044,16 @@
2865
3044
  <description>Amazon S3 (Simple Cloud Storage Service)</description>
2866
3045
  <example>AmazonS3</example>
2867
3046
  <param pos="0" name="service.vendor" value="Amazon"/>
3047
+ <param pos="0" name="service.family" value="Web Services"/>
2868
3048
  <param pos="0" name="service.product" value="S3"/>
3049
+ <param pos="0" name="service.cpe23" value="cpe:/a:amazon:amazon_simple_storage_service:-"/>
2869
3050
  </fingerprint>
2870
3051
 
2871
3052
  <fingerprint pattern="^Amazon SimpleDB$">
2872
3053
  <description>Amazon SimpleDB / Simple Database Service</description>
2873
3054
  <example>Amazon SimpleDB</example>
2874
3055
  <param pos="0" name="service.vendor" value="Amazon"/>
3056
+ <param pos="0" name="service.family" value="Web Services"/>
2875
3057
  <param pos="0" name="service.product" value="SimpleDB"/>
2876
3058
  </fingerprint>
2877
3059
 
@@ -2879,6 +3061,7 @@
2879
3061
  <description>Amazon Snowball</description>
2880
3062
  <example>AmazonSnowball</example>
2881
3063
  <param pos="0" name="service.vendor" value="Amazon"/>
3064
+ <param pos="0" name="service.family" value="Web Services"/>
2882
3065
  <param pos="0" name="service.product" value="Snowball"/>
2883
3066
  </fingerprint>
2884
3067
 
@@ -2886,8 +3069,10 @@
2886
3069
  <description>Amazon Elastic Load Balancing</description>
2887
3070
  <example service.version="2.0">awselb/2.0</example>
2888
3071
  <param pos="0" name="service.vendor" value="Amazon"/>
2889
- <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"/>
2890
3074
  <param pos="1" name="service.version"/>
3075
+ <param pos="0" name="service.cpe23" value="cpe:/a:amazon:elastic_load_balancing:{service.version}"/>
2891
3076
  </fingerprint>
2892
3077
 
2893
3078
  <fingerprint pattern="^cloudflare(?:-nginx)?$">
@@ -2897,6 +3082,7 @@
2897
3082
  <param pos="0" name="service.vendor" value="CloudFlare"/>
2898
3083
  <param pos="0" name="service.product" value="CloudFlare Load Balancer"/>
2899
3084
  <param pos="0" name="service.family" value="CloudFlare"/>
3085
+ <param pos="0" name="service.cpe23" value="cpe:/a:cloudflare:load_balancing:-"/>
2900
3086
  </fingerprint>
2901
3087
 
2902
3088
  <fingerprint pattern="^gSOAP/([\d\.]+)$">
@@ -3050,6 +3236,7 @@
3050
3236
  <param pos="0" name="service.family" value="Gateway"/>
3051
3237
  <param pos="0" name="service.product" value="Gateway"/>
3052
3238
  <param pos="1" name="service.version"/>
3239
+ <param pos="0" name="service.cpe23" value="cpe:/a:konghq:kong_gateway:{service.version}"/>
3053
3240
  </fingerprint>
3054
3241
 
3055
3242
  <fingerprint pattern="^kong/([\d.-]+)-enterprise-edition$">
@@ -3060,6 +3247,7 @@
3060
3247
  <param pos="0" name="service.family" value="Gateway"/>
3061
3248
  <param pos="0" name="service.product" value="Gateway"/>
3062
3249
  <param pos="1" name="service.version"/>
3250
+ <param pos="0" name="service.cpe23" value="cpe:/a:konghq:kong_gateway:{service.version}"/>
3063
3251
  </fingerprint>
3064
3252
 
3065
3253
  <!-- Tridium previously had a product with the 'Niagra' spelling -->
@@ -3105,15 +3293,26 @@
3105
3293
  <param pos="1" name="host.name"/>
3106
3294
  </fingerprint>
3107
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
+
3108
3307
  <fingerprint pattern="(?i)^Linux/(\S+) UPnP/[\d\.]+ miniupnpd/([\d\.]+)$">
3109
3308
  <description>Linux MiniUPnPd UPnP Server</description>
3110
3309
  <example service.version="1.0">Linux/Cross_compiled UPnP/1.0 miniupnpd/1.0</example>
3111
3310
  <example>Linux/2.6.29.6-217.2.3.fc11.i686.PAE UPnP/1.0 miniupnpd/1.0</example>
3112
3311
  <example>Linux/2.4.21 UPnP/1.0 miniupnpd/1.0</example>
3113
3312
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3114
- <param pos="0" name="service.product" value="MiniUPnP"/>
3313
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3115
3314
  <param pos="2" name="service.version"/>
3116
- <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}"/>
3117
3316
  <param pos="0" name="os.vendor" value="Linux"/>
3118
3317
  <param pos="0" name="os.product" value="Linux"/>
3119
3318
  <param pos="1" name="os.version"/>
@@ -3124,18 +3323,18 @@
3124
3323
  <description>Tomato UPnP Server</description>
3125
3324
  <example service.version="1.2">Tomato UPnP/1.0 MiniUPnPd/1.2</example>
3126
3325
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3127
- <param pos="0" name="service.product" value="MiniUPnP"/>
3326
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3128
3327
  <param pos="1" name="service.version"/>
3129
- <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}"/>
3130
3329
  </fingerprint>
3131
3330
 
3132
3331
  <fingerprint pattern="(?i)^(RT-\w+) UPnP/\S+ MiniUPnPd/([\d.]+)$">
3133
3332
  <description>Asus WAP UPnP Server</description>
3134
3333
  <example service.version="1.2">RT-G32 UPnP/1.0 MiniUPnPd/1.2</example>
3135
3334
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3136
- <param pos="0" name="service.product" value="MiniUPnP"/>
3335
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3137
3336
  <param pos="2" name="service.version"/>
3138
- <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}"/>
3139
3338
  <param pos="0" name="os.vendor" value="Asus"/>
3140
3339
  <param pos="1" name="os.product"/>
3141
3340
  <param pos="0" name="os.device" value="WAP"/>
@@ -3145,9 +3344,9 @@
3145
3344
  <description>DrayTek Vigor router UPnP Server</description>
3146
3345
  <example service.version="1.0" hw.model="2130">DrayTek/Vigor2130 UPnP/1.0 miniupnpd/1.0</example>
3147
3346
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3148
- <param pos="0" name="service.product" value="MiniUPnP"/>
3347
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3149
3348
  <param pos="2" name="service.version"/>
3150
- <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}"/>
3151
3350
  <param pos="0" name="hw.vendor" value="DrayTek"/>
3152
3351
  <param pos="0" name="hw.product" value="Vigor"/>
3153
3352
  <param pos="1" name="hw.model"/>
@@ -3165,9 +3364,9 @@
3165
3364
  <description>OpenWRT Kamikaze WAP UPnP Server</description>
3166
3365
  <example service.version="1.5">OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.5</example>
3167
3366
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3168
- <param pos="0" name="service.product" value="MiniUPnP"/>
3367
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3169
3368
  <param pos="1" name="service.version"/>
3170
- <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}"/>
3171
3370
  <param pos="0" name="os.vendor" value="Linux"/>
3172
3371
  <param pos="0" name="os.family" value="OpenWRT"/>
3173
3372
  <param pos="0" name="os.product" value="Kamikaze"/>
@@ -3178,9 +3377,9 @@
3178
3377
  <description>Netgear DG834G or WNDR3300 WAP UPnP Server</description>
3179
3378
  <example service.version="1.0">Netgear/1.0 UPnP/1.0 miniupnpd/1.0</example>
3180
3379
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3181
- <param pos="0" name="service.product" value="MiniUPnP"/>
3380
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3182
3381
  <param pos="1" name="service.version"/>
3183
- <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}"/>
3184
3383
  <param pos="0" name="os.vendor" value="Netgear"/>
3185
3384
  <param pos="0" name="os.device" value="WAP"/>
3186
3385
  <param pos="0" name="hw.vendor" value="Netgear"/>
@@ -3205,9 +3404,9 @@
3205
3404
  <example os.version="wheezy/sid" service.version="1.8">Debian/wheezy/sid UPnP/1.1 MiniUPnPd/1.8</example>
3206
3405
  <example os.version="4.0" service.version="1.0">Debian/4.0 UPnP/1.0 miniupnpd/1.0</example>
3207
3406
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3208
- <param pos="0" name="service.product" value="MiniUPnP"/>
3407
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3209
3408
  <param pos="2" name="service.version"/>
3210
- <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}"/>
3211
3410
  <param pos="0" name="os.vendor" value="Debian"/>
3212
3411
  <param pos="0" name="os.product" value="Linux"/>
3213
3412
  <param pos="0" name="os.certainty" value="0.5"/>
@@ -3221,9 +3420,9 @@
3221
3420
  <example os.version="8" service.version="1.0">Fedora/8 UPnP/1.0 miniupnpd/1.0</example>
3222
3421
  <example os.version="6" service.version="1.0">FedoraCore/6 UPnP/1.0 miniupnpd/1.0</example>
3223
3422
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3224
- <param pos="0" name="service.product" value="MiniUPnP"/>
3423
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3225
3424
  <param pos="2" name="service.version"/>
3226
- <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}"/>
3227
3426
  <param pos="0" name="os.family" value="Linux"/>
3228
3427
  <param pos="0" name="os.vendor" value="Red Hat"/>
3229
3428
  <param pos="0" name="os.product" value="Fedora Core Linux"/>
@@ -3238,9 +3437,9 @@
3238
3437
  <example os.version="7.10" service.version="1.0">Ubuntu/7.10 UPnP/1.0 miniupnpd/1.0</example>
3239
3438
  <example os.version="9.04" service.version="1.0">Ubuntu/9.04 UPnP/1.0 miniupnpd/1.0</example>
3240
3439
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3241
- <param pos="0" name="service.product" value="MiniUPnP"/>
3440
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3242
3441
  <param pos="2" name="service.version"/>
3243
- <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}"/>
3244
3443
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3245
3444
  <param pos="0" name="os.product" value="Linux"/>
3246
3445
  <param pos="1" name="os.version"/>
@@ -3251,9 +3450,9 @@
3251
3450
  <description>miniupnpd on an Ubuntu bionic/18.04</description>
3252
3451
  <example os.version="18.04" service.version="1.4">Ubuntu/bionic UPnP/1.0 MiniUPnPd/1.4</example>
3253
3452
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3254
- <param pos="0" name="service.product" value="MiniUPnP"/>
3453
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3255
3454
  <param pos="1" name="service.version"/>
3256
- <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}"/>
3257
3456
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3258
3457
  <param pos="0" name="os.product" value="Linux"/>
3259
3458
  <param pos="0" name="os.version" value="18.04"/>
@@ -3264,9 +3463,9 @@
3264
3463
  <description>miniupnpd on an Ubuntu yakkety/16.10</description>
3265
3464
  <example os.version="16.10" service.version="1.4">Ubuntu/yakkety UPnP/1.0 MiniUPnPd/1.4</example>
3266
3465
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3267
- <param pos="0" name="service.product" value="MiniUPnP"/>
3466
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3268
3467
  <param pos="1" name="service.version"/>
3269
- <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}"/>
3270
3469
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3271
3470
  <param pos="0" name="os.product" value="Linux"/>
3272
3471
  <param pos="0" name="os.version" value="16.10"/>
@@ -3277,9 +3476,9 @@
3277
3476
  <description>miniupnpd on an Ubuntu xenial/16.04</description>
3278
3477
  <example os.version="16.04" service.version="1.4">Ubuntu/xenial UPnP/1.0 MiniUPnPd/1.4</example>
3279
3478
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3280
- <param pos="0" name="service.product" value="MiniUPnP"/>
3479
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3281
3480
  <param pos="1" name="service.version"/>
3282
- <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}"/>
3283
3482
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3284
3483
  <param pos="0" name="os.product" value="Linux"/>
3285
3484
  <param pos="0" name="os.version" value="16.04"/>
@@ -3290,9 +3489,9 @@
3290
3489
  <description>miniupnpd on an Ubuntu utopic/14.10</description>
3291
3490
  <example os.version="14.10" service.version="1.4">Ubuntu/utopic UPnP/1.0 MiniUPnPd/1.4</example>
3292
3491
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3293
- <param pos="0" name="service.product" value="MiniUPnP"/>
3492
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3294
3493
  <param pos="1" name="service.version"/>
3295
- <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}"/>
3296
3495
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3297
3496
  <param pos="0" name="os.product" value="Linux"/>
3298
3497
  <param pos="0" name="os.version" value="14.10"/>
@@ -3303,9 +3502,9 @@
3303
3502
  <description>miniupnpd on an Ubuntu trusty/14.04</description>
3304
3503
  <example os.version="14.04" service.version="1.4">Ubuntu/trusty UPnP/1.0 MiniUPnPd/1.4</example>
3305
3504
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3306
- <param pos="0" name="service.product" value="MiniUPnP"/>
3505
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3307
3506
  <param pos="1" name="service.version"/>
3308
- <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}"/>
3309
3508
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3310
3509
  <param pos="0" name="os.product" value="Linux"/>
3311
3510
  <param pos="0" name="os.version" value="14.04"/>
@@ -3316,9 +3515,9 @@
3316
3515
  <description>miniupnpd on an Ubuntu saucy/13.10</description>
3317
3516
  <example os.version="13.10" service.version="1.4">Ubuntu/saucy UPnP/1.0 MiniUPnPd/1.4</example>
3318
3517
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3319
- <param pos="0" name="service.product" value="MiniUPnP"/>
3518
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3320
3519
  <param pos="1" name="service.version"/>
3321
- <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}"/>
3322
3521
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3323
3522
  <param pos="0" name="os.product" value="Linux"/>
3324
3523
  <param pos="0" name="os.version" value="13.10"/>
@@ -3329,9 +3528,9 @@
3329
3528
  <description>miniupnpd on an Ubuntu raring/13.04</description>
3330
3529
  <example os.version="13.04" service.version="1.4">Ubuntu/raring UPnP/1.0 MiniUPnPd/1.4</example>
3331
3530
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3332
- <param pos="0" name="service.product" value="MiniUPnP"/>
3531
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3333
3532
  <param pos="1" name="service.version"/>
3334
- <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}"/>
3335
3534
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3336
3535
  <param pos="0" name="os.product" value="Linux"/>
3337
3536
  <param pos="0" name="os.version" value="13.04"/>
@@ -3342,9 +3541,9 @@
3342
3541
  <description>miniupnpd on an Ubuntu quantal/12.10</description>
3343
3542
  <example os.version="12.10" service.version="1.4">Ubuntu/quantal UPnP/1.0 MiniUPnPd/1.4</example>
3344
3543
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3345
- <param pos="0" name="service.product" value="MiniUPnP"/>
3544
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3346
3545
  <param pos="1" name="service.version"/>
3347
- <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}"/>
3348
3547
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3349
3548
  <param pos="0" name="os.product" value="Linux"/>
3350
3549
  <param pos="0" name="os.version" value="12.10"/>
@@ -3355,9 +3554,9 @@
3355
3554
  <description>miniupnpd on an Ubuntu precise/12.04</description>
3356
3555
  <example os.version="12.04" service.version="1.4">Ubuntu/precise UPnP/1.0 MiniUPnPd/1.4</example>
3357
3556
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3358
- <param pos="0" name="service.product" value="MiniUPnP"/>
3557
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3359
3558
  <param pos="1" name="service.version"/>
3360
- <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}"/>
3361
3560
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3362
3561
  <param pos="0" name="os.product" value="Linux"/>
3363
3562
  <param pos="0" name="os.version" value="12.04"/>
@@ -3368,9 +3567,9 @@
3368
3567
  <description>miniupnpd on an Ubuntu oneiric/11.10</description>
3369
3568
  <example os.version="11.10" service.version="1.4">Ubuntu/oneiric UPnP/1.0 MiniUPnPd/1.4</example>
3370
3569
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3371
- <param pos="0" name="service.product" value="MiniUPnP"/>
3570
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3372
3571
  <param pos="1" name="service.version"/>
3373
- <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}"/>
3374
3573
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3375
3574
  <param pos="0" name="os.product" value="Linux"/>
3376
3575
  <param pos="0" name="os.version" value="11.10"/>
@@ -3381,9 +3580,9 @@
3381
3580
  <description>miniupnpd on an Ubuntu natty/11.04</description>
3382
3581
  <example os.version="11.04" service.version="1.4">Ubuntu/natty UPnP/1.0 MiniUPnPd/1.4</example>
3383
3582
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3384
- <param pos="0" name="service.product" value="MiniUPnP"/>
3583
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3385
3584
  <param pos="1" name="service.version"/>
3386
- <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}"/>
3387
3586
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3388
3587
  <param pos="0" name="os.product" value="Linux"/>
3389
3588
  <param pos="0" name="os.version" value="11.04"/>
@@ -3394,9 +3593,9 @@
3394
3593
  <description>miniupnpd on an Ubuntu maverick/10.10</description>
3395
3594
  <example os.version="10.10" service.version="1.4">Ubuntu/maverick UPnP/1.0 MiniUPnPd/1.4</example>
3396
3595
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3397
- <param pos="0" name="service.product" value="MiniUPnP"/>
3596
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3398
3597
  <param pos="1" name="service.version"/>
3399
- <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}"/>
3400
3599
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3401
3600
  <param pos="0" name="os.product" value="Linux"/>
3402
3601
  <param pos="0" name="os.version" value="10.10"/>
@@ -3407,9 +3606,9 @@
3407
3606
  <description>miniupnpd on an Ubuntu lucid/10.04</description>
3408
3607
  <example os.version="10.04" service.version="1.4">Ubuntu/lucid UPnP/1.0 MiniUPnPd/1.4</example>
3409
3608
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3410
- <param pos="0" name="service.product" value="MiniUPnP"/>
3609
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3411
3610
  <param pos="1" name="service.version"/>
3412
- <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}"/>
3413
3612
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3414
3613
  <param pos="0" name="os.product" value="Linux"/>
3415
3614
  <param pos="0" name="os.version" value="10.04"/>
@@ -3420,9 +3619,9 @@
3420
3619
  <description>miniupnpd on an Ubuntu karmic/9.10</description>
3421
3620
  <example os.version="9.10" service.version="1.4">Ubuntu/karmic UPnP/1.0 MiniUPnPd/1.4</example>
3422
3621
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3423
- <param pos="0" name="service.product" value="MiniUPnP"/>
3622
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3424
3623
  <param pos="1" name="service.version"/>
3425
- <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}"/>
3426
3625
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3427
3626
  <param pos="0" name="os.product" value="Linux"/>
3428
3627
  <param pos="0" name="os.version" value="9.10"/>
@@ -3433,9 +3632,9 @@
3433
3632
  <description>miniupnpd on an Ubuntu jaunty/9.04</description>
3434
3633
  <example os.version="9.04" service.version="1.4">Ubuntu/jaunty UPnP/1.0 MiniUPnPd/1.4</example>
3435
3634
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3436
- <param pos="0" name="service.product" value="MiniUPnP"/>
3635
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3437
3636
  <param pos="1" name="service.version"/>
3438
- <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}"/>
3439
3638
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3440
3639
  <param pos="0" name="os.product" value="Linux"/>
3441
3640
  <param pos="0" name="os.version" value="9.04"/>
@@ -3446,9 +3645,9 @@
3446
3645
  <description>miniupnpd on an Ubuntu hardy/8.04</description>
3447
3646
  <example os.version="8.04" service.version="1.4">Ubuntu/hardy UPnP/1.0 MiniUPnPd/1.4</example>
3448
3647
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3449
- <param pos="0" name="service.product" value="MiniUPnP"/>
3648
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3450
3649
  <param pos="1" name="service.version"/>
3451
- <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}"/>
3452
3651
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3453
3652
  <param pos="0" name="os.product" value="Linux"/>
3454
3653
  <param pos="0" name="os.version" value="8.04"/>
@@ -3459,9 +3658,9 @@
3459
3658
  <description>Linux MIPS UPnP Server</description>
3460
3659
  <example>Linux Mips 2.4.20 UPnP/1.0 MiniUPnPd/1.2</example>
3461
3660
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3462
- <param pos="0" name="service.product" value="MiniUPnP"/>
3661
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3463
3662
  <param pos="2" name="service.version"/>
3464
- <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}"/>
3465
3664
  <param pos="0" name="os.vendor" value="Linux"/>
3466
3665
  <param pos="0" name="os.product" value="Linux"/>
3467
3666
  <param pos="1" name="os.version"/>
@@ -3476,9 +3675,9 @@
3476
3675
  <param pos="1" name="os.version"/>
3477
3676
  <param pos="0" name="os.cpe23" value="cpe:/o:smoothwall:smoothwall:{os.version}"/>
3478
3677
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3479
- <param pos="0" name="service.product" value="MiniUPnP"/>
3678
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3480
3679
  <param pos="2" name="service.version"/>
3481
- <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}"/>
3482
3681
  </fingerprint>
3483
3682
 
3484
3683
  <fingerprint pattern="^(\S+) \d+/Service Pack \d+, UPnP/[\d\.]+, TVersity Media Server$">
@@ -3694,9 +3893,9 @@
3694
3893
  <example service.version="1.2">TBS/R2 UPnP/1.0 MiniUPnPd/1.2</example>
3695
3894
  <param pos="0" name="hw.vendor" value="D-Link"/>
3696
3895
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3697
- <param pos="0" name="service.product" value="MiniUPnP"/>
3896
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3698
3897
  <param pos="1" name="service.version"/>
3699
- <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}"/>
3700
3899
  </fingerprint>
3701
3900
 
3702
3901
  <fingerprint pattern="^alphapd/(\d\.[\d.]+)$">
@@ -3728,6 +3927,16 @@
3728
3927
  <param pos="0" name="os.device" value="WAP"/>
3729
3928
  </fingerprint>
3730
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
+
3731
3940
  <fingerprint pattern="^Linux/(\S+\_eureka_1), UPnP/[\d\.]+, Portable SDK for UPnP devices/(\S+)$">
3732
3941
  <description>Siqura Video Encoder</description>
3733
3942
  <example>Linux/2.6.37_eureka_1, UPnP/1.0, Portable SDK for UPnP devices/1.6.6</example>
@@ -3899,9 +4108,9 @@
3899
4108
  <param pos="0" name="hw.product" value="Roku"/>
3900
4109
  <param pos="0" name="hw.device" value="Media Server"/>
3901
4110
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3902
- <param pos="0" name="service.product" value="MiniUPnP"/>
4111
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3903
4112
  <param pos="1" name="service.version"/>
3904
- <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}"/>
3905
4114
  </fingerprint>
3906
4115
 
3907
4116
  <fingerprint pattern="^UPnP/\S+, DLNADOC/\S+, Platinum/(\S+)$">
@@ -4038,6 +4247,24 @@
4038
4247
  <param pos="0" name="service.cpe23" value="cpe:/a:xiph:icecast:{service.version}"/>
4039
4248
  </fingerprint>
4040
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
+
4041
4268
  <fingerprint pattern="^Couchbase Sync Gateway/([\d.]+) CE$">
4042
4269
  <description>Couchbase Sync Gateway Community Edition</description>
4043
4270
  <example service.version="2.5.0">Couchbase Sync Gateway/2.5.0 CE</example>
@@ -4100,6 +4327,17 @@
4100
4327
  <param pos="0" name="service.cpe23" value="cpe:/a:axtls_project:axtls:{service.version}"/>
4101
4328
  </fingerprint>
4102
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
+
4103
4341
  <fingerprint pattern="^tinyproxy/([\d.]+)$">
4104
4342
  <description>TinyProxy Project tinyproxy</description>
4105
4343
  <example service.version="1.8.2">tinyproxy/1.8.2</example>
@@ -4205,7 +4443,8 @@
4205
4443
  <description>Proxmox api daemon</description>
4206
4444
  <example>pve-api-daemon/3.0</example>
4207
4445
  <param pos="0" name="service.vendor" value="Proxmox"/>
4208
- <param pos="0" name="service.product" 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:-"/>
4209
4448
  <param pos="0" name="os.vendor" value="Proxmox"/>
4210
4449
  <param pos="0" name="os.family" value="Linux"/>
4211
4450
  <param pos="0" name="os.product" value="Proxmox"/>
@@ -4289,7 +4528,7 @@
4289
4528
  <param pos="2" name="service.version"/>
4290
4529
  <param pos="0" name="service.vendor" value="Netgear"/>
4291
4530
  <param pos="0" name="service.family" value="UPnP"/>
4292
- <param pos="0" name="service.product" value="MiniUPnP"/>
4531
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
4293
4532
  <param pos="0" name="hw.vendor" value="Netgear"/>
4294
4533
  <param pos="0" name="hw.product" value="WNR2000"/>
4295
4534
  <param pos="0" name="hw.device" value="Router"/>
@@ -4305,4 +4544,15 @@
4305
4544
  <param pos="0" name="hw.device" value="IP Camera"/>
4306
4545
  </fingerprint>
4307
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
+
4308
4558
  </fingerprints>