recog 2.3.17 → 2.3.21

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 (51) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +26 -0
  3. data/bin/recog_standardize +6 -0
  4. data/cpe-remap.yaml +342 -200
  5. data/identifiers/README.md +24 -10
  6. data/identifiers/fields.txt +104 -0
  7. data/identifiers/hw_device.txt +2 -0
  8. data/identifiers/hw_family.txt +11 -0
  9. data/identifiers/hw_product.txt +71 -0
  10. data/identifiers/os_device.txt +2 -1
  11. data/identifiers/os_family.txt +2 -0
  12. data/identifiers/os_product.txt +36 -8
  13. data/identifiers/service_family.txt +10 -1
  14. data/identifiers/service_product.txt +78 -2
  15. data/identifiers/vendor.txt +55 -0
  16. data/lib/recog/nizer.rb +1 -82
  17. data/lib/recog/version.rb +1 -1
  18. data/requirements.txt +1 -1
  19. data/update_cpes.py +18 -5
  20. data/xml/apache_modules.xml +60 -0
  21. data/xml/apache_os.xml +1 -1
  22. data/xml/dns_versionbind.xml +11 -1
  23. data/xml/favicons.xml +122 -3
  24. data/xml/ftp_banners.xml +62 -51
  25. data/xml/html_title.xml +553 -41
  26. data/xml/http_cookies.xml +262 -61
  27. data/xml/http_servers.xml +478 -108
  28. data/xml/http_wwwauth.xml +36 -9
  29. data/xml/imap_banners.xml +5 -5
  30. data/xml/ldap_searchresult.xml +1 -0
  31. data/xml/mdns_device-info_txt.xml +340 -10
  32. data/xml/mysql_banners.xml +2 -1
  33. data/xml/nntp_banners.xml +1 -1
  34. data/xml/ntp_banners.xml +16 -2
  35. data/xml/operating_system.xml +4 -4
  36. data/xml/pop_banners.xml +4 -4
  37. data/xml/rtsp_servers.xml +7 -0
  38. data/xml/sip_banners.xml +347 -9
  39. data/xml/sip_user_agents.xml +323 -4
  40. data/xml/smb_native_lm.xml +32 -1
  41. data/xml/smb_native_os.xml +160 -33
  42. data/xml/smtp_banners.xml +167 -128
  43. data/xml/smtp_expn.xml +1 -0
  44. data/xml/smtp_vrfy.xml +1 -0
  45. data/xml/snmp_sysdescr.xml +205 -36
  46. data/xml/ssh_banners.xml +139 -25
  47. data/xml/telnet_banners.xml +92 -48
  48. data/xml/tls_jarm.xml +140 -0
  49. data/xml/x509_issuers.xml +201 -2
  50. data/xml/x509_subjects.xml +251 -32
  51. metadata +5 -2
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\.]+)$">
@@ -751,7 +840,7 @@
751
840
  </fingerprint>
752
841
 
753
842
  <fingerprint pattern="^UOS$">
754
- <description>HTTP Server that appears unique to Managment Console on HP TippingPoint IPS Devices</description>
843
+ <description>HTTP Server that appears unique to Management Console on HP TippingPoint IPS Devices</description>
755
844
  <example>UOS</example>
756
845
  <param pos="0" name="service.vendor" value="HP"/>
757
846
  <param pos="0" name="service.product" value="HTTP"/>
@@ -789,10 +878,10 @@
789
878
  <param pos="0" name="service.cpe23" value="cpe:/a:acme:mini_httpd:-"/>
790
879
  </fingerprint>
791
880
 
792
- <fingerprint pattern="^LiteSpeed\/?(:?[\d.]+)?(?: \S+)?">
881
+ <fingerprint pattern="^LiteSpeed\/?([\d.]+)?(?: \S+)?">
793
882
  <description>LiteSpeed</description>
794
883
  <example>LiteSpeed</example>
795
- <example>LiteSpeed/5.2.8 Enterprise</example>
884
+ <example service.version="5.2.8">LiteSpeed/5.2.8 Enterprise</example>
796
885
  <param pos="0" name="service.vendor" value="LiteSpeed Technologies"/>
797
886
  <param pos="0" name="service.product" value="LiteSpeed Web Server"/>
798
887
  <param pos="1" name="service.version"/>
@@ -808,7 +897,7 @@
808
897
  <param pos="1" name="service.version"/>
809
898
  </fingerprint>
810
899
 
811
- <fingerprint pattern="^openresty\/?(:?[\d.]+)?$">
900
+ <fingerprint pattern="^openresty\/?([\d.]+)?$">
812
901
  <description>OpenResty OpenResty</description>
813
902
  <example>openresty</example>
814
903
  <example service.version="1.13.6.2">openresty/1.13.6.2</example>
@@ -856,7 +945,7 @@
856
945
  <param pos="0" name="service.cpe23" value="cpe:/a:wftpserver:wing_ftp_server:-"/>
857
946
  </fingerprint>
858
947
 
859
- <fingerprint pattern="^(?i)Linux UPnP/1.0 Sonos/([\d\.\-a-z]+) \((BR\d+)\)$">
948
+ <fingerprint pattern="(?i)^Linux UPnP/1.0 Sonos/([\d\.\-a-z]+) \((BR\d+)\)$">
860
949
  <description>Sonos Bridge/ZoneBridge</description>
861
950
  <example hw.model="BR100" hw.version="47.2-59120">Linux UPnP/1.0 Sonos/47.2-59120 (BR100)</example>
862
951
  <param pos="0" name="hw.vendor" value="Sonos"/>
@@ -867,7 +956,7 @@
867
956
  <param pos="0" name="os.product" value="Linux"/>
868
957
  </fingerprint>
869
958
 
870
- <fingerprint pattern="^(?i)Linux UPnP/1.0 Sonos/([\d\.\-a-z]+) \(ANVIL\)$">
959
+ <fingerprint pattern="(?i)^Linux UPnP/1.0 Sonos/([\d\.\-a-z]+) \(ANVIL\)$">
871
960
  <description>Sonos Subwoofer Speaker</description>
872
961
  <example>Linux UPnP/1.0 Sonos/31.3-22220 (ANVIL)</example>
873
962
  <param pos="0" name="hw.vendor" value="Sonos"/>
@@ -911,7 +1000,7 @@
911
1000
  <param pos="0" name="service.cpe23" value="cpe:/a:varnish-cache:varnish:-"/>
912
1001
  </fingerprint>
913
1002
 
914
- <fingerprint pattern="^Tengine\/?(:?[\d.]+)?$">
1003
+ <fingerprint pattern="^Tengine\/?([\d.]+)?$">
915
1004
  <description>Tengine</description>
916
1005
  <example>Tengine</example>
917
1006
  <example service.version="2.0.0">Tengine/2.0.0</example>
@@ -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
  <!--
@@ -1334,7 +1423,7 @@
1334
1423
  <param pos="0" name="service.cpe23" value="cpe:/a:eclipse:jetty:{service.version}"/>
1335
1424
  </fingerprint>
1336
1425
 
1337
- <fingerprint pattern="^(?i)squid/(\d+\.[\w.\-\+]+)$">
1426
+ <fingerprint pattern="(?i)^squid/(\d+\.[\w.\-\+]+)$">
1338
1427
  <description>Squid Web Proxy with a version</description>
1339
1428
  <example service.version="2.3.STABLE1">Squid/2.3.STABLE1</example>
1340
1429
  <example service.version="4.4">squid/4.4</example>
@@ -1346,7 +1435,7 @@
1346
1435
  <param pos="0" name="service.cpe23" value="cpe:/a:squid-cache:squid:{service.version}"/>
1347
1436
  </fingerprint>
1348
1437
 
1349
- <fingerprint pattern="^(?i)squid$">
1438
+ <fingerprint pattern="(?i)^squid$">
1350
1439
  <description>Squid Web Proxy without a version</description>
1351
1440
  <example>Squid</example>
1352
1441
  <example>squid</example>
@@ -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.]+))?.*$">
@@ -1401,7 +1492,7 @@
1401
1492
  <param pos="0" name="service.cpe23" value="cpe:/a:nginx:nginx:-"/>
1402
1493
  </fingerprint>
1403
1494
 
1404
- <fingerprint pattern="^nginx\/?(:?[\d.]+)?">
1495
+ <fingerprint pattern="^nginx\/?([\d.]+)?">
1405
1496
  <description>nginx with version info and/or mods</description>
1406
1497
  <example service.version="0.8.53">nginx/0.8.53 + Phusion Passenger 3.0.0 (mod_rails/mod_rack)</example>
1407
1498
  <example>nginx/0.8.53</example>
@@ -1490,8 +1581,8 @@
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"/>
@@ -1503,19 +1594,70 @@
1503
1594
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1504
1595
  </fingerprint>
1505
1596
 
1506
- <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X2-Win32 AbyssLib/(?:\d\.[\d.]+)$">
1507
- <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>
1508
1600
  <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
1509
1601
  <param pos="0" name="service.product" value="Abyss Web Server X1"/>
1510
1602
  <param pos="0" name="service.family" value="Abyss Web Server"/>
1511
1603
  <param pos="1" name="service.version"/>
1512
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"/>
1513
1631
  <param pos="0" name="os.vendor" value="Microsoft"/>
1514
1632
  <param pos="0" name="os.family" value="Windows"/>
1515
1633
  <param pos="0" name="os.product" value="Windows"/>
1516
1634
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1517
1635
  </fingerprint>
1518
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
+
1519
1661
  <fingerprint pattern="^Microsoft (Commerce Server\s*(?:2002|2007)?, (?:Enterprise|Standard|Evaluation|Developer) Edition)$">
1520
1662
  <description>Microsoft Commerce Server</description>
1521
1663
  <param pos="0" name="service.vendor" value="Microsoft"/>
@@ -1529,6 +1671,7 @@
1529
1671
 
1530
1672
  <fingerprint pattern="^NetWare-Enterprise-Web-Server/(\d+\.\d+)$">
1531
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>
1532
1675
  <param pos="0" name="service.vendor" value="Novell"/>
1533
1676
  <param pos="0" name="service.product" value="NetWare Enterprise Web Server"/>
1534
1677
  <param pos="0" name="service.family" value="NetWare Enterprise Web Server"/>
@@ -1736,7 +1879,7 @@
1736
1879
  <param pos="0" name="service.family" value="SSL-VPN"/>
1737
1880
  <param pos="0" name="os.vendor" value="SonicWall"/>
1738
1881
  <param pos="0" name="os.device" value="VPN"/>
1739
- <param pos="0" name="os.family" value="SSL-VPN"/>
1882
+ <param pos="0" name="os.family" value="SonicOS"/>
1740
1883
  <param pos="0" name="os.product" value="SonicOS"/>
1741
1884
  <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
1742
1885
  <param pos="0" name="hw.vendor" value="SonicWall"/>
@@ -1784,9 +1927,13 @@
1784
1927
  <param pos="0" name="os.vendor" value="NetApp"/>
1785
1928
  <param pos="0" name="os.family" value="Data ONTAP"/>
1786
1929
  <param pos="0" name="os.product" value="Data ONTAP"/>
1787
- <param pos="0" name="os.device" value="File Server"/>
1788
1930
  <param pos="1" name="os.version"/>
1931
+ <param pos="0" name="os.device" value="NAS"/>
1789
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"/>
1790
1937
  </fingerprint>
1791
1938
 
1792
1939
  <fingerprint pattern="^BlueCoat-Security-Appliance$">
@@ -1846,11 +1993,11 @@
1846
1993
  this information useful and mappable to CPE
1847
1994
  -->
1848
1995
 
1849
- <fingerprint pattern="^HP HTTP Server; (?:Hewlett-Packard )?HP ((\S+) \S+)">
1996
+ <fingerprint pattern="^HP HTTP Server; (?:Hewlett-Packard )?HP ((\S+) \S+)[^;]+; Serial Number: ([^;]+);">
1850
1997
  <description>HP Printer</description>
1851
- <example os.product="Photosmart C309a" os.family="Photosmart">HP HTTP Server; HP Photosmart C309a series - CC335A; Serial Number: abc123; Vader Built:Wed Apr 15, 2009 11:40:58AM {abc123, ASIC id 0x00280004}</example>
1852
- <example os.product="Officejet 6500" os.family="Officejet">HP HTTP Server; HP Officejet 6500 E709n - CB057A; Serial Number: abc123; Rainbow Built:Sat Dec 13, 2008 10:58:21AM {abc123, ASIC id 0x00ffc2105}</example>
1853
- <example os.product="Designjet T520" os.family="Designjet">HP HTTP Server; Hewlett-Packard HP Designjet T520 36in - ABC123; Serial Number: 0123456789; Built:Tue Sep 09, 2014 08:32:54AM {012345678901}</example>
1998
+ <example os.product="Photosmart C309a" os.family="Photosmart" hw.serial_number="abc123">HP HTTP Server; HP Photosmart C309a series - CC335A; Serial Number: abc123; Vader Built:Wed Apr 15, 2009 11:40:58AM {abc123, ASIC id 0x00280004}</example>
1999
+ <example os.product="Officejet 6500" os.family="Officejet" hw.serial_number="abc123">HP HTTP Server; HP Officejet 6500 E709n - CB057A; Serial Number: abc123; Rainbow Built:Sat Dec 13, 2008 10:58:21AM {abc123, ASIC id 0x00ffc2105}</example>
2000
+ <example os.product="Designjet T520" os.family="Designjet" hw.serial_number="0123456789">HP HTTP Server; Hewlett-Packard HP Designjet T520 36in - ABC123; Serial Number: 0123456789; Built:Tue Sep 09, 2014 08:32:54AM {012345678901}</example>
1854
2001
  <param pos="0" name="service.vendor" value="HP"/>
1855
2002
  <param pos="0" name="service.product" value="JetDirect"/>
1856
2003
  <param pos="0" name="service.family" value="JetDirect"/>
@@ -1862,6 +2009,7 @@
1862
2009
  <param pos="0" name="hw.family" value="JetDirect"/>
1863
2010
  <param pos="0" name="hw.product" value="JetDirect"/>
1864
2011
  <param pos="0" name="hw.device" value="Printer"/>
2012
+ <param pos="3" name="hw.serial_number"/>
1865
2013
  </fingerprint>
1866
2014
 
1867
2015
  <fingerprint pattern="^HTTP/1\.0$">
@@ -1963,7 +2111,7 @@
1963
2111
  <param pos="0" name="os.vendor" value="Cisco"/>
1964
2112
  <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
1965
2113
  <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
1966
- <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance:-"/>
2114
+ <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:-"/>
1967
2115
  <param pos="0" name="hw.vendor" value="Cisco"/>
1968
2116
  <param pos="0" name="hw.family" value="Adaptive Security Appliance"/>
1969
2117
  <param pos="0" name="hw.product" value="Adaptive Security Appliance"/>
@@ -2088,6 +2236,7 @@
2088
2236
  <param pos="0" name="os.family" value="NetScaler"/>
2089
2237
  <param pos="0" name="os.device" value="Network Management Device"/>
2090
2238
  <param pos="0" name="os.product" value="NetScaler"/>
2239
+ <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_firmware:-"/>
2091
2240
  <param pos="0" name="service.vendor" value="Citrix"/>
2092
2241
  <param pos="0" name="service.family" value="NetScaler"/>
2093
2242
  <param pos="0" name="service.device" value="Network Management Device"/>
@@ -2371,6 +2520,34 @@
2371
2520
  <param pos="2" name="python.version"/>
2372
2521
  </fingerprint>
2373
2522
 
2523
+ <fingerprint pattern="^Python/(\d\.[\d.]+) aiohttp/(\d[\w.]+)$">
2524
+ <description>AIOHTTP Project AIOHTTP</description>
2525
+ <example service.version="3.7.4.post0">Python/3.8 aiohttp/3.7.4.post0</example>
2526
+ <example python.version="3.4">Python/3.4 aiohttp/1.0.5</example>
2527
+ <param pos="0" name="service.vendor" value="AIOHTTP Project"/>
2528
+ <param pos="0" name="service.product" value="AIOHTTP"/>
2529
+ <param pos="2" name="service.version"/>
2530
+ <param pos="0" name="service.cpe23" value="cpe:/a:aiohttp_project:aiohttp:{service.version}"/>
2531
+ <param pos="1" name="python.version"/>
2532
+ </fingerprint>
2533
+
2534
+ <fingerprint pattern="^uvicorn$">
2535
+ <description>Encode uvicorn</description>
2536
+ <example>uvicorn</example>
2537
+ <param pos="0" name="service.vendor" value="Encode"/>
2538
+ <param pos="0" name="service.product" value="uvicorn"/>
2539
+ <param pos="0" name="service.cpe23" value="cpe:/a:encode:uvicorn:-"/>
2540
+ </fingerprint>
2541
+
2542
+ <fingerprint pattern="^Grandstream (GXP[^\s]+) ([\d\.]+)$">
2543
+ <description>Grandstream IP Phone</description>
2544
+ <example hw.product="GXP2020" hw.version="1.2.5.3">Grandstream GXP2020 1.2.5.3</example>
2545
+ <param pos="0" name="hw.vendor" value="Grandstream"/>
2546
+ <param pos="0" name="hw.device" value="VoIP"/>
2547
+ <param pos="2" name="hw.version"/>
2548
+ <param pos="1" name="hw.product"/>
2549
+ </fingerprint>
2550
+
2374
2551
  <fingerprint pattern="^HP Web Jetadmin/((?:\d+\.)*\d+)\s*(.*)$">
2375
2552
  <description>Apache variant for web access to HP printers.</description>
2376
2553
  <example>HP Web Jetadmin/2.0.50 (Win32) mod_auth_sspi/1.0.1 mod_ssl/2.0.50 OpenSSL/0.9.6m</example>
@@ -2414,6 +2591,17 @@
2414
2591
  <param pos="0" name="service.family" value="Web PN Server"/>
2415
2592
  </fingerprint>
2416
2593
 
2594
+ <fingerprint pattern="^ScreenConnect/([\d.]+)-(\d+)(?: Microsoft-HTTPAPI/2.0)?$">
2595
+ <description>ConnectWise Control formerly ScreenConnect</description>
2596
+ <example service.version="6.3.13446.6374">ScreenConnect/6.3.13446.6374-4039728469 Microsoft-HTTPAPI/2.0</example>
2597
+ <example service.version.version="3841999031">ScreenConnect/19.3.25270.7185-3841999031</example>
2598
+ <param pos="0" name="service.vendor" value="ConnectWise"/>
2599
+ <param pos="0" name="service.product" value="Control"/>
2600
+ <param pos="1" name="service.version"/>
2601
+ <param pos="2" name="service.version.version"/>
2602
+ <param pos="0" name="service.cpe23" value="cpe:/a:connectwise:control:{service.version}"/>
2603
+ </fingerprint>
2604
+
2417
2605
  <fingerprint pattern="^Lotus Expeditor Web Container/((?:\d+\.)*\d+)$">
2418
2606
  <description>Expeditor is a framework used by IBM in many products in the Lotus brand, such as Sametime and Notes.</description>
2419
2607
  <example>Lotus Expeditor Web Container/6.1</example>
@@ -2463,7 +2651,7 @@
2463
2651
  <param pos="1" name="service.version"/>
2464
2652
  </fingerprint>
2465
2653
 
2466
- <fingerprint pattern="^Embedthis-(?:Appweb|http)\/?(:?[\d.]+)?$">
2654
+ <fingerprint pattern="^Embedthis-(?:Appweb|http)\/?([\d.]+)?$">
2467
2655
  <description>Embedthis AppWeb</description>
2468
2656
  <example service.version="3.2.3">Embedthis-Appweb/3.2.3</example>
2469
2657
  <example>Embedthis-http</example>
@@ -2532,6 +2720,19 @@
2532
2720
  <param pos="0" name="service.product" value="Twisted Web"/>
2533
2721
  <param pos="0" name="service.family" value="Twisted Web"/>
2534
2722
  <param pos="1" name="service.version"/>
2723
+ <param pos="0" name="service.cpe23" value="cpe:/a:twistedmatrix:twistedweb:{service.version}"/>
2724
+ </fingerprint>
2725
+
2726
+ <fingerprint pattern="^Twisted/([\d.]+) TwistedWeb/([\d.]+)$">
2727
+ <description>Twisted Matrix Labs - TwistedWeb - verbose variant</description>
2728
+ <example service.version="13.0.0">Twisted/13.0.0 TwistedWeb/9.0.0</example>
2729
+ <example service.version.version="9.0.0">Twisted/17.9.0 TwistedWeb/9.0.0</example>
2730
+ <param pos="0" name="service.vendor" value="TwistedMatrix"/>
2731
+ <param pos="0" name="service.product" value="Twisted Web"/>
2732
+ <param pos="0" name="service.family" value="Twisted Web"/>
2733
+ <param pos="1" name="service.version"/>
2734
+ <param pos="2" name="service.version.version"/>
2735
+ <param pos="0" name="service.cpe23" value="cpe:/a:twistedmatrix:twistedweb:{service.version}"/>
2535
2736
  </fingerprint>
2536
2737
 
2537
2738
  <fingerprint pattern="^mini_httpd/((?:\d+\.)*\d+) \S*$">
@@ -2649,10 +2850,13 @@
2649
2850
  <fingerprint pattern="^PanWeb Server/ -">
2650
2851
  <description>HTTP and HTTPS server found on Palo Alto Networks devices</description>
2651
2852
  <example>PanWeb Server/ -</example>
2853
+ <param pos="0" name="hw.vendor" value="Palo Alto Networks"/>
2652
2854
  <param pos="0" name="service.vendor" value="Palo Alto Networks"/>
2653
2855
  <param pos="0" name="service.product" value="PA Firewall"/>
2856
+ <param pos="0" name="service.device" value="Firewall"/>
2654
2857
  <param pos="0" name="os.vendor" value="Palo Alto Networks"/>
2655
- <param pos="0" name="os.product" value="PA Firewall"/>
2858
+ <param pos="0" name="os.product" value="PAN-OS"/>
2859
+ <param pos="0" name="os.family" value="PAN-OS"/>
2656
2860
  <param pos="0" name="os.device" value="Firewall"/>
2657
2861
  <param pos="0" name="os.cpe23" value="cpe:/o:paloaltonetworks:pan-os:-"/>
2658
2862
  </fingerprint>
@@ -2761,48 +2965,53 @@
2761
2965
  <param pos="0" name="service.product" value="2wire"/>
2762
2966
  </fingerprint>
2763
2967
 
2764
- <!-- junit says,
2765
- "Example pattern '' from http_servers.xml didn't match pattern '^$'"
2766
- Figure out if we have a way to support matching empty strings later.
2767
- <fingerprint pattern="^?">
2768
- <example></example>
2769
- <description>A blank banner; assert nothing.</description>
2770
- </fingerprint>
2771
-
2772
- -->
2773
-
2774
- <fingerprint pattern="^(?:(?:\d+.){3}\d+):\d{1,4}$">
2775
- <description>A banner consisting of an IP address and port -- assert nothing.</description>
2968
+ <fingerprint pattern="^(?:(?:\d{1,3}\.){3}\d{1,3}):\d{1,4}$">
2969
+ <description>A banner consisting of an IPv4 address and port -- assert nothing.</description>
2776
2970
  <example>192.168.0.4:9999</example>
2971
+ <param pos="0" name="hw.certainty" value="0.0"/>
2972
+ <param pos="0" name="os.certainty" value="0.0"/>
2973
+ <param pos="0" name="service.certainty" value="0.0"/>
2777
2974
  </fingerprint>
2778
2975
 
2779
2976
  <fingerprint pattern="^Web-Server/(?:\d+\.+\d+)$">
2780
2977
  <description>Obfuscated web server -- assert nothing.</description>
2781
2978
  <example>Web-Server/3.0</example>
2979
+ <param pos="0" name="hw.certainty" value="0.0"/>
2980
+ <param pos="0" name="os.certainty" value="0.0"/>
2981
+ <param pos="0" name="service.certainty" value="0.0"/>
2782
2982
  </fingerprint>
2783
2983
 
2784
2984
  <fingerprint pattern="^httpd$">
2785
2985
  <description>httpd - generic -- assert nothing.</description>
2786
2986
  <example>httpd</example>
2987
+ <param pos="0" name="hw.certainty" value="0.0"/>
2988
+ <param pos="0" name="os.certainty" value="0.0"/>
2989
+ <param pos="0" name="service.certainty" value="0.0"/>
2787
2990
  </fingerprint>
2788
2991
 
2789
2992
  <!-- Service provider equipment (CDNs, etc) -->
2790
2993
 
2791
- <fingerprint pattern="^AkamaiGHost$">
2994
+ <fingerprint pattern="^(?:Akamai)?GHost$">
2792
2995
  <description>Akamai Global Host</description>
2793
2996
  <example>AkamaiGHost</example>
2997
+ <example>GHost</example>
2794
2998
  <param pos="0" name="service.vendor" value="Akamai"/>
2795
2999
  <param pos="0" name="service.product" value="GHost"/>
3000
+ <param pos="0" name="service.cpe23" value="cpe:/a:akamai:akamaighost:-"/>
2796
3001
  <param pos="0" name="os.vendor" value="Akamai"/>
3002
+ <param pos="0" name="os.family" value="Linux"/>
2797
3003
  <param pos="0" name="os.device" value="Web Proxy"/>
2798
3004
  </fingerprint>
2799
3005
 
3006
+ <!-- Banner used for many Google services such as search, Gmail, etc. -->
3007
+
2800
3008
  <fingerprint pattern="^gws$">
2801
3009
  <description>Google Web Services</description>
2802
3010
  <example>gws</example>
2803
3011
  <param pos="0" name="service.vendor" value="Google"/>
2804
- <param pos="0" name="service.product" value="Google Web Services"/>
2805
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:-"/>
2806
3015
  </fingerprint>
2807
3016
 
2808
3017
  <fingerprint pattern="^GFE/((?:\d+\.)*\d+)$">
@@ -2810,8 +3019,8 @@
2810
3019
  <example>GFE/1.3</example>
2811
3020
  <example>GFE/1</example>
2812
3021
  <param pos="0" name="service.vendor" value="Google"/>
2813
- <param pos="0" name="service.product" value="Google Front End"/>
2814
3022
  <param pos="0" name="service.family" value="Google Web Server"/>
3023
+ <param pos="0" name="service.product" value="Google Front End"/>
2815
3024
  <param pos="1" name="service.version"/>
2816
3025
  </fingerprint>
2817
3026
 
@@ -2819,8 +3028,9 @@
2819
3028
  <description>Amazon CloudFront web load balancer endpoint</description>
2820
3029
  <example>CloudFront</example>
2821
3030
  <param pos="0" name="service.vendor" value="Amazon"/>
3031
+ <param pos="0" name="service.family" value="Web Services"/>
2822
3032
  <param pos="0" name="service.product" value="CloudFront Load Balancer"/>
2823
- <param pos="0" name="service.family" value="CloudFront"/>
3033
+ <param pos="0" name="service.cpe23" value="cpe:/a:amazon:amazon_cloudfront:-"/>
2824
3034
  </fingerprint>
2825
3035
 
2826
3036
  <fingerprint pattern="^Amazon-Cloud-Drive$">
@@ -2834,13 +3044,16 @@
2834
3044
  <description>Amazon S3 (Simple Cloud Storage Service)</description>
2835
3045
  <example>AmazonS3</example>
2836
3046
  <param pos="0" name="service.vendor" value="Amazon"/>
3047
+ <param pos="0" name="service.family" value="Web Services"/>
2837
3048
  <param pos="0" name="service.product" value="S3"/>
3049
+ <param pos="0" name="service.cpe23" value="cpe:/a:amazon:amazon_simple_storage_service:-"/>
2838
3050
  </fingerprint>
2839
3051
 
2840
3052
  <fingerprint pattern="^Amazon SimpleDB$">
2841
3053
  <description>Amazon SimpleDB / Simple Database Service</description>
2842
3054
  <example>Amazon SimpleDB</example>
2843
3055
  <param pos="0" name="service.vendor" value="Amazon"/>
3056
+ <param pos="0" name="service.family" value="Web Services"/>
2844
3057
  <param pos="0" name="service.product" value="SimpleDB"/>
2845
3058
  </fingerprint>
2846
3059
 
@@ -2848,6 +3061,7 @@
2848
3061
  <description>Amazon Snowball</description>
2849
3062
  <example>AmazonSnowball</example>
2850
3063
  <param pos="0" name="service.vendor" value="Amazon"/>
3064
+ <param pos="0" name="service.family" value="Web Services"/>
2851
3065
  <param pos="0" name="service.product" value="Snowball"/>
2852
3066
  </fingerprint>
2853
3067
 
@@ -2855,8 +3069,10 @@
2855
3069
  <description>Amazon Elastic Load Balancing</description>
2856
3070
  <example service.version="2.0">awselb/2.0</example>
2857
3071
  <param pos="0" name="service.vendor" value="Amazon"/>
2858
- <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"/>
2859
3074
  <param pos="1" name="service.version"/>
3075
+ <param pos="0" name="service.cpe23" value="cpe:/a:amazon:elastic_load_balancing:{service.version}"/>
2860
3076
  </fingerprint>
2861
3077
 
2862
3078
  <fingerprint pattern="^cloudflare(?:-nginx)?$">
@@ -2866,6 +3082,7 @@
2866
3082
  <param pos="0" name="service.vendor" value="CloudFlare"/>
2867
3083
  <param pos="0" name="service.product" value="CloudFlare Load Balancer"/>
2868
3084
  <param pos="0" name="service.family" value="CloudFlare"/>
3085
+ <param pos="0" name="service.cpe23" value="cpe:/a:cloudflare:load_balancing:-"/>
2869
3086
  </fingerprint>
2870
3087
 
2871
3088
  <fingerprint pattern="^gSOAP/([\d\.]+)$">
@@ -3019,6 +3236,7 @@
3019
3236
  <param pos="0" name="service.family" value="Gateway"/>
3020
3237
  <param pos="0" name="service.product" value="Gateway"/>
3021
3238
  <param pos="1" name="service.version"/>
3239
+ <param pos="0" name="service.cpe23" value="cpe:/a:konghq:kong_gateway:{service.version}"/>
3022
3240
  </fingerprint>
3023
3241
 
3024
3242
  <fingerprint pattern="^kong/([\d.-]+)-enterprise-edition$">
@@ -3029,6 +3247,7 @@
3029
3247
  <param pos="0" name="service.family" value="Gateway"/>
3030
3248
  <param pos="0" name="service.product" value="Gateway"/>
3031
3249
  <param pos="1" name="service.version"/>
3250
+ <param pos="0" name="service.cpe23" value="cpe:/a:konghq:kong_gateway:{service.version}"/>
3032
3251
  </fingerprint>
3033
3252
 
3034
3253
  <!-- Tridium previously had a product with the 'Niagra' spelling -->
@@ -3064,7 +3283,7 @@
3064
3283
  <param pos="0" name="service.product" value="Node"/>
3065
3284
  </fingerprint>
3066
3285
 
3067
- <fingerprint pattern="(?i)^(.*) UPnP/[\d\.]+\s+AVM FRITZ!(.*) ([\d\.]+)$">
3286
+ <fingerprint pattern="(?i)^(.{0,256}) UPnP/[\d\.]+\s+AVM FRITZ!(.*) ([\d\.]+)$">
3068
3287
  <description>AVM FRITZ! devices of various types</description>
3069
3288
  <example host.name="some thing" os.product="WLAN Repeater 1750E" os.version="134.07.01">some thing UPnP/1.0 AVM FRITZ!WLAN Repeater 1750E 134.07.01</example>
3070
3289
  <param pos="0" name="os.vendor" value="AVM"/>
@@ -3074,15 +3293,26 @@
3074
3293
  <param pos="1" name="host.name"/>
3075
3294
  </fingerprint>
3076
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
+
3077
3307
  <fingerprint pattern="(?i)^Linux/(\S+) UPnP/[\d\.]+ miniupnpd/([\d\.]+)$">
3078
3308
  <description>Linux MiniUPnPd UPnP Server</description>
3079
3309
  <example service.version="1.0">Linux/Cross_compiled UPnP/1.0 miniupnpd/1.0</example>
3080
3310
  <example>Linux/2.6.29.6-217.2.3.fc11.i686.PAE UPnP/1.0 miniupnpd/1.0</example>
3081
3311
  <example>Linux/2.4.21 UPnP/1.0 miniupnpd/1.0</example>
3082
3312
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3083
- <param pos="0" name="service.product" value="MiniUPnP"/>
3313
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3084
3314
  <param pos="2" name="service.version"/>
3085
- <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}"/>
3086
3316
  <param pos="0" name="os.vendor" value="Linux"/>
3087
3317
  <param pos="0" name="os.product" value="Linux"/>
3088
3318
  <param pos="1" name="os.version"/>
@@ -3093,18 +3323,18 @@
3093
3323
  <description>Tomato UPnP Server</description>
3094
3324
  <example service.version="1.2">Tomato UPnP/1.0 MiniUPnPd/1.2</example>
3095
3325
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3096
- <param pos="0" name="service.product" value="MiniUPnP"/>
3326
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3097
3327
  <param pos="1" name="service.version"/>
3098
- <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}"/>
3099
3329
  </fingerprint>
3100
3330
 
3101
3331
  <fingerprint pattern="(?i)^(RT-\w+) UPnP/\S+ MiniUPnPd/([\d.]+)$">
3102
3332
  <description>Asus WAP UPnP Server</description>
3103
3333
  <example service.version="1.2">RT-G32 UPnP/1.0 MiniUPnPd/1.2</example>
3104
3334
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3105
- <param pos="0" name="service.product" value="MiniUPnP"/>
3335
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3106
3336
  <param pos="2" name="service.version"/>
3107
- <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}"/>
3108
3338
  <param pos="0" name="os.vendor" value="Asus"/>
3109
3339
  <param pos="1" name="os.product"/>
3110
3340
  <param pos="0" name="os.device" value="WAP"/>
@@ -3114,9 +3344,9 @@
3114
3344
  <description>DrayTek Vigor router UPnP Server</description>
3115
3345
  <example service.version="1.0" hw.model="2130">DrayTek/Vigor2130 UPnP/1.0 miniupnpd/1.0</example>
3116
3346
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3117
- <param pos="0" name="service.product" value="MiniUPnP"/>
3347
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3118
3348
  <param pos="2" name="service.version"/>
3119
- <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}"/>
3120
3350
  <param pos="0" name="hw.vendor" value="DrayTek"/>
3121
3351
  <param pos="0" name="hw.product" value="Vigor"/>
3122
3352
  <param pos="1" name="hw.model"/>
@@ -3134,9 +3364,9 @@
3134
3364
  <description>OpenWRT Kamikaze WAP UPnP Server</description>
3135
3365
  <example service.version="1.5">OpenWRT/kamikaze UPnP/1.0 MiniUPnPd/1.5</example>
3136
3366
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3137
- <param pos="0" name="service.product" value="MiniUPnP"/>
3367
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3138
3368
  <param pos="1" name="service.version"/>
3139
- <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}"/>
3140
3370
  <param pos="0" name="os.vendor" value="Linux"/>
3141
3371
  <param pos="0" name="os.family" value="OpenWRT"/>
3142
3372
  <param pos="0" name="os.product" value="Kamikaze"/>
@@ -3147,9 +3377,9 @@
3147
3377
  <description>Netgear DG834G or WNDR3300 WAP UPnP Server</description>
3148
3378
  <example service.version="1.0">Netgear/1.0 UPnP/1.0 miniupnpd/1.0</example>
3149
3379
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3150
- <param pos="0" name="service.product" value="MiniUPnP"/>
3380
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3151
3381
  <param pos="1" name="service.version"/>
3152
- <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}"/>
3153
3383
  <param pos="0" name="os.vendor" value="Netgear"/>
3154
3384
  <param pos="0" name="os.device" value="WAP"/>
3155
3385
  <param pos="0" name="hw.vendor" value="Netgear"/>
@@ -3174,9 +3404,9 @@
3174
3404
  <example os.version="wheezy/sid" service.version="1.8">Debian/wheezy/sid UPnP/1.1 MiniUPnPd/1.8</example>
3175
3405
  <example os.version="4.0" service.version="1.0">Debian/4.0 UPnP/1.0 miniupnpd/1.0</example>
3176
3406
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3177
- <param pos="0" name="service.product" value="MiniUPnP"/>
3407
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3178
3408
  <param pos="2" name="service.version"/>
3179
- <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}"/>
3180
3410
  <param pos="0" name="os.vendor" value="Debian"/>
3181
3411
  <param pos="0" name="os.product" value="Linux"/>
3182
3412
  <param pos="0" name="os.certainty" value="0.5"/>
@@ -3190,9 +3420,9 @@
3190
3420
  <example os.version="8" service.version="1.0">Fedora/8 UPnP/1.0 miniupnpd/1.0</example>
3191
3421
  <example os.version="6" service.version="1.0">FedoraCore/6 UPnP/1.0 miniupnpd/1.0</example>
3192
3422
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3193
- <param pos="0" name="service.product" value="MiniUPnP"/>
3423
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3194
3424
  <param pos="2" name="service.version"/>
3195
- <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}"/>
3196
3426
  <param pos="0" name="os.family" value="Linux"/>
3197
3427
  <param pos="0" name="os.vendor" value="Red Hat"/>
3198
3428
  <param pos="0" name="os.product" value="Fedora Core Linux"/>
@@ -3207,9 +3437,9 @@
3207
3437
  <example os.version="7.10" service.version="1.0">Ubuntu/7.10 UPnP/1.0 miniupnpd/1.0</example>
3208
3438
  <example os.version="9.04" service.version="1.0">Ubuntu/9.04 UPnP/1.0 miniupnpd/1.0</example>
3209
3439
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3210
- <param pos="0" name="service.product" value="MiniUPnP"/>
3440
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3211
3441
  <param pos="2" name="service.version"/>
3212
- <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}"/>
3213
3443
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3214
3444
  <param pos="0" name="os.product" value="Linux"/>
3215
3445
  <param pos="1" name="os.version"/>
@@ -3220,9 +3450,9 @@
3220
3450
  <description>miniupnpd on an Ubuntu bionic/18.04</description>
3221
3451
  <example os.version="18.04" service.version="1.4">Ubuntu/bionic UPnP/1.0 MiniUPnPd/1.4</example>
3222
3452
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3223
- <param pos="0" name="service.product" value="MiniUPnP"/>
3453
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3224
3454
  <param pos="1" name="service.version"/>
3225
- <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}"/>
3226
3456
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3227
3457
  <param pos="0" name="os.product" value="Linux"/>
3228
3458
  <param pos="0" name="os.version" value="18.04"/>
@@ -3233,9 +3463,9 @@
3233
3463
  <description>miniupnpd on an Ubuntu yakkety/16.10</description>
3234
3464
  <example os.version="16.10" service.version="1.4">Ubuntu/yakkety UPnP/1.0 MiniUPnPd/1.4</example>
3235
3465
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3236
- <param pos="0" name="service.product" value="MiniUPnP"/>
3466
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3237
3467
  <param pos="1" name="service.version"/>
3238
- <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}"/>
3239
3469
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3240
3470
  <param pos="0" name="os.product" value="Linux"/>
3241
3471
  <param pos="0" name="os.version" value="16.10"/>
@@ -3246,9 +3476,9 @@
3246
3476
  <description>miniupnpd on an Ubuntu xenial/16.04</description>
3247
3477
  <example os.version="16.04" service.version="1.4">Ubuntu/xenial UPnP/1.0 MiniUPnPd/1.4</example>
3248
3478
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3249
- <param pos="0" name="service.product" value="MiniUPnP"/>
3479
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3250
3480
  <param pos="1" name="service.version"/>
3251
- <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}"/>
3252
3482
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3253
3483
  <param pos="0" name="os.product" value="Linux"/>
3254
3484
  <param pos="0" name="os.version" value="16.04"/>
@@ -3259,9 +3489,9 @@
3259
3489
  <description>miniupnpd on an Ubuntu utopic/14.10</description>
3260
3490
  <example os.version="14.10" service.version="1.4">Ubuntu/utopic UPnP/1.0 MiniUPnPd/1.4</example>
3261
3491
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3262
- <param pos="0" name="service.product" value="MiniUPnP"/>
3492
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3263
3493
  <param pos="1" name="service.version"/>
3264
- <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}"/>
3265
3495
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3266
3496
  <param pos="0" name="os.product" value="Linux"/>
3267
3497
  <param pos="0" name="os.version" value="14.10"/>
@@ -3272,9 +3502,9 @@
3272
3502
  <description>miniupnpd on an Ubuntu trusty/14.04</description>
3273
3503
  <example os.version="14.04" service.version="1.4">Ubuntu/trusty UPnP/1.0 MiniUPnPd/1.4</example>
3274
3504
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3275
- <param pos="0" name="service.product" value="MiniUPnP"/>
3505
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3276
3506
  <param pos="1" name="service.version"/>
3277
- <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}"/>
3278
3508
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3279
3509
  <param pos="0" name="os.product" value="Linux"/>
3280
3510
  <param pos="0" name="os.version" value="14.04"/>
@@ -3285,9 +3515,9 @@
3285
3515
  <description>miniupnpd on an Ubuntu saucy/13.10</description>
3286
3516
  <example os.version="13.10" service.version="1.4">Ubuntu/saucy UPnP/1.0 MiniUPnPd/1.4</example>
3287
3517
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3288
- <param pos="0" name="service.product" value="MiniUPnP"/>
3518
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3289
3519
  <param pos="1" name="service.version"/>
3290
- <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}"/>
3291
3521
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3292
3522
  <param pos="0" name="os.product" value="Linux"/>
3293
3523
  <param pos="0" name="os.version" value="13.10"/>
@@ -3298,9 +3528,9 @@
3298
3528
  <description>miniupnpd on an Ubuntu raring/13.04</description>
3299
3529
  <example os.version="13.04" service.version="1.4">Ubuntu/raring UPnP/1.0 MiniUPnPd/1.4</example>
3300
3530
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3301
- <param pos="0" name="service.product" value="MiniUPnP"/>
3531
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3302
3532
  <param pos="1" name="service.version"/>
3303
- <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}"/>
3304
3534
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3305
3535
  <param pos="0" name="os.product" value="Linux"/>
3306
3536
  <param pos="0" name="os.version" value="13.04"/>
@@ -3311,9 +3541,9 @@
3311
3541
  <description>miniupnpd on an Ubuntu quantal/12.10</description>
3312
3542
  <example os.version="12.10" service.version="1.4">Ubuntu/quantal UPnP/1.0 MiniUPnPd/1.4</example>
3313
3543
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3314
- <param pos="0" name="service.product" value="MiniUPnP"/>
3544
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3315
3545
  <param pos="1" name="service.version"/>
3316
- <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}"/>
3317
3547
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3318
3548
  <param pos="0" name="os.product" value="Linux"/>
3319
3549
  <param pos="0" name="os.version" value="12.10"/>
@@ -3324,9 +3554,9 @@
3324
3554
  <description>miniupnpd on an Ubuntu precise/12.04</description>
3325
3555
  <example os.version="12.04" service.version="1.4">Ubuntu/precise UPnP/1.0 MiniUPnPd/1.4</example>
3326
3556
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3327
- <param pos="0" name="service.product" value="MiniUPnP"/>
3557
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3328
3558
  <param pos="1" name="service.version"/>
3329
- <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}"/>
3330
3560
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3331
3561
  <param pos="0" name="os.product" value="Linux"/>
3332
3562
  <param pos="0" name="os.version" value="12.04"/>
@@ -3337,9 +3567,9 @@
3337
3567
  <description>miniupnpd on an Ubuntu oneiric/11.10</description>
3338
3568
  <example os.version="11.10" service.version="1.4">Ubuntu/oneiric UPnP/1.0 MiniUPnPd/1.4</example>
3339
3569
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3340
- <param pos="0" name="service.product" value="MiniUPnP"/>
3570
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3341
3571
  <param pos="1" name="service.version"/>
3342
- <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}"/>
3343
3573
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3344
3574
  <param pos="0" name="os.product" value="Linux"/>
3345
3575
  <param pos="0" name="os.version" value="11.10"/>
@@ -3350,9 +3580,9 @@
3350
3580
  <description>miniupnpd on an Ubuntu natty/11.04</description>
3351
3581
  <example os.version="11.04" service.version="1.4">Ubuntu/natty UPnP/1.0 MiniUPnPd/1.4</example>
3352
3582
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3353
- <param pos="0" name="service.product" value="MiniUPnP"/>
3583
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3354
3584
  <param pos="1" name="service.version"/>
3355
- <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}"/>
3356
3586
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3357
3587
  <param pos="0" name="os.product" value="Linux"/>
3358
3588
  <param pos="0" name="os.version" value="11.04"/>
@@ -3363,9 +3593,9 @@
3363
3593
  <description>miniupnpd on an Ubuntu maverick/10.10</description>
3364
3594
  <example os.version="10.10" service.version="1.4">Ubuntu/maverick UPnP/1.0 MiniUPnPd/1.4</example>
3365
3595
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3366
- <param pos="0" name="service.product" value="MiniUPnP"/>
3596
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3367
3597
  <param pos="1" name="service.version"/>
3368
- <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}"/>
3369
3599
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3370
3600
  <param pos="0" name="os.product" value="Linux"/>
3371
3601
  <param pos="0" name="os.version" value="10.10"/>
@@ -3376,9 +3606,9 @@
3376
3606
  <description>miniupnpd on an Ubuntu lucid/10.04</description>
3377
3607
  <example os.version="10.04" service.version="1.4">Ubuntu/lucid UPnP/1.0 MiniUPnPd/1.4</example>
3378
3608
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3379
- <param pos="0" name="service.product" value="MiniUPnP"/>
3609
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3380
3610
  <param pos="1" name="service.version"/>
3381
- <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}"/>
3382
3612
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3383
3613
  <param pos="0" name="os.product" value="Linux"/>
3384
3614
  <param pos="0" name="os.version" value="10.04"/>
@@ -3389,9 +3619,9 @@
3389
3619
  <description>miniupnpd on an Ubuntu karmic/9.10</description>
3390
3620
  <example os.version="9.10" service.version="1.4">Ubuntu/karmic UPnP/1.0 MiniUPnPd/1.4</example>
3391
3621
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3392
- <param pos="0" name="service.product" value="MiniUPnP"/>
3622
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3393
3623
  <param pos="1" name="service.version"/>
3394
- <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}"/>
3395
3625
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3396
3626
  <param pos="0" name="os.product" value="Linux"/>
3397
3627
  <param pos="0" name="os.version" value="9.10"/>
@@ -3402,9 +3632,9 @@
3402
3632
  <description>miniupnpd on an Ubuntu jaunty/9.04</description>
3403
3633
  <example os.version="9.04" service.version="1.4">Ubuntu/jaunty UPnP/1.0 MiniUPnPd/1.4</example>
3404
3634
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3405
- <param pos="0" name="service.product" value="MiniUPnP"/>
3635
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3406
3636
  <param pos="1" name="service.version"/>
3407
- <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}"/>
3408
3638
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3409
3639
  <param pos="0" name="os.product" value="Linux"/>
3410
3640
  <param pos="0" name="os.version" value="9.04"/>
@@ -3415,9 +3645,9 @@
3415
3645
  <description>miniupnpd on an Ubuntu hardy/8.04</description>
3416
3646
  <example os.version="8.04" service.version="1.4">Ubuntu/hardy UPnP/1.0 MiniUPnPd/1.4</example>
3417
3647
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3418
- <param pos="0" name="service.product" value="MiniUPnP"/>
3648
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3419
3649
  <param pos="1" name="service.version"/>
3420
- <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}"/>
3421
3651
  <param pos="0" name="os.vendor" value="Ubuntu"/>
3422
3652
  <param pos="0" name="os.product" value="Linux"/>
3423
3653
  <param pos="0" name="os.version" value="8.04"/>
@@ -3428,9 +3658,9 @@
3428
3658
  <description>Linux MIPS UPnP Server</description>
3429
3659
  <example>Linux Mips 2.4.20 UPnP/1.0 MiniUPnPd/1.2</example>
3430
3660
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3431
- <param pos="0" name="service.product" value="MiniUPnP"/>
3661
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3432
3662
  <param pos="2" name="service.version"/>
3433
- <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}"/>
3434
3664
  <param pos="0" name="os.vendor" value="Linux"/>
3435
3665
  <param pos="0" name="os.product" value="Linux"/>
3436
3666
  <param pos="1" name="os.version"/>
@@ -3445,12 +3675,12 @@
3445
3675
  <param pos="1" name="os.version"/>
3446
3676
  <param pos="0" name="os.cpe23" value="cpe:/o:smoothwall:smoothwall:{os.version}"/>
3447
3677
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3448
- <param pos="0" name="service.product" value="MiniUPnP"/>
3678
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3449
3679
  <param pos="2" name="service.version"/>
3450
- <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}"/>
3451
3681
  </fingerprint>
3452
3682
 
3453
- <fingerprint pattern="^(\S+) \d+/Service Pack \d+, UPnP/[\d\.]+, TVersity Media Server$">
3683
+ <fingerprint pattern="^(\S{1,16}) \d+/Service Pack \d+, UPnP/[\d\.]+, TVersity Media Server$">
3454
3684
  <description>TVersity Media Server UPnP Server with Service Pack</description>
3455
3685
  <example>5.2.3790 2/Service Pack 1, UPnP/1.0, TVersity Media Server</example>
3456
3686
  <example>5.1.2600 2/Service Pack 3, UPnP/1.0, TVersity Media Server</example>
@@ -3459,7 +3689,7 @@
3459
3689
  <param pos="1" name="service.version"/>
3460
3690
  </fingerprint>
3461
3691
 
3462
- <fingerprint pattern="^(\S+) 2/, UPnP/\S+, TVersity Media Server$">
3692
+ <fingerprint pattern="^(\S{1,16}) 2/, UPnP/\S+, TVersity Media Server$">
3463
3693
  <description>TVersity Media Server UPnP Server</description>
3464
3694
  <example>6.2.8400 2/, UPnP/1.0, TVersity Media Server</example>
3465
3695
  <example>6.2.9200 2/, UPnP/1.0, TVersity Media Server</example>
@@ -3663,9 +3893,9 @@
3663
3893
  <example service.version="1.2">TBS/R2 UPnP/1.0 MiniUPnPd/1.2</example>
3664
3894
  <param pos="0" name="hw.vendor" value="D-Link"/>
3665
3895
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3666
- <param pos="0" name="service.product" value="MiniUPnP"/>
3896
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3667
3897
  <param pos="1" name="service.version"/>
3668
- <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}"/>
3669
3899
  </fingerprint>
3670
3900
 
3671
3901
  <fingerprint pattern="^alphapd/(\d\.[\d.]+)$">
@@ -3697,6 +3927,16 @@
3697
3927
  <param pos="0" name="os.device" value="WAP"/>
3698
3928
  </fingerprint>
3699
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
+
3700
3940
  <fingerprint pattern="^Linux/(\S+\_eureka_1), UPnP/[\d\.]+, Portable SDK for UPnP devices/(\S+)$">
3701
3941
  <description>Siqura Video Encoder</description>
3702
3942
  <example>Linux/2.6.37_eureka_1, UPnP/1.0, Portable SDK for UPnP devices/1.6.6</example>
@@ -3868,9 +4108,9 @@
3868
4108
  <param pos="0" name="hw.product" value="Roku"/>
3869
4109
  <param pos="0" name="hw.device" value="Media Server"/>
3870
4110
  <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
3871
- <param pos="0" name="service.product" value="MiniUPnP"/>
4111
+ <param pos="0" name="service.product" value="MiniUPnPd"/>
3872
4112
  <param pos="1" name="service.version"/>
3873
- <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}"/>
3874
4114
  </fingerprint>
3875
4115
 
3876
4116
  <fingerprint pattern="^UPnP/\S+, DLNADOC/\S+, Platinum/(\S+)$">
@@ -4007,6 +4247,24 @@
4007
4247
  <param pos="0" name="service.cpe23" value="cpe:/a:xiph:icecast:{service.version}"/>
4008
4248
  </fingerprint>
4009
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
+
4010
4268
  <fingerprint pattern="^Couchbase Sync Gateway/([\d.]+) CE$">
4011
4269
  <description>Couchbase Sync Gateway Community Edition</description>
4012
4270
  <example service.version="2.5.0">Couchbase Sync Gateway/2.5.0 CE</example>
@@ -4069,6 +4327,17 @@
4069
4327
  <param pos="0" name="service.cpe23" value="cpe:/a:axtls_project:axtls:{service.version}"/>
4070
4328
  </fingerprint>
4071
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
+
4072
4341
  <fingerprint pattern="^tinyproxy/([\d.]+)$">
4073
4342
  <description>TinyProxy Project tinyproxy</description>
4074
4343
  <example service.version="1.8.2">tinyproxy/1.8.2</example>
@@ -4170,6 +4439,67 @@
4170
4439
  <param pos="2" name="python.version"/>
4171
4440
  </fingerprint>
4172
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
+
4173
4503
  <!-- This is a version of ACME mini_httpd where the value 'mini_httpd' has been
4174
4504
  replaced with a UUID in the Server header AND body of the response. It
4175
4505
  is likely vendor or product specific.
@@ -4185,4 +4515,44 @@
4185
4515
  <param pos="0" name="service.cpe23" value="cpe:/a:acme:mini_httpd:-"/>
4186
4516
  </fingerprint>
4187
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
+
4188
4558
  </fingerprints>