recog 2.1.37 → 2.1.38

Sign up to get free protection for your applications and to get access to all the features.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/lib/recog/version.rb +1 -1
  3. data/spec/lib/fingerprint_self_test_spec.rb +6 -0
  4. data/xml/apache_os.xml +0 -37
  5. data/xml/dns_versionbind.xml +0 -9
  6. data/xml/ftp_banners.xml +8 -8
  7. data/xml/http_cookies.xml +1 -1
  8. data/xml/http_servers.xml +55 -52
  9. data/xml/http_wwwauth.xml +25 -2
  10. data/xml/imap_banners.xml +0 -7
  11. data/xml/nntp_banners.xml +0 -4
  12. data/xml/ntp_banners.xml +0 -9
  13. data/xml/pop_banners.xml +0 -8
  14. data/xml/rsh_resp.xml +0 -11
  15. data/xml/smb_native_lm.xml +0 -2
  16. data/xml/smtp_banners.xml +0 -35
  17. data/xml/smtp_debug.xml +0 -1
  18. data/xml/smtp_ehlo.xml +0 -2
  19. data/xml/smtp_expn.xml +0 -1
  20. data/xml/smtp_help.xml +0 -4
  21. data/xml/smtp_noop.xml +0 -2
  22. data/xml/smtp_quit.xml +0 -1
  23. data/xml/smtp_rset.xml +0 -1
  24. data/xml/smtp_turn.xml +0 -1
  25. data/xml/smtp_vrfy.xml +0 -1
  26. data/xml/snmp_sysdescr.xml +29 -171
  27. data/xml/snmp_sysobjid.xml +0 -25
  28. data/xml/ssh_banners.xml +0 -40
  29. data/xml/telnet_banners.xml +5 -8
  30. data/xml/upnp_banners.xml +4 -14
  31. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bedbc15c938e70988703707bf0bd8f012c3419eb
4
- data.tar.gz: a8e520662bc9dc4b5adcce03b5c592afc18264ab
3
+ metadata.gz: 8cacab2a771cb9870e735cdcc7e13c7f8ba33758
4
+ data.tar.gz: 3e470f60c74af7d5524469be446ba269bbf3efd1
5
5
  SHA512:
6
- metadata.gz: fdd4793619ba2ba21c5bcc7cf9b6e1b7a6dde4f446499570da657a5d746753b6e301d02dbf99ca1c5cda779d92c47eed706c2c3618fe9c7e78a1c601290ef1dd
7
- data.tar.gz: a9984190a25fd84004610efc0eafb6bc843aa373e226a11523390044bac321f968f5f03aec5ee20b839f91dca9bc8aafaaf296a63f5c89af173e177588fe7049
6
+ metadata.gz: 3bee02bafd7d9320229c98c2dd6c2860f4726dee3f9c424f6bd6665c9964e1d22d17733dd607fb44e3cb66afbd5cb82c4b669ae796f65adf4031ceff7d4d354f
7
+ data.tar.gz: 57ff151f8dcc21b392895a4328c0b82f4a98aaa1f889084702164725662cbd9c6191fdb069c60f8f512bcd923c2434da083c6ebb0bc5faa21064c878111f4f39
data/lib/recog/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Recog
2
- VERSION = '2.1.37'
2
+ VERSION = '2.1.38'
3
3
  end
data/spec/lib/fingerprint_self_test_spec.rb CHANGED
@@ -52,6 +52,12 @@ describe Recog::DB do
52
52
  end
53
53
  end
54
54
 
55
+ it "has parameter values other than General, Server or Unknown, which are not helpful" do
56
+ if pos == 0 && value =~ /^(?i:general|server|unknown)$/
57
+ fail "'#{param_name}' has general/server/unknown value '#{value}'"
58
+ end
59
+ end
60
+
55
61
  it "doesn't omit values for non-capture params" do
56
62
  if pos == 0 && value.to_s.empty?
57
63
  fail "'#{fp.name}'s #{param_name} is not a capture (pos=0) but doesn't specify a value"
data/xml/apache_os.xml CHANGED
@@ -8,7 +8,6 @@
8
8
  <fingerprint pattern=".*\(iSeries\).*">
9
9
  <description>IBM i5/OS iSeries (OS/400)</description>
10
10
  <param pos="0" name="os.vendor" value="IBM"/>
11
- <param pos="0" name="os.device" value="General"/>
12
11
  <param pos="0" name="os.family" value="OS/400"/>
13
12
  <param pos="0" name="os.product" value="OS/400"/>
14
13
  </fingerprint>
@@ -16,7 +15,6 @@
16
15
  <description>Mandriva (formerly Mandrake) Linux 9.2</description>
17
16
  <param pos="0" name="os.certainty" value="0.9"/>
18
17
  <param pos="0" name="os.vendor" value="Mandriva"/>
19
- <param pos="0" name="os.device" value="General"/>
20
18
  <param pos="0" name="os.family" value="Linux"/>
21
19
  <param pos="0" name="os.product" value="Linux"/>
22
20
  <param pos="0" name="os.version" value="9.2"/>
@@ -26,7 +24,6 @@
26
24
  <description>Mandriva (formerly Mandrake) Linux 10.0</description>
27
25
  <param pos="0" name="os.certainty" value="0.9"/>
28
26
  <param pos="0" name="os.vendor" value="Mandriva"/>
29
- <param pos="0" name="os.device" value="General"/>
30
27
  <param pos="0" name="os.family" value="Linux"/>
31
28
  <param pos="0" name="os.product" value="Linux"/>
32
29
  <param pos="0" name="os.version" value="10.0"/>
@@ -35,7 +32,6 @@
35
32
  <fingerprint pattern=".*\((?:Mandrake|Mandriva) Linux/.*">
36
33
  <description>Mandriva (formerly Mandrake) Linux unknown version</description>
37
34
  <param pos="0" name="os.vendor" value="Mandriva"/>
38
- <param pos="0" name="os.device" value="General"/>
39
35
  <param pos="0" name="os.family" value="Linux"/>
40
36
  <param pos="0" name="os.product" value="Linux"/>
41
37
  <param pos="0" name="os.cpe23" value="cpe:/o:mandriva:linux:-"/>
@@ -43,7 +39,6 @@
43
39
  <fingerprint pattern=".*\(Mandrakelinux/.*">
44
40
  <description>Mandriva (formerly Mandrake) Linux unknown version</description>
45
41
  <param pos="0" name="os.vendor" value="Mandriva"/>
46
- <param pos="0" name="os.device" value="General"/>
47
42
  <param pos="0" name="os.family" value="Linux"/>
48
43
  <param pos="0" name="os.product" value="Linux"/>
49
44
  <param pos="0" name="os.cpe23" value="cpe:/o:mandriva:linux:-"/>
@@ -51,7 +46,6 @@
51
46
  <fingerprint pattern=".*\(PalmOS\).*">
52
47
  <description>PalmOS</description>
53
48
  <param pos="0" name="os.vendor" value="Palm"/>
54
- <param pos="0" name="os.device" value="General"/>
55
49
  <param pos="0" name="os.family" value="PalmOS"/>
56
50
  <param pos="0" name="os.product" value="PalmOS"/>
57
51
  </fingerprint>
@@ -59,7 +53,6 @@
59
53
  <description>Microsoft Windows</description>
60
54
  <param pos="0" name="os.certainty" value="0.75"/>
61
55
  <param pos="0" name="os.vendor" value="Microsoft"/>
62
- <param pos="0" name="os.device" value="General"/>
63
56
  <param pos="0" name="os.family" value="Windows"/>
64
57
  <param pos="0" name="os.product" value="Windows"/>
65
58
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
@@ -67,7 +60,6 @@
67
60
  <fingerprint pattern=".*\(Darwin\).*">
68
61
  <description>Apple Mac OS X</description>
69
62
  <param pos="0" name="os.vendor" value="Apple"/>
70
- <param pos="0" name="os.device" value="General"/>
71
63
  <param pos="0" name="os.family" value="Mac OS X"/>
72
64
  <param pos="0" name="os.product" value="Mac OS X"/>
73
65
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
@@ -75,7 +67,6 @@
75
67
  <fingerprint pattern=".*\(Ubuntu\).*">
76
68
  <description>Ubuntu</description>
77
69
  <param pos="0" name="os.vendor" value="Ubuntu"/>
78
- <param pos="0" name="os.device" value="General"/>
79
70
  <param pos="0" name="os.family" value="Linux"/>
80
71
  <param pos="0" name="os.product" value="Linux"/>
81
72
  <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:-"/>
@@ -83,21 +74,18 @@
83
74
  <fingerprint pattern=".*(?:Sun )?Cobalt \(Unix\)?.*">
84
75
  <description>Sun Cobalt RaQ (Red Hat based Linux)</description>
85
76
  <param pos="0" name="os.vendor" value="Sun"/>
86
- <param pos="0" name="os.device" value="General"/>
87
77
  <param pos="0" name="os.family" value="Linux"/>
88
78
  <param pos="0" name="os.product" value="Cobalt RaQ"/>
89
79
  </fingerprint>
90
80
  <fingerprint pattern=".*\(BlueQuartz\).*">
91
81
  <description>Blue Quartz is created by a Cobalt RaQ UG</description>
92
82
  <param pos="0" name="os.vendor" value="Sun"/>
93
- <param pos="0" name="os.device" value="General"/>
94
83
  <param pos="0" name="os.family" value="Linux"/>
95
84
  <param pos="0" name="os.product" value="Cobalt RaQ"/>
96
85
  </fingerprint>
97
86
  <fingerprint pattern="^Apache\/2\.2\.11.*\(Fedora\).*">
98
87
  <description>Red Hat Fedora 11</description>
99
88
  <param pos="0" name="os.vendor" value="Red Hat"/>
100
- <param pos="0" name="os.device" value="General"/>
101
89
  <param pos="0" name="os.family" value="Linux"/>
102
90
  <param pos="0" name="os.product" value="Fedora Core Linux"/>
103
91
  <param pos="0" name="os.version" value="11"/>
@@ -106,7 +94,6 @@
106
94
  <fingerprint pattern="^Apache\/2\.2\.15.*\(Fedora\).*">
107
95
  <description>Red Hat Fedora 13</description>
108
96
  <param pos="0" name="os.vendor" value="Red Hat"/>
109
- <param pos="0" name="os.device" value="General"/>
110
97
  <param pos="0" name="os.family" value="Linux"/>
111
98
  <param pos="0" name="os.product" value="Fedora Core Linux"/>
112
99
  <param pos="0" name="os.version" value="13"/>
@@ -115,7 +102,6 @@
115
102
  <fingerprint pattern="^Apache\/2\.2\.16.*\(Fedora\).*">
116
103
  <description>Red Hat Fedora 14</description>
117
104
  <param pos="0" name="os.vendor" value="Red Hat"/>
118
- <param pos="0" name="os.device" value="General"/>
119
105
  <param pos="0" name="os.family" value="Linux"/>
120
106
  <param pos="0" name="os.product" value="Fedora Core Linux"/>
121
107
  <param pos="0" name="os.version" value="14"/>
@@ -124,7 +110,6 @@
124
110
  <fingerprint pattern="^Apache\/2\.2\.23.*\(Fedora\).*">
125
111
  <description>Red Hat Fedora 17</description>
126
112
  <param pos="0" name="os.vendor" value="Red Hat"/>
127
- <param pos="0" name="os.device" value="General"/>
128
113
  <param pos="0" name="os.family" value="Linux"/>
129
114
  <param pos="0" name="os.product" value="Fedora Core Linux"/>
130
115
  <param pos="0" name="os.version" value="17"/>
@@ -133,7 +118,6 @@
133
118
  <fingerprint pattern="^Apache\/2\.4\.3.*\(Fedora\).*">
134
119
  <description>Red Hat Fedora 18</description>
135
120
  <param pos="0" name="os.vendor" value="Red Hat"/>
136
- <param pos="0" name="os.device" value="General"/>
137
121
  <param pos="0" name="os.family" value="Linux"/>
138
122
  <param pos="0" name="os.product" value="Fedora Core Linux"/>
139
123
  <param pos="0" name="os.version" value="18"/>
@@ -142,7 +126,6 @@
142
126
  <fingerprint pattern=".*\(Fedora\).*">
143
127
  <description>Red Hat Fedora</description>
144
128
  <param pos="0" name="os.vendor" value="Red Hat"/>
145
- <param pos="0" name="os.device" value="General"/>
146
129
  <param pos="0" name="os.family" value="Linux"/>
147
130
  <param pos="0" name="os.product" value="Fedora Core Linux"/>
148
131
  <param pos="0" name="os.cpe23" value="cpe:/o:redhat:fedora_core:-"/>
@@ -150,7 +133,6 @@
150
133
  <fingerprint pattern=".*\(RHEL\).*">
151
134
  <description>Red Hat Fedora</description>
152
135
  <param pos="0" name="os.vendor" value="Red Hat"/>
153
- <param pos="0" name="os.device" value="General"/>
154
136
  <param pos="0" name="os.family" value="Linux"/>
155
137
  <param pos="0" name="os.product" value="Enterprise Linux"/>
156
138
  <param pos="0" name="os.cpe23" value="cpe:/o:redhat:enterprise_linux:-"/>
@@ -158,7 +140,6 @@
158
140
  <fingerprint pattern=".*\(Red[ -]Hat(?:[/ ]Linux)?\).*">
159
141
  <description>Red Hat Linux</description>
160
142
  <param pos="0" name="os.vendor" value="Red Hat"/>
161
- <param pos="0" name="os.device" value="General"/>
162
143
  <param pos="0" name="os.family" value="Linux"/>
163
144
  <param pos="0" name="os.product" value="Linux"/>
164
145
  <param pos="0" name="os.cpe23" value="cpe:/o:redhat:linux:-"/>
@@ -166,7 +147,6 @@
166
147
  <fingerprint pattern=".*Debian(?:[/ ]GNU)?(?:/Linux)?.*">
167
148
  <description>Debian Linux</description>
168
149
  <param pos="0" name="os.vendor" value="Debian"/>
169
- <param pos="0" name="os.device" value="General"/>
170
150
  <param pos="0" name="os.family" value="Linux"/>
171
151
  <param pos="0" name="os.product" value="Linux"/>
172
152
  <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
@@ -174,7 +154,6 @@
174
154
  <fingerprint pattern=".*\((?:Linux/)?S[uU]SE(?:/Linux)?\).*">
175
155
  <description>Novell SuSE Linux</description>
176
156
  <param pos="0" name="os.vendor" value="SuSE"/>
177
- <param pos="0" name="os.device" value="General"/>
178
157
  <param pos="0" name="os.family" value="Linux"/>
179
158
  <param pos="0" name="os.product" value="Linux"/>
180
159
  <param pos="0" name="os.cpe23" value="cpe:/o:suse:linux:-"/>
@@ -182,7 +161,6 @@
182
161
  <fingerprint pattern=".*\(NETWARE\).*">
183
162
  <description>Novell NetWare</description>
184
163
  <param pos="0" name="os.vendor" value="Novell"/>
185
- <param pos="0" name="os.device" value="General"/>
186
164
  <param pos="0" name="os.family" value="NetWare"/>
187
165
  <param pos="0" name="os.product" value="NetWare"/>
188
166
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:-"/>
@@ -190,7 +168,6 @@
190
168
  <fingerprint pattern=".*HP-UX_Apache-based_Web_Server.*">
191
169
  <description>HP HP-UX</description>
192
170
  <param pos="0" name="os.vendor" value="HP"/>
193
- <param pos="0" name="os.device" value="General"/>
194
171
  <param pos="0" name="os.family" value="HP-UX"/>
195
172
  <param pos="0" name="os.product" value="HP-UX"/>
196
173
  <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:-"/>
@@ -198,7 +175,6 @@
198
175
  <fingerprint pattern=".*\(CentOS\).*">
199
176
  <description>CentOS Linux</description>
200
177
  <param pos="0" name="os.vendor" value="CentOS"/>
201
- <param pos="0" name="os.device" value="General"/>
202
178
  <param pos="0" name="os.family" value="Linux"/>
203
179
  <param pos="0" name="os.product" value="Linux"/>
204
180
  <param pos="0" name="os.cpe23" value="cpe:/o:centos:centos:-"/>
@@ -206,14 +182,12 @@
206
182
  <fingerprint pattern=".*\(Turbolinux\).*">
207
183
  <description>Turbolinux</description>
208
184
  <param pos="0" name="os.vendor" value="Turbolinux"/>
209
- <param pos="0" name="os.device" value="General"/>
210
185
  <param pos="0" name="os.family" value="Linux"/>
211
186
  <param pos="0" name="os.product" value="Linux"/>
212
187
  </fingerprint>
213
188
  <fingerprint pattern=".*\(FreeBSD\).*">
214
189
  <description>FreeBSD</description>
215
190
  <param pos="0" name="os.vendor" value="FreeBSD"/>
216
- <param pos="0" name="os.device" value="General"/>
217
191
  <param pos="0" name="os.family" value="FreeBSD"/>
218
192
  <param pos="0" name="os.product" value="FreeBSD"/>
219
193
  <param pos="0" name="os.cpe23" value="cpe:/o:freebsd:freebsd:-"/>
@@ -221,14 +195,12 @@
221
195
  <fingerprint pattern=".*\(Asianux\).*">
222
196
  <description>Asianux Linux</description>
223
197
  <param pos="0" name="os.vendor" value="Asianux"/>
224
- <param pos="0" name="os.device" value="General"/>
225
198
  <param pos="0" name="os.family" value="Linux"/>
226
199
  <param pos="0" name="os.product" value="Linux"/>
227
200
  </fingerprint>
228
201
  <fingerprint pattern=".*\(Gentoo(?:/Linux)?\).*">
229
202
  <description>Gentoo Linux</description>
230
203
  <param pos="0" name="os.vendor" value="Gentoo"/>
231
- <param pos="0" name="os.device" value="General"/>
232
204
  <param pos="0" name="os.family" value="Linux"/>
233
205
  <param pos="0" name="os.product" value="Linux"/>
234
206
  <param pos="0" name="os.cpe23" value="cpe:/o:gentoo:linux:-"/>
@@ -236,7 +208,6 @@
236
208
  <fingerprint pattern=".*\(Conectiva(?:/Linux)?\).*">
237
209
  <description>CentOS Linux</description>
238
210
  <param pos="0" name="os.vendor" value="Conectiva"/>
239
- <param pos="0" name="os.device" value="General"/>
240
211
  <param pos="0" name="os.family" value="Linux"/>
241
212
  <param pos="0" name="os.product" value="Linux"/>
242
213
  <param pos="0" name="os.cpe23" value="cpe:/o:conectiva:linux:-"/>
@@ -244,7 +215,6 @@
244
215
  <fingerprint pattern=".*\(Trustix Secure Linux(?:/Linux)?\).*">
245
216
  <description>CentOS Linux</description>
246
217
  <param pos="0" name="os.vendor" value="Trustix"/>
247
- <param pos="0" name="os.device" value="General"/>
248
218
  <param pos="0" name="os.family" value="Linux"/>
249
219
  <param pos="0" name="os.product" value="Secure Linux"/>
250
220
  <param pos="0" name="os.cpe23" value="cpe:/o:trustix:secure_linux:-"/>
@@ -252,49 +222,42 @@
252
222
  <fingerprint pattern=".*\(White Box\).*">
253
223
  <description>White Box Enterprise Linux</description>
254
224
  <param pos="0" name="os.vendor" value="White Box"/>
255
- <param pos="0" name="os.device" value="General"/>
256
225
  <param pos="0" name="os.family" value="Linux"/>
257
226
  <param pos="0" name="os.product" value="Enterprise Linux"/>
258
227
  </fingerprint>
259
228
  <fingerprint pattern=".*\(UnitedLinux\).*">
260
229
  <description>UnitedLinux</description>
261
230
  <param pos="0" name="os.vendor" value="UnitedLinux"/>
262
- <param pos="0" name="os.device" value="General"/>
263
231
  <param pos="0" name="os.family" value="Linux"/>
264
232
  <param pos="0" name="os.product" value="Linux"/>
265
233
  </fingerprint>
266
234
  <fingerprint pattern=".*\(PLD/Linux\).*">
267
235
  <description>PLD Linux</description>
268
236
  <param pos="0" name="os.vendor" value="PLD"/>
269
- <param pos="0" name="os.device" value="General"/>
270
237
  <param pos="0" name="os.family" value="Linux"/>
271
238
  <param pos="0" name="os.product" value="Linux"/>
272
239
  </fingerprint>
273
240
  <fingerprint pattern=".*\(Vine/Linux\).*">
274
241
  <description>Vine Linux</description>
275
242
  <param pos="0" name="os.vendor" value="Vine"/>
276
- <param pos="0" name="os.device" value="General"/>
277
243
  <param pos="0" name="os.family" value="Linux"/>
278
244
  <param pos="0" name="os.product" value="Linux"/>
279
245
  </fingerprint>
280
246
  <fingerprint pattern=".*\(rPath\).*">
281
247
  <description>rPath Linux</description>
282
248
  <param pos="0" name="os.vendor" value="rPath"/>
283
- <param pos="0" name="os.device" value="General"/>
284
249
  <param pos="0" name="os.family" value="Linux"/>
285
250
  <param pos="0" name="os.product" value="Linux"/>
286
251
  </fingerprint>
287
252
  <fingerprint pattern=".*\(StartCom Linux\).*">
288
253
  <description>StartCom Linux</description>
289
254
  <param pos="0" name="os.vendor" value="StartCom"/>
290
- <param pos="0" name="os.device" value="General"/>
291
255
  <param pos="0" name="os.family" value="Linux"/>
292
256
  <param pos="0" name="os.product" value="Linux"/>
293
257
  </fingerprint>
294
258
  <fingerprint pattern=".*Linux.*">
295
259
  <description>Generic Linux fallback</description>
296
260
  <param pos="0" name="os.certainty" value="0.75"/>
297
- <param pos="0" name="os.device" value="General"/>
298
261
  <param pos="0" name="os.family" value="Linux"/>
299
262
  <param pos="0" name="os.product" value="Linux"/>
300
263
  </fingerprint>
data/xml/dns_versionbind.xml CHANGED
@@ -65,7 +65,6 @@
65
65
  <param pos="1" name="service.version"/>
66
66
  <param pos="0" name="service.cpe23" value="cpe:/a:isc:bind:{service.version}"/>
67
67
  <param pos="0" name="os.vendor" value="Red Hat"/>
68
- <param pos="0" name="os.device" value="General"/>
69
68
  <param pos="0" name="os.family" value="Linux"/>
70
69
  </fingerprint>
71
70
  <fingerprint pattern="(9.[^-]+(?:-[SP]\d)?)-RedHat-[\w.-]+alios([\d\.]+)$">
@@ -78,7 +77,6 @@
78
77
  <param pos="1" name="service.version"/>
79
78
  <param pos="0" name="service.cpe23" value="cpe:/a:isc:bind:{service.version}"/>
80
79
  <param pos="0" name="os.vendor" value="Red Hat"/>
81
- <param pos="0" name="os.device" value="General"/>
82
80
  <param pos="0" name="os.family" value="Linux"/>
83
81
  <param pos="0" name="os.product" value="Enterprise Linux"/>
84
82
  <param pos="2" name="os.version"/>
@@ -520,7 +518,6 @@
520
518
  <param pos="0" name="service.product" value="DNS"/>
521
519
  <param pos="1" name="service.version"/>
522
520
  <param pos="0" name="os.vendor" value="Microsoft"/>
523
- <param pos="0" name="os.device" value="General"/>
524
521
  <param pos="0" name="os.family" value="Windows"/>
525
522
  <param pos="0" name="os.product" value="Windows Server 2016"/>
526
523
  <param pos="1" name="os.build"/>
@@ -534,7 +531,6 @@
534
531
  <param pos="0" name="service.product" value="DNS"/>
535
532
  <param pos="0" name="service.version" value="6.3.9600"/>
536
533
  <param pos="0" name="os.vendor" value="Microsoft"/>
537
- <param pos="0" name="os.device" value="General"/>
538
534
  <param pos="0" name="os.family" value="Windows"/>
539
535
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
540
536
  <param pos="0" name="os.build" value="6.3.9600"/>
@@ -548,7 +544,6 @@
548
544
  <param pos="0" name="service.product" value="DNS"/>
549
545
  <param pos="0" name="service.version" value="6.2.9200"/>
550
546
  <param pos="0" name="os.vendor" value="Microsoft"/>
551
- <param pos="0" name="os.device" value="General"/>
552
547
  <param pos="0" name="os.family" value="Windows"/>
553
548
  <param pos="0" name="os.product" value="Windows Server 2012"/>
554
549
  <param pos="0" name="os.build" value="6.2.9200"/>
@@ -563,7 +558,6 @@
563
558
  <param pos="0" name="service.product" value="DNS"/>
564
559
  <param pos="0" name="service.version" value="6.1.7601"/>
565
560
  <param pos="0" name="os.vendor" value="Microsoft"/>
566
- <param pos="0" name="os.device" value="General"/>
567
561
  <param pos="0" name="os.family" value="Windows"/>
568
562
  <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
569
563
  <param pos="0" name="os.version" value="Service Pack 1"/>
@@ -578,7 +572,6 @@
578
572
  <param pos="0" name="service.product" value="DNS"/>
579
573
  <param pos="0" name="service.version" value="6.1.7600"/>
580
574
  <param pos="0" name="os.vendor" value="Microsoft"/>
581
- <param pos="0" name="os.device" value="General"/>
582
575
  <param pos="0" name="os.family" value="Windows"/>
583
576
  <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
584
577
  <param pos="0" name="os.build" value="6.1.7600"/>
@@ -592,7 +585,6 @@
592
585
  <param pos="0" name="service.product" value="DNS"/>
593
586
  <param pos="0" name="service.version" value="6.0.6002"/>
594
587
  <param pos="0" name="os.vendor" value="Microsoft"/>
595
- <param pos="0" name="os.device" value="General"/>
596
588
  <param pos="0" name="os.family" value="Windows"/>
597
589
  <param pos="0" name="os.product" value="Windows Server 2008"/>
598
590
  <param pos="0" name="os.version" value="Service Pack 2"/>
@@ -607,7 +599,6 @@
607
599
  <param pos="0" name="service.product" value="DNS"/>
608
600
  <param pos="0" name="service.version" value="6.0.6001"/>
609
601
  <param pos="0" name="os.vendor" value="Microsoft"/>
610
- <param pos="0" name="os.device" value="General"/>
611
602
  <param pos="0" name="os.family" value="Windows"/>
612
603
  <param pos="0" name="os.product" value="Windows Server 2008"/>
613
604
  <param pos="0" name="os.version" value="Service Pack 1"/>
data/xml/ftp_banners.xml CHANGED
@@ -450,7 +450,6 @@ more text</example>
450
450
  <param pos="0" name="service.vendor" value="Blue Coat"/>
451
451
  <param pos="0" name="service.product" value="Proxy"/>
452
452
  <param pos="0" name="os.vendor" value="Blue Coat"/>
453
- <param pos="0" name="os.product" value="Unknown"/>
454
453
  <param pos="0" name="os.device" value="Web proxy"/>
455
454
  </fingerprint>
456
455
  <fingerprint pattern="^---freeFTPd 1.0---warFTPd 1.65---$">
@@ -1025,16 +1024,17 @@ more text</example>
1025
1024
  </fingerprint>
1026
1025
  <fingerprint pattern="^Welcome to the (?:Cisco )?(?:TelePresence) ([a-zA-Z\s]*?) ((?:MSE )?\d+), version (\d+.\d+\(\d+.\d+\)).*?" flags="REG_ICASE">
1027
1026
  <description>Cisco TelePresence</description>
1028
- <example os.device="AM GW" os.version="1.1(1.34)" hw.series="3610">Welcome to the Cisco TelePresence AM GW 3610, version 1.1(1.34) </example>
1029
- <example os.device="IP GW" os.version="2.0(3.32)" hw.series="3510">Welcome to the Cisco TelePresence IP GW 3510, version 2.0(3.32) </example>
1030
- <example os.device="MCU" os.version="4.3(2.18)" hw.series="4210">Welcome to the Cisco TelePresence MCU 4210, version 4.3(2.18) </example>
1031
- <example os.device="MCU" os.version="4.3(1.68)" hw.series="MSE 8420">Welcome to the Cisco TelePresence MCU MSE 8420, version 4.3(1.68) </example>
1032
- <example os.device="Server" os.version="2.1(1.18)" hw.series="7010">Welcome to the Telepresence Server 7010, version 2.1(1.18) </example>
1027
+ <example hw.series="AM GW" os.version="1.1(1.34)" hw.model="3610">Welcome to the Cisco TelePresence AM GW 3610, version 1.1(1.34) </example>
1028
+ <example hw.series="IP GW" os.version="2.0(3.32)" hw.model="3510">Welcome to the Cisco TelePresence IP GW 3510, version 2.0(3.32) </example>
1029
+ <example hw.series="MCU" os.version="4.3(2.18)" hw.model="4210">Welcome to the Cisco TelePresence MCU 4210, version 4.3(2.18) </example>
1030
+ <example hw.series="MCU" os.version="4.3(1.68)" hw.model="MSE 8420">Welcome to the Cisco TelePresence MCU MSE 8420, version 4.3(1.68) </example>
1031
+ <example hw.series="Server" os.version="2.1(1.18)" hw.model="7010">Welcome to the Telepresence Server 7010, version 2.1(1.18) </example>
1033
1032
  <param pos="0" name="os.vendor" value="Cisco"/>
1034
1033
  <param pos="0" name="os.product" value="TelePresence"/>
1035
- <param pos="1" name="os.device"/>
1034
+ <param pos="0" name="os.device" value="Video Conferencing"/>
1036
1035
  <param pos="0" name="hw.vendor" value="Cisco"/>
1037
- <param pos="2" name="hw.series"/>
1036
+ <param pos="1" name="hw.series"/>
1037
+ <param pos="2" name="hw.model"/>
1038
1038
  <param pos="3" name="os.version"/>
1039
1039
  </fingerprint>
1040
1040
  <fingerprint pattern="^(\S+) FTP server \((?:HP|Compaq) Tru64 UNIX Version (\S+)\) ready\.?$">
data/xml/http_cookies.xml CHANGED
@@ -138,7 +138,7 @@
138
138
  <example>NSC_AAAC=xyz;</example>
139
139
  <param pos="0" name="os.vendor" value="Citrix"/>
140
140
  <param pos="0" name="os.family" value="NetScaler"/>
141
- <param pos="0" name="os.device" value="NetScaler"/>
141
+ <param pos="0" name="os.device" value="Network Management Device"/>
142
142
  <param pos="0" name="os.product" value="NetScaler"/>
143
143
  </fingerprint>
144
144
  <fingerprint pattern="^(EktGUID|ecm)=.*">
data/xml/http_servers.xml CHANGED
@@ -1,6 +1,14 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <fingerprints matches="http_header.server" protocol="http" database_type="service" preference="0.90">
3
3
  <!-- HTTP Server headers are matched against these patterns to fingerprint HTTP servers. -->
4
+ <fingerprint pattern="(?i)^AirTunes/([\d\.]+)$">
5
+ <description>Apple AirTunes/AirPlay, more generally RTSP used by a variety of wireless a/v products</description>
6
+ <example service.version="220.68">AirTunes/220.68</example>
7
+ <param pos="0" name="service.vendor" value="Apple"/>
8
+ <param pos="0" name="service.product" value="AirTunes"/>
9
+ <param pos="1" name="service.version"/>
10
+ <param pos="0" name="hw.device" value="Media Server"/>
11
+ </fingerprint>
4
12
  <fingerprint pattern="^Stronghold/(\d\.\d) Apache/([012][\d.]*)\s*(.*)$">
5
13
  <description>Red Hat Stronghold Enterprise Apache</description>
6
14
  <example service.version="1.3.19" service.cpe23="cpe:/a:apache:http_server:1.3.19" service.component.cpe23="cpe:/a:redhat:stronghold:3.0">Stronghold/3.0 Apache/1.3.19 RedHat/3014c</example>
@@ -17,7 +25,6 @@
17
25
  <param pos="0" name="service.component.cpe23" value="cpe:/a:redhat:stronghold:{service.component.version}"/>
18
26
  <param pos="3" name="apache.info"/>
19
27
  <param pos="0" name="os.vendor" value="Red Hat"/>
20
- <param pos="0" name="os.device" value="General"/>
21
28
  <param pos="0" name="os.product" value="Linux"/>
22
29
  <param pos="0" name="os.family" value="Linux"/>
23
30
  <param pos="0" name="os.cpe23" value="cpe:/o:redhat:linux:-"/>
@@ -103,7 +110,6 @@
103
110
  <param pos="1" name="service.version"/>
104
111
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:{service.version}"/>
105
112
  <param pos="0" name="os.vendor" value="Microsoft"/>
106
- <param pos="0" name="os.device" value="General"/>
107
113
  <param pos="0" name="os.family" value="Windows"/>
108
114
  <param pos="0" name="os.product" value="Windows NT"/>
109
115
  <param pos="0" name="os.version" value="4.0"/>
@@ -118,7 +124,6 @@
118
124
  <param pos="0" name="service.version" value="5.0"/>
119
125
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:5.0"/>
120
126
  <param pos="0" name="os.vendor" value="Microsoft"/>
121
- <param pos="0" name="os.device" value="General"/>
122
127
  <param pos="0" name="os.family" value="Windows"/>
123
128
  <param pos="0" name="os.product" value="Windows 2000"/>
124
129
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_2000:-"/>
@@ -132,7 +137,6 @@
132
137
  <param pos="0" name="service.version" value="5.1"/>
133
138
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:5.1"/>
134
139
  <param pos="0" name="os.vendor" value="Microsoft"/>
135
- <param pos="0" name="os.device" value="General"/>
136
140
  <param pos="0" name="os.family" value="Windows"/>
137
141
  <param pos="0" name="os.product" value="Windows XP"/>
138
142
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_xp:-"/>
@@ -146,7 +150,6 @@
146
150
  <param pos="0" name="service.version" value="6.0"/>
147
151
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:6.0"/>
148
152
  <param pos="0" name="os.vendor" value="Microsoft"/>
149
- <param pos="0" name="os.device" value="General"/>
150
153
  <param pos="0" name="os.family" value="Windows"/>
151
154
  <param pos="0" name="os.product" value="Windows Server 2003"/>
152
155
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:-"/>
@@ -160,7 +163,6 @@
160
163
  <param pos="0" name="service.version" value="7.0"/>
161
164
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:7.0"/>
162
165
  <param pos="0" name="os.vendor" value="Microsoft"/>
163
- <param pos="0" name="os.device" value="General"/>
164
166
  <param pos="0" name="os.family" value="Windows"/>
165
167
  <param pos="0" name="os.product" value="Windows Server 2008"/>
166
168
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
@@ -174,7 +176,6 @@
174
176
  <param pos="0" name="service.version" value="7.5"/>
175
177
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:7.5"/>
176
178
  <param pos="0" name="os.vendor" value="Microsoft"/>
177
- <param pos="0" name="os.device" value="General"/>
178
179
  <param pos="0" name="os.family" value="Windows"/>
179
180
  <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
180
181
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
@@ -188,7 +189,6 @@
188
189
  <param pos="0" name="service.version" value="8.0"/>
189
190
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:8.0"/>
190
191
  <param pos="0" name="os.vendor" value="Microsoft"/>
191
- <param pos="0" name="os.device" value="General"/>
192
192
  <param pos="0" name="os.family" value="Windows"/>
193
193
  <param pos="0" name="os.product" value="Windows Server 2012"/>
194
194
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
@@ -202,7 +202,6 @@
202
202
  <param pos="0" name="service.version" value="8.5"/>
203
203
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:8.5"/>
204
204
  <param pos="0" name="os.vendor" value="Microsoft"/>
205
- <param pos="0" name="os.device" value="General"/>
206
205
  <param pos="0" name="os.family" value="Windows"/>
207
206
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
208
207
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
@@ -224,7 +223,6 @@
224
223
  <param pos="0" name="service.family" value="IIS"/>
225
224
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:-"/>
226
225
  <param pos="0" name="os.vendor" value="Microsoft"/>
227
- <param pos="0" name="os.device" value="General"/>
228
226
  <param pos="0" name="os.family" value="Windows"/>
229
227
  </fingerprint>
230
228
  <fingerprint pattern="^MS .NET Remoting, MS .NET CLR (\d+\.\d+\.\d+\.\d+)$">
@@ -238,7 +236,6 @@
238
236
  <param pos="0" name="service.component.family" value=".NET"/>
239
237
  <param pos="1" name="service.component.version"/>
240
238
  <param pos="0" name="os.vendor" value="Microsoft"/>
241
- <param pos="0" name="os.device" value="General"/>
242
239
  <param pos="0" name="os.family" value="Windows"/>
243
240
  <param pos="0" name="os.product" value="Windows"/>
244
241
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
@@ -255,7 +252,6 @@
255
252
  <param pos="1" name="service.version"/>
256
253
  <param pos="0" name="os.certainty" value="0.9"/>
257
254
  <param pos="0" name="os.vendor" value="Microsoft"/>
258
- <param pos="0" name="os.device" value="General"/>
259
255
  <param pos="0" name="os.family" value="Windows"/>
260
256
  <param pos="0" name="os.product" value="Windows CE"/>
261
257
  <param pos="1" name="os.version"/>
@@ -270,7 +266,6 @@
270
266
  <param pos="1" name="service.version"/>
271
267
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:personal_web_server:{service.version}"/>
272
268
  <param pos="0" name="os.vendor" value="Microsoft"/>
273
- <param pos="0" name="os.device" value="General"/>
274
269
  <param pos="0" name="os.family" value="Windows"/>
275
270
  <param pos="0" name="os.product" value="Windows"/>
276
271
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
@@ -284,7 +279,6 @@
284
279
  <param pos="1" name="service.version"/>
285
280
  <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:personal_web_server:{service.version}"/>
286
281
  <param pos="0" name="os.vendor" value="Microsoft"/>
287
- <param pos="0" name="os.device" value="General"/>
288
282
  <param pos="0" name="os.family" value="Windows"/>
289
283
  <param pos="0" name="os.product" value="Windows 95"/>
290
284
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_95:-"/>
@@ -404,6 +398,13 @@
404
398
  <param pos="1" name="service.version"/>
405
399
  <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
406
400
  </fingerprint>
401
+ <fingerprint pattern="^PDR-M800/1.0$">
402
+ <description>Merit LILIN PDR M800</description>
403
+ <example>PDR-M800/1.0</example>
404
+ <param pos="0" name="hw.vendor" value="Merit LILIN"/>
405
+ <param pos="0" name="hw.product" value="PDR M800"/>
406
+ <param pos="0" name="hw.device" value="DVR"/>
407
+ </fingerprint>
407
408
  <fingerprint pattern="^PHP/(\S+)$">
408
409
  <description>PHP</description>
409
410
  <example service.component.version="4.4.2-1build1">PHP/4.4.2-1build1</example>
@@ -508,7 +509,6 @@
508
509
  <param pos="2" name="apache.info"/>
509
510
  <param pos="0" name="apache.variant" value="HP-UX"/>
510
511
  <param pos="0" name="os.vendor" value="HP"/>
511
- <param pos="0" name="os.device" value="General"/>
512
512
  <param pos="0" name="os.family" value="HP-UX"/>
513
513
  <param pos="0" name="os.product" value="HP-UX"/>
514
514
  <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:-"/>
@@ -715,7 +715,6 @@
715
715
  <description>RealMedia Helix Server</description>
716
716
  <example>Helix Server Version 9.0.4.960 (win32) (RealServer compatible)</example>
717
717
  <param pos="0" name="os.vendor" value="Microsoft"/>
718
- <param pos="0" name="os.device" value="General"/>
719
718
  <param pos="0" name="os.family" value="Windows"/>
720
719
  <param pos="0" name="os.product" value="Windows"/>
721
720
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
@@ -734,11 +733,23 @@
734
733
  <param pos="0" name="service.family" value="Helix Server"/>
735
734
  <param pos="1" name="service.version"/>
736
735
  </fingerprint>
736
+ <fingerprint pattern="^ReeCam IP Camera$">
737
+ <description>Shenzhen ReeCam cameras</description>
738
+ <example>ReeCam IP Camera</example>
739
+ <param pos="0" name="hw.vendor" value="Shenzhen Reecam Tech. Ltd."/>
740
+ <param pos="0" name="hw.product" value="ReeCam"/>
741
+ <param pos="0" name="hw.device" value="Camera"/>
742
+ </fingerprint>
743
+ <fingerprint pattern="^Netwave IP Camera$">
744
+ <description>Netwave cameras</description>
745
+ <example>Netwave IP Camera</example>
746
+ <param pos="0" name="hw.vendor" value="Netwave"/>
747
+ <param pos="0" name="hw.device" value="Camera"/>
748
+ </fingerprint>
737
749
  <fingerprint pattern="^Cougar/([0-9.]*)$">
738
750
  <description>Windows Media Services (older versions)</description>
739
751
  <example>Cougar/9.01.01.3841</example>
740
752
  <param pos="0" name="os.vendor" value="Microsoft"/>
741
- <param pos="0" name="os.device" value="General"/>
742
753
  <param pos="0" name="os.family" value="Windows"/>
743
754
  <param pos="0" name="os.product" value="Windows"/>
744
755
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
@@ -751,7 +762,6 @@
751
762
  <description>Windows Media Services (newer versions)</description>
752
763
  <example>WMServer/9.1.1.3841</example>
753
764
  <param pos="0" name="os.vendor" value="Microsoft"/>
754
- <param pos="0" name="os.device" value="General"/>
755
765
  <param pos="0" name="os.family" value="Windows"/>
756
766
  <param pos="0" name="os.product" value="Windows"/>
757
767
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
@@ -764,7 +774,6 @@
764
774
  <description>Generic Microsoft HTTP service</description>
765
775
  <example>Microsoft-HTTPAPI/2.0</example>
766
776
  <param pos="0" name="os.vendor" value="Microsoft"/>
767
- <param pos="0" name="os.device" value="General"/>
768
777
  <param pos="0" name="os.family" value="Windows"/>
769
778
  <param pos="0" name="os.product" value="Windows"/>
770
779
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
@@ -780,7 +789,6 @@
780
789
  <description>Something written in ASP.NET</description>
781
790
  <example>ASP.NET</example>
782
791
  <param pos="0" name="os.vendor" value="Microsoft"/>
783
- <param pos="0" name="os.device" value="General"/>
784
792
  <param pos="0" name="os.family" value="Windows"/>
785
793
  <param pos="0" name="os.product" value="Windows"/>
786
794
  <param pos="0" name="os.certainty" value="0.6"/>
@@ -814,7 +822,6 @@
814
822
  <example>HeiTel GmbH Web Server [V1.26/V1.15/V1.7]</example>
815
823
  <param pos="0" name="os.vendor" value="HeiTel"/>
816
824
  <param pos="0" name="os.device" value="DVR"/>
817
- <param pos="0" name="os.product" value="Unknown"/>
818
825
  <param pos="0" name="hw.vendor" value="HeiTel"/>
819
826
  <param pos="0" name="hw.device" value="DVR"/>
820
827
  </fingerprint>
@@ -834,7 +841,6 @@
834
841
  <param pos="0" name="service.cpe23" value="cpe:/a:ibm:http_server:-"/>
835
842
  <param pos="0" name="os.certainty" value="0.9"/>
836
843
  <param pos="0" name="os.vendor" value="IBM"/>
837
- <param pos="0" name="os.device" value="General"/>
838
844
  <param pos="0" name="os.family" value="OS/400"/>
839
845
  <param pos="0" name="os.product" value="OS/400"/>
840
846
  <param pos="1" name="os.version"/>
@@ -1191,7 +1197,6 @@
1191
1197
  <param pos="1" name="service.version"/>
1192
1198
  <param pos="0" name="service.cpe23" value="cpe:/a:ipswitch:imail_server:{service.version}"/>
1193
1199
  <param pos="0" name="os.vendor" value="Microsoft"/>
1194
- <param pos="0" name="os.device" value="General"/>
1195
1200
  <param pos="0" name="os.family" value="Windows"/>
1196
1201
  <param pos="0" name="os.product" value="Windows"/>
1197
1202
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
@@ -1206,7 +1211,6 @@
1206
1211
  <param pos="0" name="service.family" value="Abyss Web Server"/>
1207
1212
  <param pos="1" name="service.version"/>
1208
1213
  <param pos="0" name="os.vendor" value="Microsoft"/>
1209
- <param pos="0" name="os.device" value="General"/>
1210
1214
  <param pos="0" name="os.family" value="Windows"/>
1211
1215
  <param pos="0" name="os.product" value="Windows"/>
1212
1216
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
@@ -1219,7 +1223,6 @@
1219
1223
  <param pos="0" name="service.family" value="Abyss Web Server"/>
1220
1224
  <param pos="1" name="service.version"/>
1221
1225
  <param pos="0" name="os.vendor" value="Microsoft"/>
1222
- <param pos="0" name="os.device" value="General"/>
1223
1226
  <param pos="0" name="os.family" value="Windows"/>
1224
1227
  <param pos="0" name="os.product" value="Windows"/>
1225
1228
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
@@ -1230,7 +1233,6 @@
1230
1233
  <param pos="1" name="service.product"/>
1231
1234
  <param pos="0" name="service.family" value="Commerce Server"/>
1232
1235
  <param pos="0" name="os.vendor" value="Microsoft"/>
1233
- <param pos="0" name="os.device" value="General"/>
1234
1236
  <param pos="0" name="os.family" value="Windows"/>
1235
1237
  <param pos="0" name="os.product" value="Windows"/>
1236
1238
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
@@ -1244,7 +1246,6 @@
1244
1246
  <param pos="0" name="service.cpe23" value="cpe:/a:novell:netware_enterprise_web_server:{service.version}"/>
1245
1247
  <param pos="0" name="os.certainty" value="0.9"/>
1246
1248
  <param pos="0" name="os.vendor" value="Novell"/>
1247
- <param pos="0" name="os.device" value="General"/>
1248
1249
  <param pos="0" name="os.family" value="NetWare"/>
1249
1250
  <param pos="0" name="os.product" value="NetWare"/>
1250
1251
  <param pos="1" name="os.version"/>
@@ -1256,7 +1257,6 @@
1256
1257
  <param pos="0" name="service.product" value="NetWare HTTP Stack"/>
1257
1258
  <param pos="0" name="service.family" value="NetWare HTTP Stack"/>
1258
1259
  <param pos="0" name="os.vendor" value="Novell"/>
1259
- <param pos="0" name="os.device" value="General"/>
1260
1260
  <param pos="0" name="os.family" value="NetWare"/>
1261
1261
  <param pos="0" name="os.product" value="NetWare"/>
1262
1262
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:-"/>
@@ -1269,7 +1269,6 @@
1269
1269
  <param pos="0" name="service.version" value="3.1R1"/>
1270
1270
  <param pos="0" name="os.certainty" value="0.9"/>
1271
1271
  <param pos="0" name="os.vendor" value="Novell"/>
1272
- <param pos="0" name="os.device" value="General"/>
1273
1272
  <param pos="0" name="os.family" value="NetWare"/>
1274
1273
  <param pos="0" name="os.product" value="NetWare"/>
1275
1274
  <param pos="0" name="os.version" value="4.11"/>
@@ -1283,7 +1282,6 @@
1283
1282
  <param pos="0" name="service.version" value="2.51R1"/>
1284
1283
  <param pos="0" name="os.certainty" value="0.9"/>
1285
1284
  <param pos="0" name="os.vendor" value="Novell"/>
1286
- <param pos="0" name="os.device" value="General"/>
1287
1285
  <param pos="0" name="os.family" value="NetWare"/>
1288
1286
  <param pos="0" name="os.product" value="NetWare"/>
1289
1287
  <param pos="0" name="os.version" value="4.1"/>
@@ -1318,8 +1316,17 @@
1318
1316
  <param pos="0" name="service.family" value="NetWeaver"/>
1319
1317
  <param pos="1" name="service.version"/>
1320
1318
  </fingerprint>
1321
- <fingerprint pattern="^SonicWALL (SSL-VPN(?: (?:\d+))?) Web Server\.?$">
1319
+ <fingerprint pattern="^OpenVPN-AS$">
1320
+ <description>OpenVPN Access Server</description>
1321
+ <example>OpenVPN-AS</example>
1322
+ <param pos="0" name="service.vendor" value="OpenVPN"/>
1323
+ <param pos="0" name="service.product" value="Access Server"/>
1324
+ <param pos="0" name="hw.device" value="VPN"/>
1325
+ </fingerprint>
1326
+ <fingerprint pattern="^SonicWALL (SSL-?VPN(?: (?:\d+))?) Web Server\.?$">
1322
1327
  <description>SonicWALL SSL-VPN device</description>
1328
+ <example>SonicWALL SSLVPN Web Server</example>
1329
+ <example>SonicWALL SSL-VPN Web Server</example>
1323
1330
  <param pos="0" name="service.vendor" value="SonicWALL"/>
1324
1331
  <param pos="0" name="service.product" value="SSL-VPN"/>
1325
1332
  <param pos="0" name="service.family" value="SSL-VPN"/>
@@ -1332,10 +1339,10 @@
1332
1339
  </fingerprint>
1333
1340
  <fingerprint pattern="^SonicWALL$">
1334
1341
  <description>SonicWALL device</description>
1342
+ <example>SonicWALL</example>
1335
1343
  <param pos="0" name="service.vendor" value="SonicWALL"/>
1336
1344
  <param pos="0" name="service.product" value="HTTP"/>
1337
1345
  <param pos="0" name="os.vendor" value="SonicWALL"/>
1338
- <param pos="0" name="os.product" value="Unknown"/>
1339
1346
  </fingerprint>
1340
1347
  <fingerprint pattern="^NetCache appliance \(NetApp/+(\d+\.\d+[\w.]+)\)$">
1341
1348
  <description>NetCache appliance (product line formerly owned by Network Appliances,
@@ -1391,7 +1398,6 @@
1391
1398
  <param pos="0" name="service.product" value="HTTP"/>
1392
1399
  <param pos="1" name="service.version"/>
1393
1400
  <param pos="0" name="os.vendor" value="Foundry"/>
1394
- <param pos="0" name="os.product" value="Unknown"/>
1395
1401
  </fingerprint>
1396
1402
  <fingerprint pattern="^HP-Chai(?:Server|SOE)/(\d+\.\d+)$">
1397
1403
  <description>HP Printer running the Chai embedded web server</description>
@@ -1478,7 +1484,6 @@
1478
1484
  <fingerprint pattern=".*Linksys.*">
1479
1485
  <description>Linksys Wireless Access Point</description>
1480
1486
  <param pos="0" name="os.vendor" value="Linksys"/>
1481
- <param pos="0" name="os.product" value="Unknown"/>
1482
1487
  <param pos="0" name="os.device" value="WAP"/>
1483
1488
  <param pos="0" name="hw.vendor" value="Linksys"/>
1484
1489
  <param pos="0" name="hw.device" value="WAP"/>
@@ -1561,7 +1566,6 @@
1561
1566
  <param pos="0" name="service.product" value="EWS"/>
1562
1567
  <param pos="1" name="service.version"/>
1563
1568
  <param pos="0" name="os.vendor" value="Xerox"/>
1564
- <param pos="0" name="os.product" value="Unknown"/>
1565
1569
  <param pos="0" name="os.device" value="Printer"/>
1566
1570
  <param pos="0" name="hw.vendor" value="Xerox"/>
1567
1571
  <param pos="0" name="hw.device" value="Printer"/>
@@ -1599,7 +1603,7 @@
1599
1603
  <example>NS_6.1</example>
1600
1604
  <param pos="0" name="os.vendor" value="Citrix"/>
1601
1605
  <param pos="0" name="os.family" value="NetScaler"/>
1602
- <param pos="0" name="os.device" value="NetScaler"/>
1606
+ <param pos="0" name="os.device" value="Network Management Device"/>
1603
1607
  <param pos="0" name="os.product" value="NetScaler"/>
1604
1608
  <param pos="1" name="os.version"/>
1605
1609
  </fingerprint>
@@ -1650,7 +1654,6 @@
1650
1654
  <fingerprint pattern="^D-Link MiniAVServer$">
1651
1655
  <description>D-Link embedded web server for web cams</description>
1652
1656
  <param pos="0" name="os.vendor" value="D-Link"/>
1653
- <param pos="0" name="os.product" value="Unknown"/>
1654
1657
  <param pos="0" name="os.device" value="Web cam"/>
1655
1658
  </fingerprint>
1656
1659
  <fingerprint pattern="^ListManagerWeb/(\S+) .*$">
@@ -1747,7 +1750,6 @@
1747
1750
  <param pos="0" name="service.product" value="4th Dimension 2004"/>
1748
1751
  <param pos="0" name="service.family" value="4th Dimension 2004"/>
1749
1752
  <param pos="0" name="os.vendor" value="Microsoft"/>
1750
- <param pos="0" name="os.device" value="General"/>
1751
1753
  <param pos="0" name="os.family" value="Windows"/>
1752
1754
  <param pos="0" name="os.product" value="Windows"/>
1753
1755
  </fingerprint>
@@ -1758,7 +1760,6 @@
1758
1760
  <param pos="0" name="service.family" value="WebSTAR"/>
1759
1761
  <param pos="1" name="service.version"/>
1760
1762
  <param pos="0" name="os.vendor" value="Microsoft"/>
1761
- <param pos="0" name="os.device" value="General"/>
1762
1763
  <param pos="0" name="os.family" value="Windows"/>
1763
1764
  <param pos="0" name="os.product" value="Windows"/>
1764
1765
  </fingerprint>
@@ -2027,6 +2028,13 @@
2027
2028
  <param pos="0" name="service.family" value="Oracle"/>
2028
2029
  <param pos="1" name="service.version"/>
2029
2030
  </fingerprint>
2031
+ <fingerprint pattern="^Oracle XML DB/Oracle Database$">
2032
+ <description>Web server providing web services for Oracle's XML DB.</description>
2033
+ <example>Oracle XML DB/Oracle Database</example>
2034
+ <param pos="0" name="service.vendor" value="Oracle"/>
2035
+ <param pos="0" name="service.product" value="XML DB"/>
2036
+ <param pos="0" name="service.family" value="Oracle"/>
2037
+ </fingerprint>
2030
2038
  <fingerprint pattern="^sfcHttpd$">
2031
2039
  <description>Server for HTTP interface to sfcb, a lightweight CIM server.
2032
2040
  </description>
@@ -2098,18 +2106,10 @@
2098
2106
  <param pos="0" name="hw.device" value="DVR"/>
2099
2107
  </fingerprint>
2100
2108
  <!-- Hikvision is OEMd by a number of DVR manufacturers -->
2101
- <fingerprint pattern="^(?:Hikvision|DVRDVS)-Webs$">
2109
+ <fingerprint pattern="^(?:Hikvision|DNVRS|DVRDVS)-Webs$">
2102
2110
  <description>Web server found on DVR and webcam servers sourced from Hikvision</description>
2103
2111
  <example>Hikvision-Webs</example>
2104
2112
  <example>DVRDVS-Webs</example>
2105
- <param pos="0" name="service.vendor" value="Hikvision"/>
2106
- <param pos="0" name="service.product" value="Hikvision Web Server"/>
2107
- <param pos="0" name="os.vendor" value="Hikvision"/>
2108
- <param pos="0" name="os.device" value="DVR"/>
2109
- <param pos="0" name="hw.device" value="DVR"/>
2110
- </fingerprint>
2111
- <fingerprint pattern="^DNVRS-Webs$">
2112
- <description>Hikvision httpd</description>
2113
2113
  <example>DNVRS-Webs</example>
2114
2114
  <param pos="0" name="service.vendor" value="Hikvision"/>
2115
2115
  <param pos="0" name="service.product" value="Hikvision Web Server"/>
@@ -2234,7 +2234,6 @@
2234
2234
  <param pos="0" name="os.vendor" value="Apple"/>
2235
2235
  <param pos="0" name="os.family" value="Mac OS X"/>
2236
2236
  <param pos="0" name="os.product" value="Mac OS X"/>
2237
- <param pos="0" name="os.device" value="General"/>
2238
2237
  <param pos="0" name="os.version" value="10.3"/>
2239
2238
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.3"/>
2240
2239
  <param pos="0" name="service.product" value="QTSS"/>
@@ -2246,7 +2245,6 @@
2246
2245
  <param pos="0" name="os.vendor" value="Apple"/>
2247
2246
  <param pos="0" name="os.family" value="Mac OS X"/>
2248
2247
  <param pos="0" name="os.product" value="Mac OS X"/>
2249
- <param pos="0" name="os.device" value="General"/>
2250
2248
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
2251
2249
  <param pos="0" name="service.product" value="QTSS"/>
2252
2250
  <param pos="1" name="service.version"/>
@@ -2291,7 +2289,7 @@
2291
2289
  <param pos="0" name="service.product" value="WebBox"/>
2292
2290
  <param pos="0" name="hw.family" value="Sunny"/>
2293
2291
  <param pos="0" name="hw.product" value="WebBox"/>
2294
- <param pos="0" name="hw.device" value="Power Management"/>
2292
+ <param pos="0" name="hw.device" value="Power device"/>
2295
2293
  <param pos="0" name="os.vendor" value="Microsoft"/>
2296
2294
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_ce:-"/>
2297
2295
  <param pos="0" name="os.family" value="Windows"/>
@@ -2302,7 +2300,7 @@
2302
2300
  <example>EnergyICT RTU 101-F25CE1-1524</example>
2303
2301
  <param pos="0" name="hw.family" value="Honeywell"/>
2304
2302
  <param pos="0" name="hw.product" value="RTU"/>
2305
- <param pos="0" name="hw.device" value="Power Management"/>
2303
+ <param pos="0" name="hw.device" value="Power device"/>
2306
2304
  </fingerprint>
2307
2305
  <fingerprint pattern="^AV-TECH AV787 Video Web Server$">
2308
2306
  <description>AV-TECH AVC787 Video Web Server</description>
@@ -2314,6 +2312,11 @@
2314
2312
  <param pos="0" name="hw.product" value="AVC787"/>
2315
2313
  <param pos="0" name="hw.device" value="DVR"/>
2316
2314
  </fingerprint>
2315
+ <fingerprint pattern="^Splunkd$">
2316
+ <description>Splunk HTTP server used in the web interface, forwarders, indexers and more</description>
2317
+ <example>Splunkd</example>
2318
+ <param pos="0" name="service.vendor" value="Splunk"/>
2319
+ </fingerprint>
2317
2320
  <fingerprint pattern="^tivo-httpd-\S+$">
2318
2321
  <description>Tivo DVR</description>
2319
2322
  <example>tivo-httpd-1:20.7.4.RC35-D18-6:D18</example>