recog 2.1.20 → 2.1.21

Sign up to get free protection for your applications and to get access to all the features.
Files changed (47) hide show
  1. checksums.yaml +4 -4
  2. data/lib/recog/version.rb +1 -1
  3. data/remap.json +131 -0
  4. data/spec/lib/fingerprint_self_test_spec.rb +16 -1
  5. data/update_cpes.py +202 -0
  6. data/xml/apache_os.xml +29 -5
  7. data/xml/architecture.xml +3 -3
  8. data/xml/dns_versionbind.xml +56 -10
  9. data/xml/ftp_banners.xml +56 -12
  10. data/xml/h323_callresp.xml +4 -4
  11. data/xml/hp_pjl_id.xml +8 -8
  12. data/xml/http_cookies.xml +20 -8
  13. data/xml/http_servers.xml +122 -8
  14. data/xml/http_wwwauth.xml +13 -3
  15. data/xml/imap_banners.xml +19 -1
  16. data/xml/ldap_searchresult.xml +44 -68
  17. data/xml/mdns_device-info_txt.xml +18 -7
  18. data/xml/mdns_workstation_txt.xml +7 -7
  19. data/xml/mysql_banners.xml +159 -13
  20. data/xml/mysql_error.xml +124 -21
  21. data/xml/nntp_banners.xml +10 -4
  22. data/xml/ntp_banners.xml +144 -84
  23. data/xml/operating_system.xml +39 -10
  24. data/xml/pop_banners.xml +32 -12
  25. data/xml/rsh_resp.xml +8 -3
  26. data/xml/sip_banners.xml +4 -3
  27. data/xml/sip_user_agents.xml +4 -3
  28. data/xml/smb_native_lm.xml +9 -4
  29. data/xml/smb_native_os.xml +50 -25
  30. data/xml/smtp_banners.xml +108 -33
  31. data/xml/smtp_debug.xml +11 -8
  32. data/xml/smtp_ehlo.xml +14 -11
  33. data/xml/smtp_expn.xml +17 -11
  34. data/xml/smtp_help.xml +17 -11
  35. data/xml/smtp_mailfrom.xml +4 -3
  36. data/xml/smtp_noop.xml +13 -8
  37. data/xml/smtp_quit.xml +10 -8
  38. data/xml/smtp_rcptto.xml +1 -3
  39. data/xml/smtp_rset.xml +10 -8
  40. data/xml/smtp_turn.xml +10 -8
  41. data/xml/smtp_vrfy.xml +18 -11
  42. data/xml/snmp_sysdescr.xml +157 -451
  43. data/xml/snmp_sysobjid.xml +57 -4
  44. data/xml/ssh_banners.xml +104 -5
  45. data/xml/upnp_banners.xml +16 -1
  46. data/xml/x11_banners.xml +34 -9
  47. metadata +4 -2
@@ -1,9 +1,9 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!--
3
- Responses to H.323 call SETUP messages are matched against these patterns
4
- to fingerprint H.323 servers.
5
- -->
6
2
  <fingerprints protocol="h.323" database_type="service" preference="0.80">
3
+ <!--
4
+ Responses to H.323 call SETUP messages are matched against these patterns
5
+ to fingerprint H.323 servers.
6
+ -->
7
7
  <fingerprint pattern="^0x000b2d00\:(.*)\:.*?(\d*\.*\d*\.*\d*).*$" flags="REG_ICASE">
8
8
  <description>Sony H.323 Server</description>
9
9
  <param pos="0" name="service.vendor" value="Sony"/>
@@ -1,13 +1,13 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!--
3
- For printers running the PJL protocol (usually on 9100/tcp), their type can be requested
4
- by the INFO ID command. The printer types (strings surrounded by double quotes) are
5
- matched against these patterns to fingerprint the printer.
6
-
7
- 'preference' notes: The value has been explicitly set to 0.10 due to the very loose
8
- regex that is used here.
9
- -->
10
2
  <fingerprints protocol="pjl" database_type="service" preference="0.10">
3
+ <!--
4
+ For printers running the PJL protocol (usually on 9100/tcp), their type can be requested
5
+ by the INFO ID command. The printer types (strings surrounded by double quotes) are
6
+ matched against these patterns to fingerprint the printer.
7
+
8
+ 'preference' notes: The value has been explicitly set to 0.10 due to the very loose
9
+ regex that is used here.
10
+ -->
11
11
  <!--
12
12
  LaserJet and Designjet are registered trademarks of HP. Therefore matching for the keywords
13
13
  is sufficient for asserting all relevant information
@@ -1,9 +1,9 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!--
3
- Set-Cookie HTTP header values are matched against these patterns to fingerprint HTTP
4
- servers.
5
- -->
6
2
  <fingerprints matches="http_header.cookie" protocol="http" database_type="service">
3
+ <!--
4
+ Set-Cookie HTTP header values are matched against these patterns to fingerprint HTTP
5
+ servers.
6
+ -->
7
7
  <fingerprint pattern="^(CFCLIENT_[^=]+|CFGLOBALS|CFID|CFTOKEN)=.*">
8
8
  <description>
9
9
  Adobe (Macromedia) ColdFusion uses various cookies.
@@ -14,6 +14,7 @@ servers.
14
14
  <param pos="0" name="service.vendor" value="Adobe"/>
15
15
  <param pos="0" name="service.family" value="ColdFusion"/>
16
16
  <param pos="0" name="service.product" value="ColdFusion"/>
17
+ <param pos="0" name="service.cpe23" value="cpe:/a:adobe:coldfusion:-"/>
17
18
  </fingerprint>
18
19
  <fingerprint pattern="^(Apache)=[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.([0-9]+);.*">
19
20
  <description>Apache</description>
@@ -22,6 +23,7 @@ servers.
22
23
  <param pos="0" name="service.vendor" value="Apache"/>
23
24
  <param pos="0" name="service.family" value="Apache"/>
24
25
  <param pos="0" name="service.product" value="HTTPD"/>
26
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
25
27
  </fingerprint>
26
28
  <fingerprint pattern="^(JServSessionIdroot)=.*">
27
29
  <description>Apache JServ</description>
@@ -44,6 +46,7 @@ servers.
44
46
  <param pos="0" name="service.vendor" value="BEA"/>
45
47
  <param pos="0" name="service.family" value="WebLogic"/>
46
48
  <param pos="0" name="service.product" value="WebLogic"/>
49
+ <param pos="0" name="service.cpe23" value="cpe:/a:bea:weblogic_server:-"/>
47
50
  </fingerprint>
48
51
  <fingerprint pattern="^(WebLogicSession)=.*">
49
52
  <description>BEA WebLogic (no timestamp)</description>
@@ -51,6 +54,7 @@ servers.
51
54
  <param pos="0" name="service.vendor" value="BEA"/>
52
55
  <param pos="0" name="service.family" value="WebLogic"/>
53
56
  <param pos="0" name="service.product" value="WebLogic"/>
57
+ <param pos="0" name="service.cpe23" value="cpe:/a:bea:weblogic_server:-"/>
54
58
  </fingerprint>
55
59
  <fingerprint pattern="^(BCSI-CSC[0-9A-Za-z]+)=.*">
56
60
  <description>BlueCoat Proxy</description>
@@ -65,7 +69,7 @@ servers.
65
69
  <param pos="0" name="service.family" value="PHP"/>
66
70
  <param pos="0" name="service.product" value="CakePHP"/>
67
71
  </fingerprint>
68
- <fingerprint pattern="^(ARPT)=([A-Z]+)([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})([A-Z]+).*">
72
+ <fingerprint pattern="^(ARPT)=([A-Z]+)([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})[A-Z]+.*">
69
73
  <description>Cisco 11000 Series Content Service Switch (CSS)
70
74
  http://www.cisco.com/warp/public/117/AP_cookies.html
71
75
 
@@ -76,7 +80,6 @@ servers.
76
80
  <param pos="1" name="cookie"/>
77
81
  <param pos="2" name="host.id"/>
78
82
  <param pos="3" name="host.ip"/>
79
- <param pos="4" name="timeout"/>
80
83
  <param pos="0" name="service.vendor" value="Cisco"/>
81
84
  <param pos="0" name="service.family" value="Content Service Switch"/>
82
85
  <param pos="0" name="service.product" value="11000 Series Content Service Switch"/>
@@ -119,9 +122,10 @@ servers.
119
122
  </description>
120
123
  <param pos="1" name="cookie"/>
121
124
  <param pos="2" name="loadbalancer.poolname"/>
122
- <param pos="0" name="service.vendor" value="F5 Labs"/>
125
+ <param pos="0" name="service.vendor" value="F5"/>
123
126
  <param pos="0" name="service.family" value="BIG-IP"/>
124
127
  <param pos="0" name="service.product" value="BIG-IP LTM"/>
128
+ <param pos="0" name="service.cpe23" value="cpe:/a:f5:big-ip_local_traffic_manager:-"/>
125
129
  </fingerprint>
126
130
  <fingerprint pattern="^(BigIPCookie)=.*">
127
131
  <description>F5 BIG-IP LTM
@@ -129,9 +133,10 @@ servers.
129
133
  http://www.f5.com/solutions/deployment/pdfs/SAP_v94_dg.pdf
130
134
  </description>
131
135
  <param pos="1" name="cookie"/>
132
- <param pos="0" name="service.vendor" value="F5 Labs"/>
136
+ <param pos="0" name="service.vendor" value="F5"/>
133
137
  <param pos="0" name="service.family" value="BIG-IP"/>
134
138
  <param pos="0" name="service.product" value="BIG-IP LTM"/>
139
+ <param pos="0" name="service.cpe23" value="cpe:/a:f5:big-ip_local_traffic_manager:-"/>
135
140
  </fingerprint>
136
141
  <fingerprint pattern="^(SERVERID)=([A-Za-z0-9\-_]+)">
137
142
  <description>HAProxy
@@ -186,6 +191,7 @@ servers.
186
191
  <param pos="0" name="service.vendor" value="Microsoft"/>
187
192
  <param pos="0" name="service.family" value="Commerce Server"/>
188
193
  <param pos="0" name="service.product" value="Commerce Server"/>
194
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:commerce_server:-"/>
189
195
  </fingerprint>
190
196
  <fingerprint pattern="^(ASPSESSIONID[A-Z]+|ASP\.NET_SessionId|\.ASPXANONYMOUS)=.*">
191
197
  <description>Microsoft IIS (ASP.NET)
@@ -197,9 +203,11 @@ servers.
197
203
  <param pos="0" name="service.vendor" value="Microsoft"/>
198
204
  <param pos="0" name="service.family" value="IIS"/>
199
205
  <param pos="0" name="service.product" value="IIS"/>
206
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:-"/>
200
207
  <param pos="0" name="service.component.vendor" value="Microsoft"/>
201
208
  <param pos="0" name="service.component.family" value="ASP.NET"/>
202
209
  <param pos="0" name="service.component.product" value="ASP.NET"/>
210
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:microsoft:asp.net:-"/>
203
211
  </fingerprint>
204
212
  <fingerprint pattern="^(AlteonP)=.*">
205
213
  <description>Nortel Alteon Web Switch</description>
@@ -228,6 +236,7 @@ servers.
228
236
  <param pos="0" name="service.vendor" value="PHP"/>
229
237
  <param pos="0" name="service.family" value="PHP"/>
230
238
  <param pos="0" name="service.product" value="PHP"/>
239
+ <param pos="0" name="service.cpe23" value="cpe:/a:php:php:-"/>
231
240
  </fingerprint>
232
241
  <fingerprint pattern="^(RMID)=.*">
233
242
  <description>RealMedia OpenAdStream</description>
@@ -268,6 +277,7 @@ servers.
268
277
  <param pos="0" name="service.family" value="Java System Web Server"/>
269
278
  <param pos="0" name="service.product" value="Java System Web Server"/>
270
279
  <param pos="0" name="service.version" value="4.0"/>
280
+ <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_server:4.0"/>
271
281
  </fingerprint>
272
282
  <fingerprint pattern="^(gx_session_id|JROUTE)=.*">
273
283
  <description>Sun Java System Application Server (formerly iPlanet Application Server,
@@ -276,6 +286,7 @@ servers.
276
286
  <param pos="0" name="service.vendor" value="Sun"/>
277
287
  <param pos="0" name="service.family" value="Java System Application Server"/>
278
288
  <param pos="0" name="service.product" value="Java System Application Server"/>
289
+ <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_application_server:-"/>
279
290
  </fingerprint>
280
291
  <fingerprint pattern="^(fe_typo_user)=.*">
281
292
  <description>TYPO3 CMS - http://typo3.com/</description>
@@ -351,6 +362,7 @@ servers.
351
362
  <param pos="0" name="service.component.vendor" value="Moodle"/>
352
363
  <param pos="0" name="service.component.family" value="Moodle"/>
353
364
  <param pos="0" name="service.component.product" value="Moodle"/>
365
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:moodle:moodle:-"/>
354
366
  </fingerprint>
355
367
  <!--
356
368
  Ignore various cookies that are very generic cookies for session IDs
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!-- HTTP Server headers are matched against these patterns to fingerprint HTTP servers. -->
3
2
  <fingerprints matches="http_header.server" protocol="http" database_type="service" preference="0.90">
3
+ <!-- HTTP Server headers are matched against these patterns to fingerprint HTTP servers. -->
4
4
  <fingerprint pattern="^Stronghold/(\d\.\d) Apache/([012][\d.]*)\s*(.*)$">
5
5
  <description>Red Hat Stronghold Enterprise Apache</description>
6
6
  <example>Stronghold/3.0 Apache/1.3.19 RedHat/3014c</example>
@@ -12,15 +12,18 @@
12
12
  <param pos="0" name="service.product" value="HTTPD"/>
13
13
  <param pos="0" name="service.family" value="Apache"/>
14
14
  <param pos="2" name="service.version"/>
15
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:{service.version}"/>
15
16
  <param pos="0" name="service.component.vendor" value="Red Hat"/>
16
17
  <param pos="0" name="service.component.product" value="Stronghold"/>
17
18
  <param pos="0" name="service.component.family" value="Stronghold"/>
18
19
  <param pos="1" name="service.component.version"/>
20
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:redhat:stronghold:{service.component.version}"/>
19
21
  <param pos="3" name="apache.info"/>
20
22
  <param pos="0" name="os.vendor" value="Red Hat"/>
21
23
  <param pos="0" name="os.device" value="General"/>
22
24
  <param pos="0" name="os.product" value="Linux"/>
23
25
  <param pos="0" name="os.family" value="Linux"/>
26
+ <param pos="0" name="os.cpe23" value="cpe:/o:redhat:linux:-"/>
24
27
  </fingerprint>
25
28
  <fingerprint pattern="^Apache/\d$" flags="REG_ICASE">
26
29
  <description>Apache returning only its major version number</description>
@@ -29,6 +32,7 @@
29
32
  <param pos="0" name="service.vendor" value="Apache"/>
30
33
  <param pos="0" name="service.product" value="HTTPD"/>
31
34
  <param pos="0" name="service.family" value="Apache"/>
35
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
32
36
  </fingerprint>
33
37
  <fingerprint pattern="^Apache$" flags="REG_ICASE">
34
38
  <description>Apache returning no version information</description>
@@ -37,6 +41,7 @@
37
41
  <param pos="0" name="service.vendor" value="Apache"/>
38
42
  <param pos="0" name="service.product" value="HTTPD"/>
39
43
  <param pos="0" name="service.family" value="Apache"/>
44
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
40
45
  </fingerprint>
41
46
  <fingerprint pattern="^Apache(?:-AdvancedExtranetServer)?(?:/([012][\d.]*)\s*(.*))?$" flags="REG_ICASE">
42
47
  <description>Apache</description>
@@ -1459,6 +1464,7 @@
1459
1464
  <param pos="0" name="service.product" value="HTTPD"/>
1460
1465
  <param pos="0" name="service.family" value="Apache"/>
1461
1466
  <param pos="1" name="service.version"/>
1467
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:{service.version}"/>
1462
1468
  <param pos="2" name="apache.info"/>
1463
1469
  </fingerprint>
1464
1470
  <fingerprint pattern="^Check Point SVN foundation$">
@@ -1467,6 +1473,7 @@
1467
1473
  <param pos="0" name="service.vendor" value="Check Point"/>
1468
1474
  <param pos="0" name="service.product" value="Firewall-1"/>
1469
1475
  <param pos="0" name="service.family" value="Firewall-1"/>
1476
+ <param pos="0" name="service.cpe23" value="cpe:/a:checkpoint:firewall-1:-"/>
1470
1477
  <param pos="0" name="os.vendor" value="Check Point"/>
1471
1478
  <param pos="0" name="os.device" value="Firewall"/>
1472
1479
  <param pos="0" name="os.family" value="Firewall-1"/>
@@ -1479,11 +1486,13 @@
1479
1486
  <param pos="0" name="service.product" value="IIS"/>
1480
1487
  <param pos="0" name="service.family" value="IIS"/>
1481
1488
  <param pos="1" name="service.version"/>
1489
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:{service.version}"/>
1482
1490
  <param pos="0" name="os.vendor" value="Microsoft"/>
1483
1491
  <param pos="0" name="os.device" value="General"/>
1484
1492
  <param pos="0" name="os.family" value="Windows"/>
1485
1493
  <param pos="0" name="os.product" value="Windows NT"/>
1486
1494
  <param pos="0" name="os.version" value="4.0"/>
1495
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_nt:4.0"/>
1487
1496
  </fingerprint>
1488
1497
  <fingerprint pattern="^Microsoft-IIS/5.0$">
1489
1498
  <description>Microsoft IIS 5.0 runs on Windows 2000</description>
@@ -1492,10 +1501,12 @@
1492
1501
  <param pos="0" name="service.product" value="IIS"/>
1493
1502
  <param pos="0" name="service.family" value="IIS"/>
1494
1503
  <param pos="0" name="service.version" value="5.0"/>
1504
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:5.0"/>
1495
1505
  <param pos="0" name="os.vendor" value="Microsoft"/>
1496
1506
  <param pos="0" name="os.device" value="General"/>
1497
1507
  <param pos="0" name="os.family" value="Windows"/>
1498
1508
  <param pos="0" name="os.product" value="Windows 2000"/>
1509
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_2000:-"/>
1499
1510
  </fingerprint>
1500
1511
  <fingerprint pattern="^Microsoft-IIS/5.1$">
1501
1512
  <description>Microsoft IIS 5.1 runs on Windows XP</description>
@@ -1504,10 +1515,12 @@
1504
1515
  <param pos="0" name="service.product" value="IIS"/>
1505
1516
  <param pos="0" name="service.family" value="IIS"/>
1506
1517
  <param pos="0" name="service.version" value="5.1"/>
1518
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:5.1"/>
1507
1519
  <param pos="0" name="os.vendor" value="Microsoft"/>
1508
1520
  <param pos="0" name="os.device" value="General"/>
1509
1521
  <param pos="0" name="os.family" value="Windows"/>
1510
1522
  <param pos="0" name="os.product" value="Windows XP"/>
1523
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_xp:-"/>
1511
1524
  </fingerprint>
1512
1525
  <fingerprint pattern="^Microsoft-IIS/6.0$">
1513
1526
  <description>Microsoft IIS 6.0 runs on Windows Server 2003 (and Windows XP x64)</description>
@@ -1516,10 +1529,12 @@
1516
1529
  <param pos="0" name="service.product" value="IIS"/>
1517
1530
  <param pos="0" name="service.family" value="IIS"/>
1518
1531
  <param pos="0" name="service.version" value="6.0"/>
1532
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:6.0"/>
1519
1533
  <param pos="0" name="os.vendor" value="Microsoft"/>
1520
1534
  <param pos="0" name="os.device" value="General"/>
1521
1535
  <param pos="0" name="os.family" value="Windows"/>
1522
1536
  <param pos="0" name="os.product" value="Windows Server 2003"/>
1537
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:-"/>
1523
1538
  </fingerprint>
1524
1539
  <fingerprint pattern="^Microsoft-IIS/7.0$">
1525
1540
  <description>Microsoft IIS 7.0 runs on Windows Server 2008 (and Windows Vista)</description>
@@ -1528,10 +1543,12 @@
1528
1543
  <param pos="0" name="service.product" value="IIS"/>
1529
1544
  <param pos="0" name="service.family" value="IIS"/>
1530
1545
  <param pos="0" name="service.version" value="7.0"/>
1546
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:7.0"/>
1531
1547
  <param pos="0" name="os.vendor" value="Microsoft"/>
1532
1548
  <param pos="0" name="os.device" value="General"/>
1533
1549
  <param pos="0" name="os.family" value="Windows"/>
1534
1550
  <param pos="0" name="os.product" value="Windows Server 2008"/>
1551
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
1535
1552
  </fingerprint>
1536
1553
  <fingerprint pattern="^Microsoft-IIS/7.5$">
1537
1554
  <description>Microsoft IIS 7.5 runs on Windows Server 2008 R2 (and Windows 7)</description>
@@ -1540,10 +1557,12 @@
1540
1557
  <param pos="0" name="service.product" value="IIS"/>
1541
1558
  <param pos="0" name="service.family" value="IIS"/>
1542
1559
  <param pos="0" name="service.version" value="7.5"/>
1560
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:7.5"/>
1543
1561
  <param pos="0" name="os.vendor" value="Microsoft"/>
1544
1562
  <param pos="0" name="os.device" value="General"/>
1545
1563
  <param pos="0" name="os.family" value="Windows"/>
1546
1564
  <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
1565
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
1547
1566
  </fingerprint>
1548
1567
  <fingerprint pattern="^Microsoft-IIS/8.0$">
1549
1568
  <description>Microsoft IIS 8.0 runs on Windows Server 2012 (and Windows 8)</description>
@@ -1552,10 +1571,12 @@
1552
1571
  <param pos="0" name="service.product" value="IIS"/>
1553
1572
  <param pos="0" name="service.family" value="IIS"/>
1554
1573
  <param pos="0" name="service.version" value="8.0"/>
1574
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:8.0"/>
1555
1575
  <param pos="0" name="os.vendor" value="Microsoft"/>
1556
1576
  <param pos="0" name="os.device" value="General"/>
1557
1577
  <param pos="0" name="os.family" value="Windows"/>
1558
1578
  <param pos="0" name="os.product" value="Windows Server 2012"/>
1579
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
1559
1580
  </fingerprint>
1560
1581
  <fingerprint pattern="^Microsoft-IIS/8.5$">
1561
1582
  <description>Microsoft IIS 8.5 runs on Windows Server 2012 R2 (and Windows 8.1)</description>
@@ -1564,10 +1585,12 @@
1564
1585
  <param pos="0" name="service.product" value="IIS"/>
1565
1586
  <param pos="0" name="service.family" value="IIS"/>
1566
1587
  <param pos="0" name="service.version" value="8.5"/>
1588
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:8.5"/>
1567
1589
  <param pos="0" name="os.vendor" value="Microsoft"/>
1568
1590
  <param pos="0" name="os.device" value="General"/>
1569
1591
  <param pos="0" name="os.family" value="Windows"/>
1570
1592
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
1593
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
1571
1594
  </fingerprint>
1572
1595
  <fingerprint pattern="^Microsoft-IIS/([\d\.]+)$">
1573
1596
  <description>Microsoft IIS new, unknown version</description>
@@ -1576,6 +1599,7 @@
1576
1599
  <param pos="0" name="service.product" value="IIS"/>
1577
1600
  <param pos="0" name="service.family" value="IIS"/>
1578
1601
  <param pos="1" name="service.version"/>
1602
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:{service.version}"/>
1579
1603
  </fingerprint>
1580
1604
  <fingerprint pattern="^Microsoft-IIS$">
1581
1605
  <description>Microsoft IIS, no version information</description>
@@ -1583,6 +1607,7 @@
1583
1607
  <param pos="0" name="service.vendor" value="Microsoft"/>
1584
1608
  <param pos="0" name="service.product" value="IIS"/>
1585
1609
  <param pos="0" name="service.family" value="IIS"/>
1610
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:-"/>
1586
1611
  <param pos="0" name="os.vendor" value="Microsoft"/>
1587
1612
  <param pos="0" name="os.device" value="General"/>
1588
1613
  <param pos="0" name="os.family" value="Windows"/>
@@ -1601,6 +1626,7 @@
1601
1626
  <param pos="0" name="os.device" value="General"/>
1602
1627
  <param pos="0" name="os.family" value="Windows"/>
1603
1628
  <param pos="0" name="os.product" value="Windows"/>
1629
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1604
1630
  </fingerprint>
1605
1631
  <fingerprint pattern="^Microsoft-WinCE/(\d\.\d+)$">
1606
1632
  <description>Windows CE embedded devices, including HP iPAQ,
@@ -1618,6 +1644,7 @@
1618
1644
  <param pos="0" name="os.family" value="Windows"/>
1619
1645
  <param pos="0" name="os.product" value="Windows CE"/>
1620
1646
  <param pos="1" name="os.version"/>
1647
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_ce:{os.version}"/>
1621
1648
  </fingerprint>
1622
1649
  <fingerprint pattern="^Microsoft-PWS/(\d\.\d+)$">
1623
1650
  <description>Microsoft Personal Web Server runs on Windows 9x, ME, etc.</description>
@@ -1626,10 +1653,12 @@
1626
1653
  <param pos="0" name="service.family" value="PWS"/>
1627
1654
  <param pos="0" name="service.product" value="PWS"/>
1628
1655
  <param pos="1" name="service.version"/>
1656
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:personal_web_server:{service.version}"/>
1629
1657
  <param pos="0" name="os.vendor" value="Microsoft"/>
1630
1658
  <param pos="0" name="os.device" value="General"/>
1631
1659
  <param pos="0" name="os.family" value="Windows"/>
1632
1660
  <param pos="0" name="os.product" value="Windows"/>
1661
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1633
1662
  </fingerprint>
1634
1663
  <fingerprint pattern="^Microsoft-PWS-95/(\d\.\d+)$">
1635
1664
  <description>Microsoft Personal Web Server for Windows 95</description>
@@ -1638,10 +1667,12 @@
1638
1667
  <param pos="0" name="service.family" value="PWS"/>
1639
1668
  <param pos="0" name="service.product" value="PWS"/>
1640
1669
  <param pos="1" name="service.version"/>
1670
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:personal_web_server:{service.version}"/>
1641
1671
  <param pos="0" name="os.vendor" value="Microsoft"/>
1642
1672
  <param pos="0" name="os.device" value="General"/>
1643
1673
  <param pos="0" name="os.family" value="Windows"/>
1644
1674
  <param pos="0" name="os.product" value="Windows 95"/>
1675
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_95:-"/>
1645
1676
  </fingerprint>
1646
1677
  <fingerprint pattern="^Apache[ -]Coyote/(\d\.\d)$">
1647
1678
  <description>HTTP connector for Apache Tomcat to run as a standalone
@@ -1651,6 +1682,7 @@
1651
1682
  <param pos="0" name="service.vendor" value="Apache"/>
1652
1683
  <param pos="0" name="service.product" value="Tomcat"/>
1653
1684
  <param pos="0" name="service.family" value="Tomcat"/>
1685
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:-"/>
1654
1686
  <param pos="0" name="service.component.vendor" value="Apache"/>
1655
1687
  <param pos="0" name="service.component.product" value="Coyote"/>
1656
1688
  <param pos="0" name="service.component.family" value="Coyote"/>
@@ -1662,10 +1694,12 @@
1662
1694
  <param pos="0" name="service.vendor" value="Red Hat"/>
1663
1695
  <param pos="0" name="service.product" value="JBoss EAP"/>
1664
1696
  <param pos="1" name="service.version"/>
1697
+ <param pos="0" name="service.cpe23" value="cpe:/a:redhat:jboss_enterprise_application_platform:{service.version}"/>
1665
1698
  <param pos="0" name="service.component.vendor" value="Apache"/>
1666
1699
  <param pos="0" name="service.component.product" value="Tomcat"/>
1667
1700
  <param pos="0" name="service.component.family" value="Tomcat"/>
1668
1701
  <param pos="2" name="service.component.version"/>
1702
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:apache:tomcat:{service.component.version}"/>
1669
1703
  </fingerprint>
1670
1704
  <fingerprint pattern="^Servlet [\d\.]+; Tomcat-(\S+)/JBoss-(\S+) \(build: .*\)$">
1671
1705
  <description>JBoss with embedded tomcat</description>
@@ -1673,10 +1707,12 @@
1673
1707
  <param pos="0" name="service.vendor" value="Red Hat"/>
1674
1708
  <param pos="0" name="service.product" value="JBoss EAP"/>
1675
1709
  <param pos="2" name="service.version"/>
1710
+ <param pos="0" name="service.cpe23" value="cpe:/a:redhat:jboss_enterprise_application_platform:{service.version}"/>
1676
1711
  <param pos="0" name="service.component.vendor" value="Apache"/>
1677
1712
  <param pos="0" name="service.component.product" value="Tomcat"/>
1678
1713
  <param pos="0" name="service.component.family" value="Tomcat"/>
1679
1714
  <param pos="1" name="service.component.version"/>
1715
+ <param pos="0" name="service.component.cpe23" value="cpe:/a:apache:tomcat:{service.component.version}"/>
1680
1716
  </fingerprint>
1681
1717
  <fingerprint pattern="^Servlet [\d\.]+; JBoss-([\S]+)(?: \(build.*)?/JBossWeb-(\S+)$">
1682
1718
  <description>JBoss with JBossweb</description>
@@ -1685,6 +1721,7 @@
1685
1721
  <param pos="0" name="service.vendor" value="Red Hat"/>
1686
1722
  <param pos="0" name="service.product" value="JBoss EAP"/>
1687
1723
  <param pos="1" name="service.version"/>
1724
+ <param pos="0" name="service.cpe23" value="cpe:/a:redhat:jboss_enterprise_application_platform:{service.version}"/>
1688
1725
  <param pos="0" name="service.component.vendor" value="RedHat"/>
1689
1726
  <param pos="0" name="service.component.product" value="JBossWeb"/>
1690
1727
  <param pos="2" name="service.component.version"/>
@@ -1695,14 +1732,16 @@
1695
1732
  <param pos="0" name="service.vendor" value="Red Hat"/>
1696
1733
  <param pos="0" name="service.product" value="JBoss AS"/>
1697
1734
  <param pos="1" name="service.version"/>
1735
+ <param pos="0" name="service.cpe23" value="cpe:/a:redhat:jboss_wildfly_application_server:{service.version}"/>
1698
1736
  </fingerprint>
1699
- <fingerprint pattern="^JBoss-EAP\/(\d+)$">
1737
+ <fingerprint pattern="^JBoss-EAP\/(\d+)$">
1700
1738
  <description>JBoss EAP</description>
1701
1739
  <example service.version="7">JBoss-EAP/7</example>
1702
1740
  <param pos="0" name="service.vendor" value="Red Hat"/>
1703
1741
  <param pos="0" name="service.family" value="JBoss"/>
1704
1742
  <param pos="0" name="service.product" value="JBoss EAP"/>
1705
1743
  <param pos="1" name="service.version"/>
1744
+ <param pos="0" name="service.cpe23" value="cpe:/a:redhat:jboss_enterprise_application_platform:{service.version}"/>
1706
1745
  </fingerprint>
1707
1746
  <fingerprint pattern="^Apache Tomcat/(\d\.[\d.]+)(?:-LE-jdk14)? \(HTTP/1.1 Connector\)$">
1708
1747
  <description>HTTP connector for Apache Tomcat to run as a standalone
@@ -1714,6 +1753,7 @@
1714
1753
  <param pos="0" name="service.family" value="Tomcat"/>
1715
1754
  <param pos="0" name="service.product" value="Tomcat"/>
1716
1755
  <param pos="1" name="service.version"/>
1756
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
1717
1757
  <param pos="0" name="service.component.vendor" value="Apache"/>
1718
1758
  <param pos="0" name="service.component.family" value="Apache Tomcat HTTP Connector"/>
1719
1759
  <param pos="0" name="service.component.product" value="Apache Tomcat HTTP Connector"/>
@@ -1729,6 +1769,7 @@
1729
1769
  <param pos="0" name="service.product" value="Tomcat"/>
1730
1770
  <param pos="0" name="service.family" value="Tomcat"/>
1731
1771
  <param pos="1" name="service.version"/>
1772
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
1732
1773
  <param pos="2" name="tomcat.info"/>
1733
1774
  </fingerprint>
1734
1775
  <fingerprint pattern="^Tomcat/(\S+)$">
@@ -1738,6 +1779,7 @@
1738
1779
  <param pos="0" name="service.product" value="Tomcat"/>
1739
1780
  <param pos="0" name="service.family" value="Tomcat"/>
1740
1781
  <param pos="1" name="service.version"/>
1782
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
1741
1783
  </fingerprint>
1742
1784
  <fingerprint pattern="^PHP/(\S+)$">
1743
1785
  <description>PHP</description>
@@ -1775,6 +1817,7 @@
1775
1817
  <param pos="0" name="service.product" value="HTTPD"/>
1776
1818
  <param pos="0" name="service.family" value="Apache"/>
1777
1819
  <param pos="2" name="service.version"/>
1820
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:{service.version}"/>
1778
1821
  <param pos="3" name="apache.info"/>
1779
1822
  <param pos="0" name="apache.variant" value="Oracle"/>
1780
1823
  <param pos="1" name="apache.variant.version"/>
@@ -1791,6 +1834,7 @@
1791
1834
  <param pos="0" name="service.vendor" value="Apache"/>
1792
1835
  <param pos="0" name="service.product" value="HTTPD"/>
1793
1836
  <param pos="0" name="service.family" value="Apache"/>
1837
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
1794
1838
  <param pos="2" name="apache.info"/>
1795
1839
  <param pos="0" name="apache.variant" value="Oracle"/>
1796
1840
  <param pos="1" name="apache.variant.version"/>
@@ -1802,6 +1846,7 @@
1802
1846
  <param pos="0" name="service.vendor" value="Apache"/>
1803
1847
  <param pos="0" name="service.product" value="HTTPD"/>
1804
1848
  <param pos="0" name="service.family" value="Apache"/>
1849
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
1805
1850
  <param pos="2" name="apache.info"/>
1806
1851
  <param pos="0" name="apache.variant" value="Oracle"/>
1807
1852
  <param pos="1" name="apache.variant.version"/>
@@ -1815,6 +1860,7 @@
1815
1860
  <param pos="0" name="service.product" value="HTTPD"/>
1816
1861
  <param pos="0" name="service.family" value="Apache"/>
1817
1862
  <param pos="1" name="service.version"/>
1863
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:{service.version}"/>
1818
1864
  <param pos="2" name="apache.info"/>
1819
1865
  <param pos="0" name="apache.variant" value="Oracle"/>
1820
1866
  </fingerprint>
@@ -1824,6 +1870,7 @@
1824
1870
  <param pos="0" name="service.vendor" value="Apache"/>
1825
1871
  <param pos="0" name="service.product" value="HTTPD"/>
1826
1872
  <param pos="0" name="service.family" value="Apache"/>
1873
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
1827
1874
  <param pos="0" name="apache.variant" value="Oracle"/>
1828
1875
  </fingerprint>
1829
1876
  <fingerprint pattern="^HP Apache-based Web Server/([012][\d.]*)\s*\(Unix\)\s*(.*)$">
@@ -1834,12 +1881,14 @@
1834
1881
  <param pos="0" name="service.product" value="HTTPD"/>
1835
1882
  <param pos="0" name="service.family" value="Apache"/>
1836
1883
  <param pos="1" name="service.version"/>
1884
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:{service.version}"/>
1837
1885
  <param pos="2" name="apache.info"/>
1838
1886
  <param pos="0" name="apache.variant" value="HP-UX"/>
1839
1887
  <param pos="0" name="os.vendor" value="HP"/>
1840
1888
  <param pos="0" name="os.device" value="General"/>
1841
1889
  <param pos="0" name="os.family" value="HP-UX"/>
1842
1890
  <param pos="0" name="os.product" value="HP-UX"/>
1891
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:-"/>
1843
1892
  </fingerprint>
1844
1893
  <fingerprint pattern="^CompaqHTTPServer/([0-9.]*)(?: HP System Management Homepage(?:/.*)?)?$">
1845
1894
  <description>HP/Compaq HTTP Server</description>
@@ -1880,6 +1929,7 @@
1880
1929
  <param pos="0" name="service.vendor" value="HP"/>
1881
1930
  <param pos="0" name="service.family" value="OpenView"/>
1882
1931
  <param pos="0" name="service.product" value="OpenView"/>
1932
+ <param pos="0" name="service.cpe23" value="cpe:/a:hp:openview:-"/>
1883
1933
  <param pos="0" name="service.component.vendor" value="HP"/>
1884
1934
  <param pos="0" name="service.component.family" value="OpenView"/>
1885
1935
  <param pos="0" name="service.component.product" value="CODA"/>
@@ -1891,6 +1941,7 @@
1891
1941
  <param pos="0" name="service.vendor" value="HP"/>
1892
1942
  <param pos="0" name="service.family" value="OpenView"/>
1893
1943
  <param pos="0" name="service.product" value="OpenView"/>
1944
+ <param pos="0" name="service.cpe23" value="cpe:/a:hp:openview:-"/>
1894
1945
  <param pos="0" name="service.component.vendor" value="HP"/>
1895
1946
  <param pos="0" name="service.component.family" value="OpenView"/>
1896
1947
  <param pos="0" name="service.component.product" value="Reverse Channel Proxy"/>
@@ -1903,6 +1954,7 @@
1903
1954
  <param pos="0" name="service.vendor" value="HP"/>
1904
1955
  <param pos="0" name="service.family" value="OpenView"/>
1905
1956
  <param pos="0" name="service.product" value="OpenView"/>
1957
+ <param pos="0" name="service.cpe23" value="cpe:/a:hp:openview:-"/>
1906
1958
  <param pos="0" name="service.component.vendor" value="HP"/>
1907
1959
  <param pos="0" name="service.component.family" value="OpenView"/>
1908
1960
  <param pos="0" name="service.component.product" value="LLBServer"/>
@@ -1915,6 +1967,7 @@
1915
1967
  <param pos="0" name="service.vendor" value="HP"/>
1916
1968
  <param pos="0" name="service.family" value="OpenView"/>
1917
1969
  <param pos="0" name="service.product" value="OpenView"/>
1970
+ <param pos="0" name="service.cpe23" value="cpe:/a:hp:openview:-"/>
1918
1971
  <param pos="0" name="service.component.vendor" value="HP"/>
1919
1972
  <param pos="0" name="service.component.family" value="OpenView"/>
1920
1973
  <param pos="0" name="service.component.product" value="Communication Broker"/>
@@ -1926,6 +1979,7 @@
1926
1979
  <param pos="0" name="service.vendor" value="HP"/>
1927
1980
  <param pos="0" name="service.family" value="OpenView"/>
1928
1981
  <param pos="0" name="service.product" value="OpenView"/>
1982
+ <param pos="0" name="service.cpe23" value="cpe:/a:hp:openview:-"/>
1929
1983
  <param pos="0" name="service.component.vendor" value="HP"/>
1930
1984
  <param pos="0" name="service.component.family" value="OpenView"/>
1931
1985
  <param pos="0" name="service.component.product" value="Communication Broker"/>
@@ -1947,6 +2001,7 @@
1947
2001
  <param pos="0" name="os.device" value="General"/>
1948
2002
  <param pos="0" name="os.family" value="Windows"/>
1949
2003
  <param pos="0" name="os.product" value="Windows"/>
2004
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1950
2005
  <param pos="0" name="service.vendor" value="RealMedia"/>
1951
2006
  <param pos="0" name="service.product" value="HTTP"/>
1952
2007
  <param pos="0" name="service.family" value="Helix Server"/>
@@ -1969,6 +2024,7 @@
1969
2024
  <param pos="0" name="os.device" value="General"/>
1970
2025
  <param pos="0" name="os.family" value="Windows"/>
1971
2026
  <param pos="0" name="os.product" value="Windows"/>
2027
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1972
2028
  <param pos="0" name="service.vendor" value="Microsoft"/>
1973
2029
  <param pos="0" name="service.product" value="HTTP"/>
1974
2030
  <param pos="0" name="service.family" value="Windows Media Services"/>
@@ -1981,6 +2037,7 @@
1981
2037
  <param pos="0" name="os.device" value="General"/>
1982
2038
  <param pos="0" name="os.family" value="Windows"/>
1983
2039
  <param pos="0" name="os.product" value="Windows"/>
2040
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1984
2041
  <param pos="0" name="service.vendor" value="Microsoft"/>
1985
2042
  <param pos="0" name="service.product" value="HTTP"/>
1986
2043
  <param pos="0" name="service.family" value="Windows Media Services"/>
@@ -1993,6 +2050,7 @@
1993
2050
  <param pos="0" name="os.device" value="General"/>
1994
2051
  <param pos="0" name="os.family" value="Windows"/>
1995
2052
  <param pos="0" name="os.product" value="Windows"/>
2053
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1996
2054
  </fingerprint>
1997
2055
  <fingerprint pattern="^ASP.NET$">
1998
2056
  <description>Something written in ASP.NET</description>
@@ -2002,6 +2060,7 @@
2002
2060
  <param pos="0" name="os.family" value="Windows"/>
2003
2061
  <param pos="0" name="os.product" value="Windows"/>
2004
2062
  <param pos="0" name="os.certainty" value="0.6"/>
2063
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
2005
2064
  </fingerprint>
2006
2065
  <fingerprint pattern="^[Xx]itami$">
2007
2066
  <description>Xitami web server</description>
@@ -2038,6 +2097,7 @@
2038
2097
  <param pos="0" name="service.vendor" value="IBM"/>
2039
2098
  <param pos="0" name="service.product" value="HTTP Server"/>
2040
2099
  <param pos="0" name="service.family" value="HTTP Server"/>
2100
+ <param pos="0" name="service.cpe23" value="cpe:/a:ibm:http_server:-"/>
2041
2101
  <param pos="0" name="os.certainty" value="0.9"/>
2042
2102
  <param pos="0" name="os.vendor" value="IBM"/>
2043
2103
  <param pos="0" name="os.device" value="General"/>
@@ -2061,6 +2121,7 @@
2061
2121
  <param pos="0" name="service.product" value="HTTPD"/>
2062
2122
  <param pos="0" name="service.family" value="Apache"/>
2063
2123
  <param pos="2" name="service.version"/>
2124
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:{service.version}"/>
2064
2125
  <param pos="3" name="apache.info"/>
2065
2126
  <param pos="0" name="apache.variant" value="IBM"/>
2066
2127
  <param pos="1" name="apache.variant.version"/>
@@ -2072,6 +2133,7 @@
2072
2133
  <param pos="0" name="service.vendor" value="Apache"/>
2073
2134
  <param pos="0" name="service.product" value="HTTPD"/>
2074
2135
  <param pos="0" name="service.family" value="Apache"/>
2136
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
2075
2137
  <param pos="0" name="apache.variant" value="IBM"/>
2076
2138
  <param pos="1" name="apache.variant.version"/>
2077
2139
  </fingerprint>
@@ -2082,6 +2144,7 @@
2082
2144
  <param pos="0" name="service.vendor" value="Apache"/>
2083
2145
  <param pos="0" name="service.product" value="HTTPD"/>
2084
2146
  <param pos="0" name="service.family" value="Apache"/>
2147
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
2085
2148
  <param pos="0" name="apache.variant" value="IBM"/>
2086
2149
  </fingerprint>
2087
2150
  <!--
@@ -2095,6 +2158,7 @@
2095
2158
  <param pos="0" name="service.family" value="Java System Application Server"/>
2096
2159
  <param pos="0" name="service.product" value="Java System Application Server"/>
2097
2160
  <param pos="1" name="service.version"/>
2161
+ <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_application_server:{service.version}"/>
2098
2162
  </fingerprint>
2099
2163
  <fingerprint pattern="^Sun[ -]Java[ -]System[ /]Application[ -]Server Platform Edition( \d\.[\d_]+)?$">
2100
2164
  <description>Sun Java System Application Server (formerly iPlanet Application Server,
@@ -2132,6 +2196,7 @@
2132
2196
  <param pos="0" name="service.family" value="Java System Web Server"/>
2133
2197
  <param pos="0" name="service.product" value="Java System Web Server"/>
2134
2198
  <param pos="1" name="service.version"/>
2199
+ <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_server:{service.version}"/>
2135
2200
  </fingerprint>
2136
2201
  <fingerprint pattern="^(?:Sun-Java-System-Web-Server|Sun-ONE-Web-Server)/(?:\d\.[\d_]+)$">
2137
2202
  <description>Sun Java System Web Server (formerly Netscape Enterprise Server, iPlanet Web
@@ -2141,6 +2206,7 @@
2141
2206
  <param pos="0" name="service.vendor" value="Sun"/>
2142
2207
  <param pos="0" name="service.family" value="Java System Web Server"/>
2143
2208
  <param pos="0" name="service.product" value="Java System Web Server"/>
2209
+ <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_server:-"/>
2144
2210
  </fingerprint>
2145
2211
  <!--
2146
2212
  Netscape/Sun's Web Proxy Server
@@ -2164,6 +2230,7 @@
2164
2230
  <param pos="0" name="service.family" value="Java System Web Proxy Server"/>
2165
2231
  <param pos="0" name="service.product" value="Java System Web Proxy Server"/>
2166
2232
  <param pos="1" name="service.version"/>
2233
+ <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_proxy_server:{service.version}"/>
2167
2234
  </fingerprint>
2168
2235
  <fingerprint pattern="^Sun-ONE-Web-Proxy-Server/(.*)$">
2169
2236
  <description>Sun ONE WebProxy Server (formerly iPlanet WebProxy Server,
@@ -2173,6 +2240,7 @@
2173
2240
  <param pos="0" name="service.family" value="Java System Web Proxy Server"/>
2174
2241
  <param pos="0" name="service.product" value="Java System Web Proxy Server"/>
2175
2242
  <param pos="1" name="service.version"/>
2243
+ <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_proxy_server:{service.version}"/>
2176
2244
  </fingerprint>
2177
2245
  <fingerprint pattern="^Sun-Java-System-Web-Proxy-Server/([^.]+\.[^.]+\.[^.]+)$">
2178
2246
  <description>Sun Java System Web Proxy Server (formerly iPlanet WebProxy Server,
@@ -2182,6 +2250,7 @@
2182
2250
  <param pos="0" name="service.family" value="Java System Web Proxy Server"/>
2183
2251
  <param pos="0" name="service.product" value="Java System Web Proxy Server"/>
2184
2252
  <param pos="1" name="service.version"/>
2253
+ <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_proxy_server:{service.version}"/>
2185
2254
  </fingerprint>
2186
2255
  <fingerprint pattern="^Sun-Java-System-Web-Proxy-Server/(?:4\.\d+)$">
2187
2256
  <description>Sun Java System Web Proxy Server (formerly iPlanet WebProxy Server,
@@ -2190,6 +2259,7 @@
2190
2259
  <param pos="0" name="service.vendor" value="Sun"/>
2191
2260
  <param pos="0" name="service.family" value="Java System Web Proxy Server"/>
2192
2261
  <param pos="0" name="service.product" value="Java System Web Proxy Server"/>
2262
+ <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_proxy_server:-"/>
2193
2263
  </fingerprint>
2194
2264
  <fingerprint pattern="^Sun-ILOM-Web-Server/(?:\d\.[\d._]+)$">
2195
2265
  <description>Sun Integrated Lights Out Manager (ILOM) usually
@@ -2211,6 +2281,7 @@
2211
2281
  <param pos="0" name="service.vendor" value="HP"/>
2212
2282
  <param pos="0" name="service.product" value="iLO"/>
2213
2283
  <param pos="0" name="service.family" value="iLO"/>
2284
+ <param pos="0" name="service.cpe23" value="cpe:/a:hp:integrated_lights_out:-"/>
2214
2285
  <param pos="0" name="hw.vendor" value="HP"/>
2215
2286
  <param pos="0" name="os.vendor" value="HP"/>
2216
2287
  <param pos="0" name="os.product" value="iLO"/>
@@ -2231,6 +2302,7 @@
2231
2302
  <param pos="0" name="service.product" value="Jetty"/>
2232
2303
  <param pos="0" name="service.family" value="Jetty"/>
2233
2304
  <param pos="1" name="service.version"/>
2305
+ <param pos="0" name="service.cpe23" value="cpe:/a:mortbay:jetty:{service.version}"/>
2234
2306
  <param pos="2" name="jetty.info"/>
2235
2307
  </fingerprint>
2236
2308
  <!-- Catch-all for Jetty versions using the Jetty/version format. -->
@@ -2241,6 +2313,7 @@
2241
2313
  <param pos="0" name="service.product" value="Jetty"/>
2242
2314
  <param pos="0" name="service.family" value="Jetty"/>
2243
2315
  <param pos="1" name="service.version"/>
2316
+ <param pos="0" name="service.cpe23" value="cpe:/a:mortbay:jetty:{service.version}"/>
2244
2317
  </fingerprint>
2245
2318
  <fingerprint pattern="^Jetty\((\S+)\)$">
2246
2319
  <description>Mort Bay Jetty</description>
@@ -2249,6 +2322,7 @@
2249
2322
  <param pos="0" name="service.product" value="Jetty"/>
2250
2323
  <param pos="0" name="service.family" value="Jetty"/>
2251
2324
  <param pos="1" name="service.version"/>
2325
+ <param pos="0" name="service.cpe23" value="cpe:/a:mortbay:jetty:{service.version}"/>
2252
2326
  </fingerprint>
2253
2327
  <fingerprint pattern="^[Ss]quid/(\d+\.[\w.]+)$">
2254
2328
  <description>Squid Web </description>
@@ -2296,6 +2370,7 @@
2296
2370
  <param pos="0" name="service.family" value="nginx"/>
2297
2371
  <param pos="0" name="service.vendor" value="nginx"/>
2298
2372
  <param pos="1" name="service.version"/>
2373
+ <param pos="0" name="service.cpe23" value="cpe:/a:nginx:nginx:{service.version}"/>
2299
2374
  </fingerprint>
2300
2375
  <fingerprint pattern="^nginx$">
2301
2376
  <description>nginx without version info</description>
@@ -2303,6 +2378,7 @@
2303
2378
  <param pos="0" name="service.product" value="nginx"/>
2304
2379
  <param pos="0" name="service.family" value="nginx"/>
2305
2380
  <param pos="0" name="service.vendor" value="nginx"/>
2381
+ <param pos="0" name="service.cpe23" value="cpe:/a:nginx:nginx:-"/>
2306
2382
  </fingerprint>
2307
2383
  <fingerprint pattern="^Lotus(?:-Domino)?(?:/|/0|/Release)?$">
2308
2384
  <description>IBM Lotus Notes/Domino with no useful version info</description>
@@ -2313,6 +2389,7 @@
2313
2389
  <param pos="0" name="service.vendor" value="IBM"/>
2314
2390
  <param pos="0" name="service.product" value="Lotus Domino"/>
2315
2391
  <param pos="0" name="service.family" value="Lotus Domino"/>
2392
+ <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:-"/>
2316
2393
  </fingerprint>
2317
2394
  <fingerprint pattern="^Lotus(?:-Domino)?/(?:Release-?)?([4-7][\d.]+)\s*(?:.*)$">
2318
2395
  <description>IBM Lotus Notes/Domino with version info</description>
@@ -2322,6 +2399,7 @@
2322
2399
  <param pos="0" name="service.product" value="Lotus Domino"/>
2323
2400
  <param pos="0" name="service.family" value="Lotus Domino"/>
2324
2401
  <param pos="1" name="service.version"/>
2402
+ <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:{service.version}"/>
2325
2403
  </fingerprint>
2326
2404
  <fingerprint pattern="^WebLogic (?:WebLogic )?Server (\d+\.\d+(?:\s+SP\d+)?)\s+.*$">
2327
2405
  <description>BEA WebLogic</description>
@@ -2332,6 +2410,7 @@
2332
2410
  <param pos="0" name="service.product" value="WebLogic"/>
2333
2411
  <param pos="0" name="service.family" value="WebLogic"/>
2334
2412
  <param pos="1" name="service.version"/>
2413
+ <param pos="0" name="service.cpe23" value="cpe:/a:bea:weblogic_server:{service.version}"/>
2335
2414
  </fingerprint>
2336
2415
  <fingerprint pattern="^WebSphere Application Server/(\d+\.\d+)$">
2337
2416
  <description>IBM WebSphere</description>
@@ -2351,6 +2430,7 @@
2351
2430
  <param pos="0" name="service.product" value="Resin"/>
2352
2431
  <param pos="0" name="service.family" value="Resin"/>
2353
2432
  <param pos="1" name="service.version"/>
2433
+ <param pos="0" name="service.cpe23" value="cpe:/a:caucho:resin:{service.version}"/>
2354
2434
  </fingerprint>
2355
2435
  <fingerprint pattern="^Ipswitch-IMail/(\d\.\d+)$">
2356
2436
  <description>Ipswitch IMail Server</description>
@@ -2361,10 +2441,12 @@
2361
2441
  <param pos="0" name="service.product" value="IMail Server"/>
2362
2442
  <param pos="0" name="service.family" value="IMail Server"/>
2363
2443
  <param pos="1" name="service.version"/>
2444
+ <param pos="0" name="service.cpe23" value="cpe:/a:ipswitch:imail_server:{service.version}"/>
2364
2445
  <param pos="0" name="os.vendor" value="Microsoft"/>
2365
2446
  <param pos="0" name="os.device" value="General"/>
2366
2447
  <param pos="0" name="os.family" value="Windows"/>
2367
2448
  <param pos="0" name="os.product" value="Windows"/>
2449
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
2368
2450
  </fingerprint>
2369
2451
  <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X1-Win32 AbyssLib/(?:\d\.[\d.]+)$">
2370
2452
  <description>Aprelium Technologies Abyss Web Server X1
@@ -2379,6 +2461,7 @@
2379
2461
  <param pos="0" name="os.device" value="General"/>
2380
2462
  <param pos="0" name="os.family" value="Windows"/>
2381
2463
  <param pos="0" name="os.product" value="Windows"/>
2464
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
2382
2465
  </fingerprint>
2383
2466
  <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X2-Win32 AbyssLib/(?:\d\.[\d.]+)$">
2384
2467
  <description>Aprelium Technologies Abyss Web Server X2
@@ -2391,6 +2474,7 @@
2391
2474
  <param pos="0" name="os.device" value="General"/>
2392
2475
  <param pos="0" name="os.family" value="Windows"/>
2393
2476
  <param pos="0" name="os.product" value="Windows"/>
2477
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
2394
2478
  </fingerprint>
2395
2479
  <fingerprint pattern="^Microsoft (Commerce Server\s*(?:2002|2007)?, (?:Enterprise|Standard|Evaluation|Developer) Edition)$">
2396
2480
  <description>Microsoft Commerce Server</description>
@@ -2401,6 +2485,7 @@
2401
2485
  <param pos="0" name="os.device" value="General"/>
2402
2486
  <param pos="0" name="os.family" value="Windows"/>
2403
2487
  <param pos="0" name="os.product" value="Windows"/>
2488
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
2404
2489
  </fingerprint>
2405
2490
  <fingerprint pattern="^NetWare-Enterprise-Web-Server/(\d+\.\d+)$">
2406
2491
  <description>NetWare Enterprise Web Server (runs on NetWare 5.1)</description>
@@ -2408,12 +2493,14 @@
2408
2493
  <param pos="0" name="service.product" value="NetWare Enterprise Web Server"/>
2409
2494
  <param pos="0" name="service.family" value="NetWare Enterprise Web Server"/>
2410
2495
  <param pos="1" name="service.version"/>
2496
+ <param pos="0" name="service.cpe23" value="cpe:/a:novell:netware_enterprise_web_server:{service.version}"/>
2411
2497
  <param pos="0" name="os.certainty" value="0.9"/>
2412
2498
  <param pos="0" name="os.vendor" value="Novell"/>
2413
2499
  <param pos="0" name="os.device" value="General"/>
2414
2500
  <param pos="0" name="os.family" value="NetWare"/>
2415
2501
  <param pos="0" name="os.product" value="NetWare"/>
2416
2502
  <param pos="1" name="os.version"/>
2503
+ <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:{os.version}"/>
2417
2504
  </fingerprint>
2418
2505
  <fingerprint pattern="^NetWare HTTP Stack$">
2419
2506
  <description>NetWare HTTP stack (runs on 6.0 and 6.5)</description>
@@ -2424,6 +2511,7 @@
2424
2511
  <param pos="0" name="os.device" value="General"/>
2425
2512
  <param pos="0" name="os.family" value="NetWare"/>
2426
2513
  <param pos="0" name="os.product" value="NetWare"/>
2514
+ <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:-"/>
2427
2515
  </fingerprint>
2428
2516
  <fingerprint pattern="^Novell-HTTP-Server/3.1R1$">
2429
2517
  <description>NetWare HTTP Server (runs on NetWare 4.11)</description>
@@ -2437,6 +2525,7 @@
2437
2525
  <param pos="0" name="os.family" value="NetWare"/>
2438
2526
  <param pos="0" name="os.product" value="NetWare"/>
2439
2527
  <param pos="0" name="os.version" value="4.11"/>
2528
+ <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:4.11"/>
2440
2529
  </fingerprint>
2441
2530
  <fingerprint pattern="^Novell-HTTP-Server/2.51R1$">
2442
2531
  <description>NetWare HTTP Server (runs on NetWare 4.1)</description>
@@ -2450,6 +2539,7 @@
2450
2539
  <param pos="0" name="os.family" value="NetWare"/>
2451
2540
  <param pos="0" name="os.product" value="NetWare"/>
2452
2541
  <param pos="0" name="os.version" value="4.1"/>
2542
+ <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:4.1"/>
2453
2543
  </fingerprint>
2454
2544
  <fingerprint pattern="^Netscape-FastTrack/(\d+\.[\w\s.]+)$">
2455
2545
  <description>Netscape FastTrack Server</description>
@@ -2457,6 +2547,7 @@
2457
2547
  <param pos="0" name="service.product" value="FastTrack Server"/>
2458
2548
  <param pos="0" name="service.family" value="FastTrack Server"/>
2459
2549
  <param pos="1" name="service.version"/>
2550
+ <param pos="0" name="service.cpe23" value="cpe:/a:netscape:fasttrack_server:{service.version}"/>
2460
2551
  </fingerprint>
2461
2552
  <fingerprint pattern="^Netscape-Commerce/(\d+\.[\w\s.]+)$">
2462
2553
  <description>Netscape Commerce Server</description>
@@ -2464,6 +2555,7 @@
2464
2555
  <param pos="0" name="service.product" value="Commerce Server"/>
2465
2556
  <param pos="0" name="service.family" value="Commerce Server"/>
2466
2557
  <param pos="1" name="service.version"/>
2558
+ <param pos="0" name="service.cpe23" value="cpe:/a:netscape:commerce_server:{service.version}"/>
2467
2559
  </fingerprint>
2468
2560
  <!--
2469
2561
  TODO
@@ -2524,6 +2616,7 @@
2524
2616
  <param pos="0" name="os.product" value="Data ONTAP"/>
2525
2617
  <param pos="0" name="os.device" value="File server"/>
2526
2618
  <param pos="1" name="os.version"/>
2619
+ <param pos="0" name="os.cpe23" value="cpe:/o:netapp:data_ontap:{os.version}"/>
2527
2620
  </fingerprint>
2528
2621
  <fingerprint pattern="^BlueCoat-Security-Appliance$">
2529
2622
  <description>Blue Coat security appliance</description>
@@ -2535,13 +2628,10 @@
2535
2628
  </fingerprint>
2536
2629
  <fingerprint pattern="^(?:BigIP|BIG-IP)$">
2537
2630
  <description>F5 BIG-IP</description>
2538
- <param pos="0" name="service.vendor" value="F5 Labs"/>
2539
- <param pos="0" name="service.product" value="BIG-IP"/>
2631
+ <param pos="0" name="service.vendor" value="F5"/>
2632
+ <param pos="0" name="service.product" value="BIG-IP LTM"/>
2540
2633
  <param pos="0" name="service.family" value="BIG-IP"/>
2541
- <param pos="0" name="os.vendor" value="F5 Labs"/>
2542
- <param pos="0" name="os.device" value="Load balancer"/>
2543
- <param pos="0" name="os.family" value="BIG-IP"/>
2544
- <param pos="0" name="os.product" value="BIG-IP"/>
2634
+ <param pos="0" name="service.cpe23" value="cpe:/a:f5:big-ip_local_traffic_manager:-"/>
2545
2635
  </fingerprint>
2546
2636
  <fingerprint pattern="^Foundry Networks(?:/(\d+\.\d+))?$">
2547
2637
  <description>Foundry Networks device (though not sure which)</description>
@@ -2631,10 +2721,12 @@
2631
2721
  <param pos="0" name="service.vendor" value="Cisco"/>
2632
2722
  <param pos="0" name="service.family" value="IOS"/>
2633
2723
  <param pos="0" name="service.product" value="IOS"/>
2724
+ <param pos="0" name="service.cpe23" value="cpe:/a:cisco:ios:-"/>
2634
2725
  <param pos="0" name="os.vendor" value="Cisco"/>
2635
2726
  <param pos="0" name="os.family" value="IOS"/>
2636
2727
  <param pos="0" name="os.product" value="IOS"/>
2637
2728
  <param pos="0" name="os.certainty" value="0.8"/>
2729
+ <param pos="0" name="os.cpe23" value="cpe:/o:cisco:ios:-"/>
2638
2730
  </fingerprint>
2639
2731
  <fingerprint pattern="^cisco-IOS/([^\s]+) HTTP-server/.*$">
2640
2732
  <description>Cisco IOS with version information</description>
@@ -2642,10 +2734,12 @@
2642
2734
  <param pos="0" name="service.vendor" value="Cisco"/>
2643
2735
  <param pos="0" name="service.family" value="IOS"/>
2644
2736
  <param pos="0" name="service.product" value="IOS"/>
2737
+ <param pos="0" name="service.cpe23" value="cpe:/a:cisco:ios:-"/>
2645
2738
  <param pos="0" name="os.vendor" value="Cisco"/>
2646
2739
  <param pos="0" name="os.family" value="IOS"/>
2647
2740
  <param pos="0" name="os.product" value="IOS"/>
2648
2741
  <param pos="1" name="os.version"/>
2742
+ <param pos="0" name="os.cpe23" value="cpe:/o:cisco:ios:{os.version}"/>
2649
2743
  </fingerprint>
2650
2744
  <fingerprint pattern="^Cisco AWARE (.*)$">
2651
2745
  <description>Cisco ASA</description>
@@ -2666,12 +2760,14 @@
2666
2760
  <param pos="0" name="os.vendor" value="Microsoft"/>
2667
2761
  <param pos="0" name="os.family" value="Windows"/>
2668
2762
  <param pos="0" name="os.product" value="Windows"/>
2763
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
2669
2764
  </fingerprint>
2670
2765
  <fingerprint pattern="^Agent-ListenServer-HttpSvr/.*$">
2671
2766
  <description>McAfee ePolicy Orchestrator</description>
2672
2767
  <param pos="0" name="service.vendor" value="McAfee"/>
2673
2768
  <param pos="0" name="service.product" value="ePolicy Orchestrator"/>
2674
2769
  <param pos="0" name="service.family" value="ePolicy Orchestrator"/>
2770
+ <param pos="0" name="service.cpe23" value="cpe:/a:mcafee:epolicy_orchestrator:-"/>
2675
2771
  </fingerprint>
2676
2772
  <fingerprint pattern="^EWS-NIC\d/(\S+)$">
2677
2773
  <description>Xerox Embedded Web Server (EWS)</description>
@@ -2695,12 +2791,14 @@
2695
2791
  <param pos="0" name="os.vendor" value="Microsoft"/>
2696
2792
  <param pos="0" name="os.family" value="Windows"/>
2697
2793
  <param pos="0" name="os.product" value="Windows"/>
2794
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
2698
2795
  </fingerprint>
2699
2796
  <fingerprint pattern="^JRun Web Server$">
2700
2797
  <description>Macromedia (formerly Allaire) JRun</description>
2701
2798
  <param pos="0" name="service.vendor" value="Macromedia"/>
2702
2799
  <param pos="0" name="service.family" value="JRun"/>
2703
2800
  <param pos="0" name="service.product" value="JRun"/>
2801
+ <param pos="0" name="service.cpe23" value="cpe:/a:macromedia:jrun:-"/>
2704
2802
  </fingerprint>
2705
2803
  <fingerprint pattern="^(?:Raptor )?Simple, Secure Web Server ([\d.]+)$">
2706
2804
  <description>Symantec Raptor Firewall</description>
@@ -2727,6 +2825,7 @@
2727
2825
  <param pos="0" name="os.vendor" value="Apple"/>
2728
2826
  <param pos="0" name="os.family" value="Mac OS X"/>
2729
2827
  <param pos="0" name="os.product" value="Mac OS X"/>
2828
+ <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
2730
2829
  </fingerprint>
2731
2830
  <fingerprint pattern="^servermgrd$">
2732
2831
  <description>Mac OS X Server administrative daemon</description>
@@ -2734,6 +2833,7 @@
2734
2833
  <param pos="0" name="os.vendor" value="Apple"/>
2735
2834
  <param pos="0" name="os.family" value="Mac OS X"/>
2736
2835
  <param pos="0" name="os.product" value="Mac OS X"/>
2836
+ <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
2737
2837
  </fingerprint>
2738
2838
  <fingerprint pattern="^(RMC Webserver|RAC_ONE_HTTP) (\d\.\d)$">
2739
2839
  <description>Dell Remote Access Controller</description>
@@ -2757,6 +2857,7 @@
2757
2857
  <param pos="0" name="service.vendor" value="IBM"/>
2758
2858
  <param pos="0" name="service.family" value="Tivoli"/>
2759
2859
  <param pos="0" name="service.product" value="Tivoli Storage Manager"/>
2860
+ <param pos="0" name="service.cpe23" value="cpe:/a:ibm:tivoli_storage_manager:-"/>
2760
2861
  </fingerprint>
2761
2862
  <fingerprint pattern="^D-Link MiniAVServer$">
2762
2863
  <description>D-Link embedded web server for web cams</description>
@@ -2779,6 +2880,7 @@
2779
2880
  <param pos="0" name="os.vendor" value="Linux"/>
2780
2881
  <param pos="0" name="os.family" value="Linux"/>
2781
2882
  <param pos="0" name="os.product" value="Linux"/>
2883
+ <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:-"/>
2782
2884
  </fingerprint>
2783
2885
  <fingerprint pattern="^RealVNC/(?:\S+)$">
2784
2886
  <description>RealVNC built-in webserver</description>
@@ -2814,12 +2916,14 @@
2814
2916
  <example>NSC/0.6.4 (JVM)</example>
2815
2917
  <param pos="0" name="service.vendor" value="Rapid7"/>
2816
2918
  <param pos="0" name="service.product" value="Nexpose"/>
2919
+ <param pos="0" name="service.cpe23" value="cpe:/a:rapid7:nexpose:-"/>
2817
2920
  </fingerprint>
2818
2921
  <fingerprint pattern="^Security Console$">
2819
2922
  <description>Rapid7 Nexpose Security Console</description>
2820
2923
  <example>Security Console</example>
2821
2924
  <param pos="0" name="service.vendor" value="Rapid7"/>
2822
2925
  <param pos="0" name="service.product" value="Nexpose"/>
2926
+ <param pos="0" name="service.cpe23" value="cpe:/a:rapid7:nexpose:-"/>
2823
2927
  </fingerprint>
2824
2928
  <fingerprint pattern="^Polycom SoundPoint IP Telephone HTTPd$">
2825
2929
  <description>Polycom Soundpoint IP Telephone</description>
@@ -2898,6 +3002,7 @@
2898
3002
  <param pos="0" name="service.product" value="CherryPy"/>
2899
3003
  <param pos="0" name="service.family" value="CherryPy"/>
2900
3004
  <param pos="1" name="service.version"/>
3005
+ <param pos="0" name="service.cpe23" value="cpe:/a:cherrypy:cherrypy:{service.version}"/>
2901
3006
  </fingerprint>
2902
3007
  <fingerprint pattern="^TornadoServer/((?:\d+\.)*\d+)$" flags="REG_ICASE">
2903
3008
  <description>Tornado Python web framework and asynchronous networking library.</description>
@@ -2926,6 +3031,7 @@
2926
3031
  <param pos="0" name="service.family" value="Apache"/>
2927
3032
  <param pos="0" name="apache.variant" value="HP Web Jetadmin"/>
2928
3033
  <param pos="1" name="service.version"/>
3034
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:{service.version}"/>
2929
3035
  <param pos="2" name="apache.info"/>
2930
3036
  </fingerprint>
2931
3037
  <fingerprint pattern="^HP Web Jetadmin ([\d\.]+)(?: \([^\)]+\))?$">
@@ -2935,6 +3041,7 @@
2935
3041
  <param pos="0" name="service.vendor" value="HP"/>
2936
3042
  <param pos="0" name="service.product" value="Web Jetadmin"/>
2937
3043
  <param pos="1" name="service.version"/>
3044
+ <param pos="0" name="service.cpe23" value="cpe:/a:hp:web_jetadmin:{service.version}"/>
2938
3045
  </fingerprint>
2939
3046
  <fingerprint pattern="^Citrix Web PN Server$">
2940
3047
  <description>Citrix Web PN (Program Neighborhood) Server is an HTTP server used by Citrix products</description>
@@ -2968,6 +3075,7 @@
2968
3075
  <param pos="0" name="service.product" value="Appweb"/>
2969
3076
  <param pos="0" name="service.family" value="Appweb"/>
2970
3077
  <param pos="1" name="service.version"/>
3078
+ <param pos="0" name="service.cpe23" value="cpe:/a:embedthis:appweb:{service.version}"/>
2971
3079
  </fingerprint>
2972
3080
  <fingerprint pattern="^Embedthis-http$">
2973
3081
  <description>An embedded web server for hosting dynamic web applications.</description>
@@ -2975,6 +3083,7 @@
2975
3083
  <param pos="0" name="service.vendor" value="Embedthis"/>
2976
3084
  <param pos="0" name="service.product" value="Appweb"/>
2977
3085
  <param pos="0" name="service.family" value="Appweb"/>
3086
+ <param pos="0" name="service.cpe23" value="cpe:/a:embedthis:appweb:-"/>
2978
3087
  </fingerprint>
2979
3088
  <fingerprint pattern="^Avaya CMBE/((?:\d+\.)*\d+)$">
2980
3089
  <description>Web server for Avaya Aura Communication Manager Branch, a SIP-based communications platform.</description>
@@ -3015,6 +3124,7 @@
3015
3124
  <param pos="0" name="service.product" value="CUPS"/>
3016
3125
  <param pos="0" name="service.family" value="CUPS"/>
3017
3126
  <param pos="1" name="service.version"/>
3127
+ <param pos="0" name="service.cpe23" value="cpe:/a:apple:cups:{service.version}"/>
3018
3128
  </fingerprint>
3019
3129
  <fingerprint pattern="^TwistedWeb/((?:\d\.)+\d+)$">
3020
3130
  <description>An HTTP server, HTML templating engind, and HTTP client library from Twisted Labs.</description>
@@ -3049,6 +3159,7 @@
3049
3159
  <param pos="0" name="service.product" value="DSView"/>
3050
3160
  <param pos="0" name="service.family" value="DSView"/>
3051
3161
  <param pos="1" name="service.version"/>
3162
+ <param pos="0" name="service.cpe23" value="cpe:/a:avocent:dsview:{service.version}"/>
3052
3163
  </fingerprint>
3053
3164
  <fingerprint pattern="^Mongrel ((?:\d+\.)*\d+)$">
3054
3165
  <description>Ruby-based web server and HTTP library.</description>
@@ -3122,6 +3233,7 @@
3122
3233
  <param pos="0" name="os.vendor" value="Palo Alto Networks"/>
3123
3234
  <param pos="0" name="os.product" value="PA Firewall"/>
3124
3235
  <param pos="0" name="os.device" value="Firewall"/>
3236
+ <param pos="0" name="os.cpe23" value="cpe:/o:paloaltonetworks:pan-os:-"/>
3125
3237
  </fingerprint>
3126
3238
  <fingerprint pattern="^Ews/((?:\d+\.)*\d+)$">
3127
3239
  <description>IBM Network Printer Manager.</description>
@@ -3263,6 +3375,7 @@
3263
3375
  <param pos="0" name="os.product" value="Mac OS X"/>
3264
3376
  <param pos="0" name="os.device" value="General"/>
3265
3377
  <param pos="0" name="os.version" value="10.3"/>
3378
+ <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.3"/>
3266
3379
  <param pos="0" name="service.product" value="QTSS"/>
3267
3380
  <param pos="1" name="service.version"/>
3268
3381
  </fingerprint>
@@ -3273,6 +3386,7 @@
3273
3386
  <param pos="0" name="os.family" value="Mac OS X"/>
3274
3387
  <param pos="0" name="os.product" value="Mac OS X"/>
3275
3388
  <param pos="0" name="os.device" value="General"/>
3389
+ <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
3276
3390
  <param pos="0" name="service.product" value="QTSS"/>
3277
3391
  <param pos="1" name="service.version"/>
3278
3392
  </fingerprint>