recog 2.1.20 → 2.1.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 (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
data/xml/rsh_resp.xml CHANGED
@@ -1,8 +1,8 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!--
3
- Rservices responses to requests are matched against these patterns to fingerprint the OSes of servers.
4
- -->
5
2
  <fingerprints protocol="rsh" database_type="service">
3
+ <!--
4
+ Rservices responses to requests are matched against these patterns to fingerprint the OSes of servers.
5
+ -->
6
6
  <fingerprint pattern="^.Permission denied: Error 0$">
7
7
  <description>Digital Unix rlogind</description>
8
8
  <example>xPermission denied: Error 0</example>
@@ -30,6 +30,7 @@ Rservices responses to requests are matched against these patterns to fingerprin
30
30
  <param pos="0" name="os.device" value="General"/>
31
31
  <param pos="0" name="os.family" value="Solaris"/>
32
32
  <param pos="0" name="os.product" value="Solaris"/>
33
+ <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:-"/>
33
34
  </fingerprint>
34
35
  <fingerprint pattern="^.rlogind: Acc.s refus.\..+$" flags="REG_DOT_NEWLINE">
35
36
  <description>AIX rlogind</description>
@@ -39,6 +40,7 @@ Rservices responses to requests are matched against these patterns to fingerprin
39
40
  <param pos="0" name="os.device" value="General"/>
40
41
  <param pos="0" name="os.family" value="AIX"/>
41
42
  <param pos="0" name="os.product" value="AIX"/>
43
+ <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:-"/>
42
44
  </fingerprint>
43
45
  <fingerprint pattern="^.rlogind: Host name for your address \([\d.]+\) unknown\..*$" flags="REG_DOT_NEWLINE">
44
46
  <description>A/UX rlogind</description>
@@ -57,6 +59,7 @@ Rservices responses to requests are matched against these patterns to fingerprin
57
59
  <param pos="0" name="os.device" value="General"/>
58
60
  <param pos="0" name="os.family" value="HP-UX"/>
59
61
  <param pos="0" name="os.product" value="HP-UX"/>
62
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:-"/>
60
63
  </fingerprint>
61
64
  <fingerprint pattern="^.rexecd: [-\d]+.*$" flags="REG_DOT_NEWLINE">
62
65
  <description>AIX rexecd</description>
@@ -66,6 +69,7 @@ Rservices responses to requests are matched against these patterns to fingerprin
66
69
  <param pos="0" name="os.device" value="General"/>
67
70
  <param pos="0" name="os.family" value="AIX"/>
68
71
  <param pos="0" name="os.product" value="AIX"/>
72
+ <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:-"/>
69
73
  </fingerprint>
70
74
  <fingerprint pattern="^.remshd: (?:getservbyname.+|Kerberos Authentication not enabled\..+|Error! Kerberos authentication failed)$" flags="REG_DOT_NEWLINE">
71
75
  <description>HP-UX rshd</description>
@@ -78,5 +82,6 @@ Rservices responses to requests are matched against these patterns to fingerprin
78
82
  <param pos="0" name="os.device" value="General"/>
79
83
  <param pos="0" name="os.family" value="HP-UX"/>
80
84
  <param pos="0" name="os.product" value="HP-UX"/>
85
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:-"/>
81
86
  </fingerprint>
82
87
  </fingerprints>
data/xml/sip_banners.xml CHANGED
@@ -1,14 +1,15 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!--
3
- SIP Server header values are matched against these patterns to fingerprint SIP devices.
4
- -->
5
2
  <fingerprints matches="sip_header.server" protocol="sip" database_type="service">
3
+ <!--
4
+ SIP Server header values are matched against these patterns to fingerprint SIP devices.
5
+ -->
6
6
  <fingerprint pattern="^Cisco-SIPGateway/IOS-([\d\.x]+)$">
7
7
  <description>Cisco SIPGateway</description>
8
8
  <example>Cisco-SIPGateway/IOS-12.x</example>
9
9
  <param pos="0" name="os.vendor" value="Cisco"/>
10
10
  <param pos="0" name="os.product" value="IOS"/>
11
11
  <param pos="1" name="os.version"/>
12
+ <param pos="0" name="os.cpe23" value="cpe:/o:cisco:ios:{os.version}"/>
12
13
  </fingerprint>
13
14
  <fingerprint pattern="^TANDBERG/\d+ \(([a-zA-Z]+\d+(?:\.\d+)+).*\)">
14
15
  <description>Cisco TelePresence</description>
data/xml/sip_user_agents.xml CHANGED
@@ -1,8 +1,8 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!--
3
- SIP User Agent header values are matched against these patterns to fingerprint SIP devices.
4
- -->
5
2
  <fingerprints matches="sip_header.user_agent" protocol="sip" database_type="service">
3
+ <!--
4
+ SIP User Agent header values are matched against these patterns to fingerprint SIP devices.
5
+ -->
6
6
  <!-- Cisco Devices -->
7
7
  <fingerprint pattern="^Cisco-SIPGateway/IOS-([\d\.x]+)$">
8
8
  <description>Cisco SIPGateway</description>
@@ -10,6 +10,7 @@ SIP User Agent header values are matched against these patterns to fingerprint S
10
10
  <param pos="0" name="os.vendor" value="Cisco"/>
11
11
  <param pos="0" name="os.product" value="IOS"/>
12
12
  <param pos="1" name="os.version"/>
13
+ <param pos="0" name="os.cpe23" value="cpe:/o:cisco:ios:{os.version}"/>
13
14
  </fingerprint>
14
15
  <!-- AVM.DE Devices -->
15
16
  <fingerprint pattern="^FRITZ!OS$">
data/xml/smb_native_lm.xml CHANGED
@@ -1,9 +1,9 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!--
3
- SMB fingerprints obtained from the Native LM (LAN manager) field of SMB
4
- negotations
5
- -->
6
2
  <fingerprints matches="smb.native_lm" protocol="smb" database_type="service">
3
+ <!--
4
+ SMB fingerprints obtained from the Native LM (LAN manager) field of SMB
5
+ negotations
6
+ -->
7
7
  <!-- Mac OS X -->
8
8
  <fingerprint pattern="^Samba (3\.0\.28a-apple)$">
9
9
  <description>Samba on OS X 10.6</description>
@@ -13,9 +13,11 @@
13
13
  <param pos="0" name="os.product" value="Mac OS X"/>
14
14
  <param pos="0" name="os.device" value="General"/>
15
15
  <param pos="0" name="os.version" value="10.6"/>
16
+ <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.6"/>
16
17
  <param pos="0" name="service.vendor" value="Samba"/>
17
18
  <param pos="0" name="service.product" value="Samba"/>
18
19
  <param pos="1" name="service.version"/>
20
+ <param pos="0" name="service.cpe23" value="cpe:/a:samba:samba:{service.version}"/>
19
21
  </fingerprint>
20
22
  <fingerprint pattern="^Samba (3\.0\.25b-apple)$">
21
23
  <description>Samba on OS X 10.5</description>
@@ -25,9 +27,11 @@
25
27
  <param pos="0" name="os.product" value="Mac OS X"/>
26
28
  <param pos="0" name="os.device" value="General"/>
27
29
  <param pos="0" name="os.version" value="10.5"/>
30
+ <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.5"/>
28
31
  <param pos="0" name="service.vendor" value="Samba"/>
29
32
  <param pos="0" name="service.product" value="Samba"/>
30
33
  <param pos="1" name="service.version"/>
34
+ <param pos="0" name="service.cpe23" value="cpe:/a:samba:samba:{service.version}"/>
31
35
  </fingerprint>
32
36
  <!-- TODO: Detect vendor, distribution, and package versions -->
33
37
  <fingerprint pattern="^Samba (\d\.\d+.\d+\w*)">
@@ -41,5 +45,6 @@
41
45
  <param pos="0" name="service.vendor" value="Samba"/>
42
46
  <param pos="0" name="service.product" value="Samba"/>
43
47
  <param pos="1" name="service.version"/>
48
+ <param pos="0" name="service.cpe23" value="cpe:/a:samba:samba:{service.version}"/>
44
49
  </fingerprint>
45
50
  </fingerprints>
data/xml/smb_native_os.xml CHANGED
@@ -1,8 +1,8 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!--
3
- SMB fingerprints obtained from the Native OS field of SMB negotations
4
- -->
5
2
  <fingerprints matches="smb.native_os" protocol="smb" database_type="util.os">
3
+ <!--
4
+ SMB fingerprints obtained from the Native OS field of SMB negotations
5
+ -->
6
6
  <fingerprint pattern="^(Windows NT \d\.\d+)$">
7
7
  <description>Windows NT</description>
8
8
  <example os.product="Windows NT 4.0">Windows NT 4.0</example>
@@ -24,6 +24,7 @@
24
24
  <param pos="0" name="os.certainty" value="1.0"/>
25
25
  <param pos="0" name="os.vendor" value="Microsoft"/>
26
26
  <param pos="0" name="os.product" value="Windows 2000"/>
27
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_2000:-"/>
27
28
  </fingerprint>
28
29
  <fingerprint pattern="^Windows 5\.1$">
29
30
  <description>Windows XP</description>
@@ -31,6 +32,7 @@
31
32
  <param pos="0" name="os.certainty" value="1.0"/>
32
33
  <param pos="0" name="os.vendor" value="Microsoft"/>
33
34
  <param pos="0" name="os.product" value="Windows XP"/>
35
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_xp:-"/>
34
36
  </fingerprint>
35
37
  <fingerprint pattern="^Windows XP (\d+) (Service Pack \d+)$">
36
38
  <description>Windows XP</description>
@@ -40,6 +42,7 @@
40
42
  <param pos="0" name="os.product" value="Windows XP"/>
41
43
  <param pos="1" name="os.build"/>
42
44
  <param pos="2" name="os.version"/>
45
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_xp:{os.version}"/>
43
46
  </fingerprint>
44
47
  <fingerprint pattern="^Windows XP (\d+)$">
45
48
  <description>Windows XP</description>
@@ -48,6 +51,7 @@
48
51
  <param pos="0" name="os.vendor" value="Microsoft"/>
49
52
  <param pos="0" name="os.product" value="Windows XP"/>
50
53
  <param pos="1" name="os.build"/>
54
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_xp:-"/>
51
55
  </fingerprint>
52
56
  <fingerprint pattern="^Windows XP (Home|Professional)(?: Edition)?$">
53
57
  <description>Windows XP without a version</description>
@@ -57,6 +61,7 @@
57
61
  <param pos="0" name="os.vendor" value="Microsoft"/>
58
62
  <param pos="0" name="os.product" value="Windows XP"/>
59
63
  <param pos="1" name="os.edition"/>
64
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_xp:-"/>
60
65
  </fingerprint>
61
66
  <fingerprint pattern="^Windows \.NET">
62
67
  <description>Windows Server 2003 Beta</description>
@@ -64,6 +69,7 @@
64
69
  <param pos="0" name="os.vendor" value="Microsoft"/>
65
70
  <param pos="0" name="os.product" value="Windows Server 2003"/>
66
71
  <param pos="0" name="os.version" value="Beta"/>
72
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:Beta"/>
67
73
  </fingerprint>
68
74
  <fingerprint pattern="^Windows Server 2003 R2 (\d+)$">
69
75
  <description>Windows Server 2003 R2</description>
@@ -71,6 +77,7 @@
71
77
  <param pos="0" name="os.vendor" value="Microsoft"/>
72
78
  <param pos="0" name="os.product" value="Windows Server 2003 R2"/>
73
79
  <param pos="1" name="os.build"/>
80
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:-"/>
74
81
  </fingerprint>
75
82
  <fingerprint pattern="^Windows Server 2003 R2 (\d+) (Service Pack \d+)(?:, v\.\d+)?$">
76
83
  <description>Windows Server 2003 R2 (SP)</description>
@@ -81,6 +88,7 @@
81
88
  <param pos="0" name="os.product" value="Windows Server 2003 R2"/>
82
89
  <param pos="1" name="os.build"/>
83
90
  <param pos="2" name="os.version"/>
91
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:{os.version}"/>
84
92
  </fingerprint>
85
93
  <fingerprint pattern="^Windows Server 2003 (\d+)$">
86
94
  <description>Windows Server 2003 with a build</description>
@@ -89,6 +97,7 @@
89
97
  <param pos="0" name="os.vendor" value="Microsoft"/>
90
98
  <param pos="0" name="os.product" value="Windows Server 2003"/>
91
99
  <param pos="1" name="os.build"/>
100
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:-"/>
92
101
  </fingerprint>
93
102
  <fingerprint pattern="^Windows Server 2003$">
94
103
  <description>Windows Server 2003 without a build</description>
@@ -96,6 +105,7 @@
96
105
  <param pos="0" name="os.certainty" value="1.0"/>
97
106
  <param pos="0" name="os.vendor" value="Microsoft"/>
98
107
  <param pos="0" name="os.product" value="Windows Server 2003"/>
108
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:-"/>
99
109
  </fingerprint>
100
110
  <fingerprint pattern="^Windows Server 2003 (\d+) (Service Pack \d+)(?:, v\.\d+)?$">
101
111
  <description>Windows Server 2003 (SP)</description>
@@ -106,6 +116,7 @@
106
116
  <param pos="0" name="os.product" value="Windows Server 2003"/>
107
117
  <param pos="1" name="os.build"/>
108
118
  <param pos="2" name="os.version"/>
119
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:{os.version}"/>
109
120
  </fingerprint>
110
121
  <!-- Note that 2008 SP1 is technically "2008 Gold" according to Microsoft -->
111
122
  <fingerprint pattern="^Windows Server 2008$">
@@ -114,6 +125,7 @@
114
125
  <param pos="0" name="os.certainty" value="1.0"/>
115
126
  <param pos="0" name="os.vendor" value="Microsoft"/>
116
127
  <param pos="0" name="os.product" value="Windows Server 2008"/>
128
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
117
129
  </fingerprint>
118
130
  <fingerprint pattern="^Windows Server \(R\) 2008 (\w+|\w+ \w+|\w+ \w+ \w+)(?: (?:with|without) Hyper-V|) (\d+) (Service Pack \d+)(?:, v\.\d+)?$">
119
131
  <description>Windows Server 2008</description>
@@ -125,6 +137,7 @@
125
137
  <param pos="1" name="os.edition"/>
126
138
  <param pos="2" name="os.build"/>
127
139
  <param pos="3" name="os.version"/>
140
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:{os.version}"/>
128
141
  </fingerprint>
129
142
  <fingerprint pattern="^Windows \(R\) Web Server 2008 (\d+) (Service Pack \d+)$">
130
143
  <description>Windows Web Server 2008 (SP)</description>
@@ -135,6 +148,7 @@
135
148
  <param pos="0" name="os.edition" value="Web"/>
136
149
  <param pos="1" name="os.build"/>
137
150
  <param pos="2" name="os.version"/>
151
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:{os.version}"/>
138
152
  </fingerprint>
139
153
  <fingerprint pattern="^Windows \(R\) Web Server 2008 (\d+)$">
140
154
  <description>Windows Web Server 2008</description>
@@ -144,6 +158,7 @@
144
158
  <param pos="0" name="os.product" value="Windows Server 2008"/>
145
159
  <param pos="0" name="os.edition" value="Web"/>
146
160
  <param pos="1" name="os.build"/>
161
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
147
162
  </fingerprint>
148
163
  <!-- TODO: Need an example string -->
149
164
  <fingerprint pattern="^Windows \(R\) Storage Server 2008 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
@@ -154,6 +169,7 @@
154
169
  <param pos="0" name="os.edition" value="Storage"/>
155
170
  <param pos="1" name="os.build"/>
156
171
  <param pos="2" name="os.version"/>
172
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:{os.version}"/>
157
173
  </fingerprint>
158
174
  <!-- TODO: Need an example string -->
159
175
  <fingerprint pattern="^Windows \(R\) Storage Server 2008 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
@@ -163,6 +179,7 @@
163
179
  <param pos="0" name="os.product" value="Windows Server 2008"/>
164
180
  <param pos="0" name="os.edition" value="Storage"/>
165
181
  <param pos="1" name="os.build"/>
182
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
166
183
  </fingerprint>
167
184
  <fingerprint pattern="^Windows Server 2008 HPC Edition (\d+) (Service Pack \d+)$">
168
185
  <description>Windows Server 2008 HPC</description>
@@ -173,6 +190,7 @@
173
190
  <param pos="0" name="os.edition" value="HPC"/>
174
191
  <param pos="1" name="os.build"/>
175
192
  <param pos="2" name="os.version"/>
193
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:{os.version}"/>
176
194
  </fingerprint>
177
195
  <!-- TODO: Need an example string -->
178
196
  <fingerprint pattern="^Windows Server 2008 HPC Edition (\d+)$">
@@ -183,6 +201,7 @@
183
201
  <param pos="0" name="os.product" value="Windows Server 2008"/>
184
202
  <param pos="0" name="os.edition" value="HPC"/>
185
203
  <param pos="1" name="os.build"/>
204
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
186
205
  </fingerprint>
187
206
  <!-- 2008 R2 -->
188
207
  <fingerprint pattern="^Windows Server 2008 R2 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)(?:, v\.\d+)?$">
@@ -195,6 +214,7 @@
195
214
  <param pos="1" name="os.edition"/>
196
215
  <param pos="2" name="os.build"/>
197
216
  <param pos="3" name="os.version"/>
217
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:{os.version}"/>
198
218
  </fingerprint>
199
219
  <fingerprint pattern="^Windows Server 2008 R2 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
200
220
  <description>Windows Server 2008 R2</description>
@@ -206,6 +226,7 @@
206
226
  <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
207
227
  <param pos="1" name="os.edition"/>
208
228
  <param pos="2" name="os.build"/>
229
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
209
230
  </fingerprint>
210
231
  <fingerprint pattern="^Windows Server 2016(?: Technical Preview \d+)? (\w+|\w+ \w+|\w+ \w+ \w+)(?: Evaluation)? (\d+)$">
211
232
  <description>Windows Server 2016 with a build, without service pack</description>
@@ -217,6 +238,7 @@
217
238
  <param pos="0" name="os.product" value="Windows Server 2016"/>
218
239
  <param pos="1" name="os.edition"/>
219
240
  <param pos="2" name="os.build"/>
241
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
220
242
  </fingerprint>
221
243
  <fingerprint pattern="^Windows Storage Server 2016 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
222
244
  <description>Windows Server 2016 Storage</description>
@@ -226,6 +248,7 @@
226
248
  <param pos="0" name="os.product" value="Windows Server 2016"/>
227
249
  <param pos="0" name="os.edition" value="Storage"/>
228
250
  <param pos="1" name="os.build"/>
251
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
229
252
  </fingerprint>
230
253
  <fingerprint pattern="^Windows Web Server 2008 R2 (\d+) (Service Pack \d+)$">
231
254
  <description>Windows Server 2008 R2 Web</description>
@@ -236,6 +259,7 @@
236
259
  <param pos="0" name="os.edition" value="Web"/>
237
260
  <param pos="1" name="os.build"/>
238
261
  <param pos="2" name="os.version"/>
262
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:{os.version}"/>
239
263
  </fingerprint>
240
264
  <fingerprint pattern="^Windows Web Server 2008 R2 (\d+)$">
241
265
  <description>Windows Web Server 2008 R2 Web</description>
@@ -245,6 +269,7 @@
245
269
  <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
246
270
  <param pos="0" name="os.edition" value="Web"/>
247
271
  <param pos="1" name="os.build"/>
272
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
248
273
  </fingerprint>
249
274
  <fingerprint pattern="^Windows Storage Server 2008 R2 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
250
275
  <description>Windows Server 2008 Storage R2 (SP)</description>
@@ -255,6 +280,7 @@
255
280
  <param pos="0" name="os.edition" value="Storage"/>
256
281
  <param pos="1" name="os.build"/>
257
282
  <param pos="2" name="os.version"/>
283
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:{os.version}"/>
258
284
  </fingerprint>
259
285
  <fingerprint pattern="^Windows Vista \(TM\) (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
260
286
  <description>Windows Vista (SP)</description>
@@ -265,6 +291,7 @@
265
291
  <param pos="1" name="os.edition"/>
266
292
  <param pos="2" name="os.build"/>
267
293
  <param pos="3" name="os.version"/>
294
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_vista:{os.version}"/>
268
295
  </fingerprint>
269
296
  <fingerprint pattern="^Windows Vista \(TM\) (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
270
297
  <description>Windows Vista</description>
@@ -274,6 +301,7 @@
274
301
  <param pos="0" name="os.product" value="Windows Vista"/>
275
302
  <param pos="1" name="os.edition"/>
276
303
  <param pos="2" name="os.build"/>
304
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_vista:-"/>
277
305
  </fingerprint>
278
306
  <fingerprint pattern="^(Windows (?:7|8|8\.1)(?:| RT)) (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)(?:, v\.\d+)?$">
279
307
  <description>Windows 7/8 (SP + Edition)</description>
@@ -325,6 +353,7 @@
325
353
  <param pos="1" name="os.edition"/>
326
354
  <param pos="2" name="os.build"/>
327
355
  <param pos="3" name="os.version"/>
356
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:{os.version}"/>
328
357
  </fingerprint>
329
358
  <fingerprint pattern="^Windows Server 2012 R2 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
330
359
  <description>Windows Server 2012 R2</description>
@@ -334,6 +363,7 @@
334
363
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
335
364
  <param pos="1" name="os.edition"/>
336
365
  <param pos="2" name="os.build"/>
366
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
337
367
  </fingerprint>
338
368
  <!-- TODO: Need an example string -->
339
369
  <fingerprint pattern="^Windows Server 2012 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
@@ -344,6 +374,7 @@
344
374
  <param pos="1" name="os.edition"/>
345
375
  <param pos="2" name="os.build"/>
346
376
  <param pos="3" name="os.version"/>
377
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:{os.version}"/>
347
378
  </fingerprint>
348
379
  <fingerprint pattern="^Windows Server 2012 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
349
380
  <description>Windows Server 2012</description>
@@ -353,6 +384,7 @@
353
384
  <param pos="0" name="os.product" value="Windows Server 2012"/>
354
385
  <param pos="1" name="os.edition"/>
355
386
  <param pos="2" name="os.build"/>
387
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
356
388
  </fingerprint>
357
389
  <fingerprint pattern="^Windows MultiPoint Server 2012 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
358
390
  <description>Windows MultiPoint Server 2012 (SP)</description>
@@ -363,6 +395,7 @@
363
395
  <param pos="0" name="os.edition" value="MultiPoint"/>
364
396
  <param pos="1" name="os.build"/>
365
397
  <param pos="2" name="os.version"/>
398
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:{os.version}"/>
366
399
  </fingerprint>
367
400
  <fingerprint pattern="^Windows MultiPoint Server 2012 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
368
401
  <description>Windows MultiPoint Server 2012</description>
@@ -372,6 +405,7 @@
372
405
  <param pos="0" name="os.product" value="Windows Server 2012"/>
373
406
  <param pos="0" name="os.edition" value="MultiPoint"/>
374
407
  <param pos="1" name="os.build"/>
408
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
375
409
  </fingerprint>
376
410
  <!-- Windows 10 Preview -->
377
411
  <fingerprint pattern="^Windows 10 (\w+|\w+ \w+|\w+ \w+ \w+) Insider Preview (\d+)$">
@@ -382,6 +416,7 @@
382
416
  <param pos="0" name="os.product" value="Windows 10"/>
383
417
  <param pos="1" name="os.edition"/>
384
418
  <param pos="2" name="os.build"/>
419
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_10:-"/>
385
420
  </fingerprint>
386
421
  <fingerprint pattern="^Windows 10 ((?:\w+|\w+ \w+|\w+ \w+ \w+)(?: LTSB(?: Evaluation)?)?) (\d+)$">
387
422
  <description>Windows 10</description>
@@ -398,6 +433,7 @@
398
433
  <param pos="0" name="os.product" value="Windows 10"/>
399
434
  <param pos="1" name="os.edition"/>
400
435
  <param pos="2" name="os.build"/>
436
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_10:-"/>
401
437
  </fingerprint>
402
438
  <fingerprint pattern="^VxWorks">
403
439
  <description>VxWorks</description>
@@ -405,10 +441,10 @@
405
441
  <param pos="0" name="os.certainty" value="0.5"/>
406
442
  <param pos="0" name="os.vendor" value="Wind River"/>
407
443
  <param pos="0" name="os.product" value="VxWorks"/>
444
+ <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:-"/>
408
445
  <param pos="0" name="service.vendor" value="Wind River"/>
409
446
  <param pos="0" name="service.product" value="VxWorks CIFS"/>
410
447
  </fingerprint>
411
-
412
448
  <fingerprint pattern="^OS/400 \D(\d+)\D(\d+)\D(\d+)">
413
449
  <description>OS/400</description>
414
450
  <example os.version="4" os.version.version="5" os.version.version.version="0">OS/400 V4R5M0</example>
@@ -418,19 +454,17 @@
418
454
  <param pos="2" name="os.version.version"/>
419
455
  <param pos="3" name="os.version.version.version"/>
420
456
  </fingerprint>
421
-
422
457
  <!-- VisionFS -->
423
-
424
458
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)ai(\d{4})">
425
459
  <description>AIX</description>
426
460
  <example service.version="9876">axai9876</example>
427
461
  <param pos="0" name="os.vendor" value="IBM"/>
428
462
  <param pos="0" name="os.family" value="AIX"/>
429
463
  <param pos="0" name="os.product" value="AIX"/>
464
+ <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:-"/>
430
465
  <param pos="0" name="service.product" value="VisionFS"/>
431
466
  <param pos="1" name="service.version"/>
432
467
  </fingerprint>
433
-
434
468
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)dg(\d{4})">
435
469
  <description>DG/UX</description>
436
470
  <example service.version="9876">i3dg9876</example>
@@ -440,17 +474,16 @@
440
474
  <param pos="0" name="service.product" value="VisionFS"/>
441
475
  <param pos="1" name="service.version"/>
442
476
  </fingerprint>
443
-
444
477
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)dw(\d{4})">
445
478
  <description>Darwin</description>
446
479
  <example service.version="9876">m8dw9876</example>
447
480
  <param pos="0" name="os.vendor" value="Apple"/>
448
481
  <param pos="0" name="os.family" value="Mac OS X"/>
449
482
  <param pos="0" name="os.product" value="Mac OS X"/>
483
+ <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
450
484
  <param pos="0" name="service.product" value="VisionFS"/>
451
485
  <param pos="1" name="service.version"/>
452
486
  </fingerprint>
453
-
454
487
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)dy(\d{4})">
455
488
  <description>DYNIX</description>
456
489
  <example service.version="9876">m8dy9876</example>
@@ -460,47 +493,46 @@
460
493
  <param pos="0" name="service.product" value="VisionFS"/>
461
494
  <param pos="1" name="service.version"/>
462
495
  </fingerprint>
463
-
464
496
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)fb(\d{4})">
465
497
  <description>FreeBSD</description>
466
498
  <example service.version="9876">m8fb9876</example>
467
499
  <param pos="0" name="os.vendor" value="FreeBSD"/>
468
500
  <param pos="0" name="os.family" value="FreeBSD"/>
469
501
  <param pos="0" name="os.product" value="FreeBSD"/>
502
+ <param pos="0" name="os.cpe23" value="cpe:/o:freebsd:freebsd:-"/>
470
503
  <param pos="0" name="service.product" value="VisionFS"/>
471
504
  <param pos="1" name="service.version"/>
472
505
  </fingerprint>
473
-
474
506
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)hp(\d{4})">
475
507
  <description>HP-UX</description>
476
508
  <example service.version="9876">m8hp9876</example>
477
509
  <param pos="0" name="os.vendor" value="HP"/>
478
510
  <param pos="0" name="os.family" value="HP-UX"/>
479
511
  <param pos="0" name="os.product" value="HP-UX"/>
512
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:-"/>
480
513
  <param pos="0" name="service.product" value="VisionFS"/>
481
514
  <param pos="1" name="service.version"/>
482
515
  </fingerprint>
483
-
484
516
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)ir(\d{4})">
485
517
  <description>IRIX</description>
486
518
  <example service.version="9876">m8ir9876</example>
487
519
  <param pos="0" name="os.vendor" value="SGI"/>
488
520
  <param pos="0" name="os.family" value="Irix"/>
489
521
  <param pos="0" name="os.product" value="Irix"/>
522
+ <param pos="0" name="os.cpe23" value="cpe:/o:sgi:irix:-"/>
490
523
  <param pos="0" name="service.product" value="VisionFS"/>
491
524
  <param pos="1" name="service.version"/>
492
525
  </fingerprint>
493
-
494
526
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)li(\d{4})">
495
527
  <description>Linux</description>
496
528
  <example service.version="9876">m8li9876</example>
497
529
  <param pos="0" name="os.vendor" value="Linux"/>
498
530
  <param pos="0" name="os.family" value="Linux"/>
499
531
  <param pos="0" name="os.product" value="Linux"/>
532
+ <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:-"/>
500
533
  <param pos="0" name="service.product" value="VisionFS"/>
501
534
  <param pos="1" name="service.version"/>
502
535
  </fingerprint>
503
-
504
536
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)mo(\d{4})">
505
537
  <description>SVR</description>
506
538
  <example service.version="9876">m8mo9876</example>
@@ -510,7 +542,6 @@
510
542
  <param pos="0" name="service.product" value="VisionFS"/>
511
543
  <param pos="1" name="service.version"/>
512
544
  </fingerprint>
513
-
514
545
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)o1(\d{4})">
515
546
  <description>OSF/1</description>
516
547
  <example service.version="9876">m8o19876</example>
@@ -520,7 +551,6 @@
520
551
  <param pos="0" name="service.product" value="VisionFS"/>
521
552
  <param pos="1" name="service.version"/>
522
553
  </fingerprint>
523
-
524
554
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)ro(\d{4})">
525
555
  <description>RISC OS</description>
526
556
  <example service.version="9876">m8ro9876</example>
@@ -529,7 +559,6 @@
529
559
  <param pos="0" name="service.product" value="VisionFS"/>
530
560
  <param pos="1" name="service.version"/>
531
561
  </fingerprint>
532
-
533
562
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)sc(\d{4})">
534
563
  <description>OpenServer</description>
535
564
  <example service.version="9876">m8sc9876</example>
@@ -539,27 +568,26 @@
539
568
  <param pos="0" name="service.product" value="VisionFS"/>
540
569
  <param pos="1" name="service.version"/>
541
570
  </fingerprint>
542
-
543
571
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)so(\d{4})">
544
572
  <description>SunOS</description>
545
573
  <example service.version="9876">m8so9876</example>
546
574
  <param pos="0" name="os.vendor" value="Sun"/>
547
575
  <param pos="0" name="os.family" value="SunOS"/>
548
576
  <param pos="0" name="os.product" value="SunOS"/>
577
+ <param pos="0" name="os.cpe23" value="cpe:/o:sun:sunos:-"/>
549
578
  <param pos="0" name="service.product" value="VisionFS"/>
550
579
  <param pos="1" name="service.version"/>
551
580
  </fingerprint>
552
-
553
581
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)su(\d{4})">
554
582
  <description>Solaris</description>
555
583
  <example service.version="9876">m8su9876</example>
556
584
  <param pos="0" name="os.vendor" value="Sun"/>
557
585
  <param pos="0" name="os.family" value="Solaris"/>
558
586
  <param pos="0" name="os.product" value="Solaris"/>
587
+ <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:-"/>
559
588
  <param pos="0" name="service.product" value="VisionFS"/>
560
589
  <param pos="1" name="service.version"/>
561
590
  </fingerprint>
562
-
563
591
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)sx(\d{4})">
564
592
  <description>SINIX</description>
565
593
  <example service.version="9876">m8sx9876</example>
@@ -569,7 +597,6 @@
569
597
  <param pos="0" name="service.product" value="VisionFS"/>
570
598
  <param pos="1" name="service.version"/>
571
599
  </fingerprint>
572
-
573
600
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)ul(\d{4})">
574
601
  <description>Ultrix/1</description>
575
602
  <example service.version="9876">m8ul9876</example>
@@ -579,7 +606,6 @@
579
606
  <param pos="0" name="service.product" value="VisionFS"/>
580
607
  <param pos="1" name="service.version"/>
581
608
  </fingerprint>
582
-
583
609
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)un(\d{4})">
584
610
  <description>UnixWare</description>
585
611
  <example service.version="9876">m8un9876</example>
@@ -589,17 +615,16 @@
589
615
  <param pos="0" name="service.product" value="VisionFS"/>
590
616
  <param pos="1" name="service.version"/>
591
617
  </fingerprint>
592
-
593
618
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)wi(\d{4})">
594
619
  <description>Windows</description>
595
620
  <example service.version="9876">m8wi9876</example>
596
621
  <param pos="0" name="os.vendor" value="Microsoft"/>
597
622
  <param pos="0" name="os.family" value="Windows"/>
598
623
  <param pos="0" name="os.product" value="Windows"/>
624
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
599
625
  <param pos="0" name="service.product" value="VisionFS"/>
600
626
  <param pos="1" name="service.version"/>
601
627
  </fingerprint>
602
-
603
628
  <fingerprint pattern="^(?i:unix)$">
604
629
  <description>Generally some Samba variant, which reports Unix</description>
605
630
  <example>Unix</example>
@@ -607,6 +632,6 @@
607
632
  <param pos="0" name="os.certainty" value="0.75"/>
608
633
  <param pos="0" name="service.product" value="Samba"/>
609
634
  <param pos="0" name="service.vendor" value="Samba"/>
635
+ <param pos="0" name="service.cpe23" value="cpe:/a:samba:samba:-"/>
610
636
  </fingerprint>
611
-
612
637
  </fingerprints>