recog 2.3.18 → 2.3.19

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +26 -0
  3. data/cpe-remap.yaml +11 -0
  4. data/identifiers/hw_device.txt +2 -0
  5. data/identifiers/hw_family.txt +6 -0
  6. data/identifiers/hw_product.txt +59 -0
  7. data/identifiers/os_device.txt +2 -0
  8. data/identifiers/os_family.txt +1 -0
  9. data/identifiers/os_product.txt +25 -0
  10. data/identifiers/service_family.txt +3 -0
  11. data/identifiers/service_product.txt +27 -0
  12. data/identifiers/vendor.txt +33 -0
  13. data/lib/recog/version.rb +1 -1
  14. data/update_cpes.py +3 -3
  15. data/xml/favicons.xml +108 -0
  16. data/xml/ftp_banners.xml +2 -1
  17. data/xml/html_title.xml +156 -1
  18. data/xml/http_cookies.xml +85 -0
  19. data/xml/http_servers.xml +120 -1
  20. data/xml/http_wwwauth.xml +8 -0
  21. data/xml/mdns_device-info_txt.xml +308 -10
  22. data/xml/ntp_banners.xml +9 -1
  23. data/xml/rtsp_servers.xml +7 -0
  24. data/xml/sip_banners.xml +344 -8
  25. data/xml/sip_user_agents.xml +317 -4
  26. data/xml/smb_native_lm.xml +32 -1
  27. data/xml/smb_native_os.xml +157 -33
  28. data/xml/snmp_sysdescr.xml +129 -1
  29. data/xml/ssh_banners.xml +118 -11
  30. data/xml/telnet_banners.xml +25 -1
  31. data/xml/tls_jarm.xml +139 -0
  32. data/xml/x509_issuers.xml +16 -0
  33. data/xml/x509_subjects.xml +72 -0
  34. metadata +4 -2
data/xml/smb_native_lm.xml CHANGED
@@ -40,7 +40,7 @@
40
40
  <fingerprint pattern="^Samba (\d\.\d+.\d+\w*)">
41
41
  <description>Samba</description>
42
42
  <example>Samba 3.0.24</example>
43
- <example>Samba 3.0.28a</example>
43
+ <example service.version="3.0.28a">Samba 3.0.28a</example>
44
44
  <example>Samba 3.0.32-0.2-2210-SUSE-SL10.3</example>
45
45
  <example>Samba 3.6.3</example>
46
46
  <example>Samba 3.6.6</example>
@@ -51,6 +51,20 @@
51
51
  <param pos="0" name="service.cpe23" value="cpe:/a:samba:samba:{service.version}"/>
52
52
  </fingerprint>
53
53
 
54
+ <fingerprint pattern="^Samba (?:Samba )?for GuardianOS v\.?(\d\.[\d.]+)$">
55
+ <description>Samba on a SnapServer appliance</description>
56
+ <example os.version="4.3.007.200609131215">Samba Samba for GuardianOS v4.3.007.200609131215</example>
57
+ <example os.version="5.0.133.200807301131">Samba Samba for GuardianOS v5.0.133.200807301131</example>
58
+ <example os.version="7.7.220">Samba for GuardianOS v.7.7.220</example>
59
+ <param pos="0" name="service.vendor" value="Samba"/>
60
+ <param pos="0" name="service.product" value="Samba"/>
61
+ <param pos="0" name="service.cpe23" value="cpe:/a:samba:samba:-"/>
62
+ <param pos="0" name="os.vendor" value="SnapServer"/>
63
+ <param pos="0" name="os.family" value="Linux"/>
64
+ <param pos="0" name="os.product" value="GuardianOS"/>
65
+ <param pos="1" name="os.version"/>
66
+ </fingerprint>
67
+
54
68
  <fingerprint pattern="^Netreon LANMAN 1.0$">
55
69
  <description>Netreon SAN software</description>
56
70
  <example>Netreon LANMAN 1.0</example>
@@ -67,4 +81,21 @@
67
81
  <param pos="0" name="os.cpe23" value="cpe:/o:mikrotik:routeros:-"/>
68
82
  </fingerprint>
69
83
 
84
+ <fingerprint pattern="^NQ (\d\.\d+)$">
85
+ <description>Visuality Systems NQ Enterprise Storage SMB stack</description>
86
+ <example service.version="7.3">NQ 7.3</example>
87
+ <example service.version="4.32">NQ 4.32</example>
88
+ <param pos="0" name="service.vendor" value="Visuality Systems"/>
89
+ <param pos="0" name="service.product" value="NQ"/>
90
+ <param pos="1" name="service.version"/>
91
+ </fingerprint>
92
+
93
+ <fingerprint pattern="^YNQ (\d\.[\d.]+)$">
94
+ <description>Visuality Systems YNQ Storage SMB stack</description>
95
+ <example service.version="1.2.1">YNQ 1.2.1</example>
96
+ <param pos="0" name="service.vendor" value="Visuality Systems"/>
97
+ <param pos="0" name="service.product" value="YNQ"/>
98
+ <param pos="1" name="service.version"/>
99
+ </fingerprint>
100
+
70
101
  </fingerprints>
data/xml/smb_native_os.xml CHANGED
@@ -2,6 +2,9 @@
2
2
  <fingerprints matches="smb.native_os" protocol="smb" database_type="util.os">
3
3
  <!--
4
4
  SMB fingerprints obtained from the Native OS field of SMB negotations
5
+ NOTE: os.version is used to capture Service Pack for Microsoft Windows.
6
+ This is inconsistent with other OSs and CPE generation and should
7
+ be reviewed for correction.
5
8
  -->
6
9
 
7
10
  <fingerprint pattern="^(Windows NT \d\.\d+)$">
@@ -39,6 +42,11 @@
39
42
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_xp:-"/>
40
43
  </fingerprint>
41
44
 
45
+ <fingerprint pattern="^Windows 6.1$">
46
+ <description>Spoofed value often used by Samba -- assert nothing.</description>
47
+ <example>Windows 6.1</example>
48
+ </fingerprint>
49
+
42
50
  <fingerprint pattern="^Windows XP (\d+) (Service Pack \d+)$">
43
51
  <description>Windows XP with Service Pack</description>
44
52
  <example os.build="2600" os.version="Service Pack 1">Windows XP 2600 Service Pack 1</example>
@@ -195,7 +203,7 @@
195
203
  <!-- TODO: Need an example string -->
196
204
 
197
205
  <fingerprint pattern="^Windows \(R\) Storage Server 2008 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
198
- <description>Windows Web Server 2008 Storage</description>
206
+ <description>Windows Server 2008 Storage</description>
199
207
  <param pos="0" name="os.certainty" value="1.0"/>
200
208
  <param pos="0" name="os.vendor" value="Microsoft"/>
201
209
  <param pos="0" name="os.product" value="Windows Server 2008"/>
@@ -216,8 +224,6 @@
216
224
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:{os.version}"/>
217
225
  </fingerprint>
218
226
 
219
- <!-- TODO: Need an example string -->
220
-
221
227
  <fingerprint pattern="^Windows Server 2008 HPC Edition (\d+)$">
222
228
  <description>Windows Web Server 2008 HPC</description>
223
229
  <example>Windows Server 2008 HPC Edition 7600</example>
@@ -257,30 +263,6 @@
257
263
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
258
264
  </fingerprint>
259
265
 
260
- <fingerprint pattern="^Windows Server 2016(?: Technical Preview \d+)? (\w+|\w+ \w+|\w+ \w+ \w+)(?: Evaluation)? (\d+)$">
261
- <description>Windows Server 2016 with a build, without service pack</description>
262
- <example os.edition="Datacenter" os.build="14393">Windows Server 2016 Datacenter 14393</example>
263
- <example os.edition="Standard" os.build="14393">Windows Server 2016 Standard Evaluation 14393</example>
264
- <example os.edition="Essentials" os.build="10586">Windows Server 2016 Technical Preview 4 Essentials 10586</example>
265
- <param pos="0" name="os.certainty" value="1.0"/>
266
- <param pos="0" name="os.vendor" value="Microsoft"/>
267
- <param pos="0" name="os.product" value="Windows Server 2016"/>
268
- <param pos="1" name="os.edition"/>
269
- <param pos="2" name="os.build"/>
270
- <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
271
- </fingerprint>
272
-
273
- <fingerprint pattern="^Windows Storage Server 2016 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
274
- <description>Windows Server 2016 Storage</description>
275
- <example os.build="14393">Windows Storage Server 2016 Standard 14393</example>
276
- <param pos="0" name="os.certainty" value="1.0"/>
277
- <param pos="0" name="os.vendor" value="Microsoft"/>
278
- <param pos="0" name="os.product" value="Windows Server 2016"/>
279
- <param pos="0" name="os.edition" value="Storage"/>
280
- <param pos="1" name="os.build"/>
281
- <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
282
- </fingerprint>
283
-
284
266
  <fingerprint pattern="^Windows Web Server 2008 R2 (\d+) (Service Pack \d+)$">
285
267
  <description>Windows Server 2008 R2 Web</description>
286
268
  <example os.version="Service Pack 1">Windows Web Server 2008 R2 7601 Service Pack 1</example>
@@ -316,6 +298,81 @@
316
298
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:{os.version}"/>
317
299
  </fingerprint>
318
300
 
301
+ <fingerprint pattern="^Hyper-V Server 7601 Service Pack 1$">
302
+ <description>Windows Server 2008 R2 Hyper-V</description>
303
+ <example>Hyper-V Server 7601 Service Pack 1</example>
304
+ <param pos="0" name="os.certainty" value="1.0"/>
305
+ <param pos="0" name="os.vendor" value="Microsoft"/>
306
+ <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
307
+ <param pos="0" name="os.edition" value="Hyper-V"/>
308
+ <param pos="0" name="os.build" value="7601"/>
309
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
310
+ </fingerprint>
311
+
312
+ <!-- Windows 2019 -->
313
+
314
+ <fingerprint pattern="^Windows Server 2019 (\w+|\w+ \w+|\w+ \w+ \w+)(?: Evaluation)? (\d+)$">
315
+ <description>Windows Server 2019 with a build, without service pack</description>
316
+ <example os.build="17763" os.edition="Standard">Windows Server 2019 Standard 17763</example>
317
+ <example os.build="17763" os.edition="Standard">Windows Server 2019 Standard Evaluation 17763</example>
318
+ <example os.build="17763" os.edition="Datacenter">Windows Server 2019 Datacenter 17763</example>
319
+ <example os.build="17763" os.edition="Essentials">Windows Server 2019 Essentials 17763</example>
320
+ <param pos="0" name="os.certainty" value="1.0"/>
321
+ <param pos="0" name="os.vendor" value="Microsoft"/>
322
+ <param pos="0" name="os.product" value="Windows Server 2019"/>
323
+ <param pos="1" name="os.edition"/>
324
+ <param pos="2" name="os.build"/>
325
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2019:-"/>
326
+ </fingerprint>
327
+
328
+ <fingerprint pattern="^Hyper-V Server 2019 (\d+)$">
329
+ <description>Windows Server 2019 Hyper-V</description>
330
+ <example os.build="17763">Hyper-V Server 2019 17763</example>
331
+ <param pos="0" name="os.certainty" value="1.0"/>
332
+ <param pos="0" name="os.vendor" value="Microsoft"/>
333
+ <param pos="0" name="os.product" value="Windows Server 2019"/>
334
+ <param pos="0" name="os.edition" value="Hyper-V"/>
335
+ <param pos="1" name="os.build"/>
336
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2019:-"/>
337
+ </fingerprint>
338
+
339
+ <!-- Windows 2016 -->
340
+
341
+ <fingerprint pattern="^Windows Server 2016(?: Technical Preview \d+)? (\w+|\w+ \w+|\w+ \w+ \w+)(?: Evaluation)? (\d+)$">
342
+ <description>Windows Server 2016 with a build, without service pack</description>
343
+ <example os.edition="Datacenter" os.build="14393">Windows Server 2016 Datacenter 14393</example>
344
+ <example os.edition="Standard" os.build="14393">Windows Server 2016 Standard Evaluation 14393</example>
345
+ <example os.edition="Essentials" os.build="10586">Windows Server 2016 Technical Preview 4 Essentials 10586</example>
346
+ <param pos="0" name="os.certainty" value="1.0"/>
347
+ <param pos="0" name="os.vendor" value="Microsoft"/>
348
+ <param pos="0" name="os.product" value="Windows Server 2016"/>
349
+ <param pos="1" name="os.edition"/>
350
+ <param pos="2" name="os.build"/>
351
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
352
+ </fingerprint>
353
+
354
+ <fingerprint pattern="^Windows Storage Server 2016 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
355
+ <description>Windows Server 2016 Storage</description>
356
+ <example os.build="14393">Windows Storage Server 2016 Standard 14393</example>
357
+ <param pos="0" name="os.certainty" value="1.0"/>
358
+ <param pos="0" name="os.vendor" value="Microsoft"/>
359
+ <param pos="0" name="os.product" value="Windows Server 2016"/>
360
+ <param pos="0" name="os.edition" value="Storage"/>
361
+ <param pos="1" name="os.build"/>
362
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
363
+ </fingerprint>
364
+
365
+ <fingerprint pattern="^Hyper-V Server 2016 (\d+)$">
366
+ <description>Windows Server 2016 Hyper-V</description>
367
+ <example os.build="14393">Hyper-V Server 2016 14393</example>
368
+ <param pos="0" name="os.certainty" value="1.0"/>
369
+ <param pos="0" name="os.vendor" value="Microsoft"/>
370
+ <param pos="0" name="os.product" value="Windows Server 2016"/>
371
+ <param pos="0" name="os.edition" value="Hyper-V"/>
372
+ <param pos="1" name="os.build"/>
373
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
374
+ </fingerprint>
375
+
319
376
  <fingerprint pattern="^Windows Vista \(TM\) (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
320
377
  <description>Windows Vista (SP)</description>
321
378
  <example os.edition="Home Premium" os.version="Service Pack 2">Windows Vista (TM) Home Premium 6002 Service Pack 2</example>
@@ -385,10 +442,9 @@
385
442
 
386
443
  <!-- Windows 2012 R2 matches go first to simplify the regular expressions -->
387
444
 
388
- <!-- TODO: Need an example string -->
389
-
390
445
  <fingerprint pattern="^Windows Server 2012 R2 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
391
446
  <description>Windows Server 2012 R2 (SP)</description>
447
+ <example os.build="9600" os.edition="Standard" os.version="Service Pack 1">Windows Server 2012 R2 Standard 9600 Service Pack 1</example>
392
448
  <param pos="0" name="os.certainty" value="1.0"/>
393
449
  <param pos="0" name="os.vendor" value="Microsoft"/>
394
450
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
@@ -400,7 +456,7 @@
400
456
 
401
457
  <fingerprint pattern="^Windows Server 2012 R2 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
402
458
  <description>Windows Server 2012 R2</description>
403
- <example os.edition="Standard">Windows Server 2012 R2 Standard 9600</example>
459
+ <example os.build="9600" os.edition="Standard">Windows Server 2012 R2 Standard 9600</example>
404
460
  <param pos="0" name="os.certainty" value="1.0"/>
405
461
  <param pos="0" name="os.vendor" value="Microsoft"/>
406
462
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
@@ -409,10 +465,35 @@
409
465
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
410
466
  </fingerprint>
411
467
 
412
- <!-- TODO: Need an example string -->
468
+ <fingerprint pattern="^Windows Storage Server 2012 R2 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
469
+ <description>Windows Server 2012 R2 Storage</description>
470
+ <example os.build="9600" os.edition="Standard">Windows Storage Server 2012 R2 Standard 9600</example>
471
+ <example os.build="9600" os.edition="Workgroup">Windows Storage Server 2012 R2 Workgroup 9600</example>
472
+ <example os.build="9600" os.edition="Essentials">Windows Storage Server 2012 R2 Essentials 9600</example>
473
+ <param pos="0" name="os.certainty" value="1.0"/>
474
+ <param pos="0" name="os.vendor" value="Microsoft"/>
475
+ <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
476
+ <param pos="1" name="os.edition"/>
477
+ <param pos="2" name="os.build"/>
478
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
479
+ </fingerprint>
480
+
481
+ <fingerprint pattern="^Hyper-V Server 2012 R2 (\d+)$">
482
+ <description>Windows Server 2012 R2 Hyper-V</description>
483
+ <example os.build="9600">Hyper-V Server 2012 R2 9600</example>
484
+ <param pos="0" name="os.certainty" value="1.0"/>
485
+ <param pos="0" name="os.vendor" value="Microsoft"/>
486
+ <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
487
+ <param pos="0" name="os.edition" value="Hyper-V"/>
488
+ <param pos="1" name="os.build"/>
489
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
490
+ </fingerprint>
491
+
492
+ <!-- Windows 2012 -->
413
493
 
414
494
  <fingerprint pattern="^Windows Server 2012 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
415
495
  <description>Windows Server 2012 (SP)</description>
496
+ <example os.build="9200" os.edition="Standard" os.version="Service Pack 1">Windows Server 2012 Standard 9200 Service Pack 1</example>
416
497
  <param pos="0" name="os.certainty" value="1.0"/>
417
498
  <param pos="0" name="os.vendor" value="Microsoft"/>
418
499
  <param pos="0" name="os.product" value="Windows Server 2012"/>
@@ -433,6 +514,29 @@
433
514
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
434
515
  </fingerprint>
435
516
 
517
+ <fingerprint pattern="^Windows Storage Server 2012 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
518
+ <description>Windows Server 2012 Storage</description>
519
+ <example os.build="9200" os.edition="Standard">Windows Storage Server 2012 Standard 9200</example>
520
+ <example os.build="9200" os.edition="Workgroup">Windows Storage Server 2012 Workgroup 9200</example>
521
+ <param pos="0" name="os.certainty" value="1.0"/>
522
+ <param pos="0" name="os.vendor" value="Microsoft"/>
523
+ <param pos="0" name="os.product" value="Windows Server 2012"/>
524
+ <param pos="1" name="os.edition"/>
525
+ <param pos="2" name="os.build"/>
526
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
527
+ </fingerprint>
528
+
529
+ <fingerprint pattern="^Hyper-V Server 2012 (\d+)$">
530
+ <description>Windows Server 2012 Hyper-V</description>
531
+ <example os.build="9200">Hyper-V Server 2012 9200</example>
532
+ <param pos="0" name="os.certainty" value="1.0"/>
533
+ <param pos="0" name="os.vendor" value="Microsoft"/>
534
+ <param pos="0" name="os.product" value="Windows Server 2012"/>
535
+ <param pos="0" name="os.edition" value="Hyper-V"/>
536
+ <param pos="1" name="os.build"/>
537
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
538
+ </fingerprint>
539
+
436
540
  <fingerprint pattern="^Windows MultiPoint Server 2012 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
437
541
  <description>Windows MultiPoint Server 2012 (SP)</description>
438
542
  <example os.build="9201" os.version="Service Pack 1">Windows MultiPoint Server 2012 Premium 9201 Service Pack 1</example>
@@ -487,7 +591,7 @@
487
591
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_10:-"/>
488
592
  </fingerprint>
489
593
 
490
- <fingerprint pattern="^VxWorks">
594
+ <fingerprint pattern="^VxWorks$">
491
595
  <description>VxWorks</description>
492
596
  <example>VxWorks</example>
493
597
  <param pos="0" name="os.certainty" value="0.5"/>
@@ -498,9 +602,10 @@
498
602
  <param pos="0" name="service.product" value="VxWorks CIFS"/>
499
603
  </fingerprint>
500
604
 
501
- <fingerprint pattern="^OS/400 \D(\d+)\D(\d+)\D(\d+)">
605
+ <fingerprint pattern="^OS/?400 \D(\d+)\D(\d+)\D(\d+)$">
502
606
  <description>OS/400</description>
503
607
  <example os.version="4" os.version.version="5" os.version.version.version="0">OS/400 V4R5M0</example>
608
+ <example os.version="5" os.version.version="4" os.version.version.version="5">OS400 V5R4M5</example>
504
609
  <param pos="0" name="os.vendor" value="IBM"/>
505
610
  <param pos="0" name="os.product" value="OS/400"/>
506
611
  <param pos="1" name="os.version"/>
@@ -509,6 +614,17 @@
509
614
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:os_400:{os.version}"/>
510
615
  </fingerprint>
511
616
 
617
+ <fingerprint pattern="^I5OS \D(\d+)\D(\d+)\D(\d+)$">
618
+ <description>IBM i5/OS</description>
619
+ <example os.version="6" os.version.version="1" os.version.version.version="1">I5OS V6R1M1</example>
620
+ <param pos="0" name="os.vendor" value="IBM"/>
621
+ <param pos="0" name="os.product" value="i5/OS"/>
622
+ <param pos="1" name="os.version"/>
623
+ <param pos="2" name="os.version.version"/>
624
+ <param pos="3" name="os.version.version.version"/>
625
+ <param pos="0" name="os.cpe23" value="cpe:/o:ibm:i5os:{os.version}"/>
626
+ </fingerprint>
627
+
512
628
  <fingerprint pattern="^Apple Base Station$">
513
629
  <description>SMB exposed via SMB shared USB disks on Apple devices</description>
514
630
  <example>Apple Base Station</example>
@@ -538,6 +654,14 @@
538
654
  <param pos="0" name="service.vendor" value="Netreon"/>
539
655
  </fingerprint>
540
656
 
657
+ <fingerprint pattern="^QTS$">
658
+ <description>QNAP QTS</description>
659
+ <example>QTS</example>
660
+ <param pos="0" name="os.vendor" value="QNAP"/>
661
+ <param pos="0" name="os.product" value="QTS"/>
662
+ <param pos="0" name="os.cpe23" value="cpe:/o:qnap:qts:-"/>
663
+ </fingerprint>
664
+
541
665
  <!-- VisionFS -->
542
666
 
543
667
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)ai(\d{4})">
data/xml/snmp_sysdescr.xml CHANGED
@@ -1040,6 +1040,8 @@
1040
1040
  <param pos="0" name="os.product" value="Fabric OS"/>
1041
1041
  <param pos="0" name="os.device" value="Switch"/>
1042
1042
  <param pos="0" name="os.cpe23" value="cpe:/o:brocade:fabric_os:-"/>
1043
+ <param pos="0" name="hw.vendor" value="Brocade"/>
1044
+ <param pos="0" name="hw.device" value="Switch"/>
1043
1045
  </fingerprint>
1044
1046
 
1045
1047
  <fingerprint pattern="^Brocade ((?:\S+ )?SAN Switch) Module for IBM eServer BladeCenter$">
@@ -1050,6 +1052,7 @@
1050
1052
  <param pos="0" name="os.vendor" value="Brocade"/>
1051
1053
  <param pos="0" name="os.device" value="Switch"/>
1052
1054
  <param pos="1" name="os.product"/>
1055
+ <param pos="0" name="hw.vendor" value="Brocade"/>
1053
1056
  </fingerprint>
1054
1057
 
1055
1058
  <fingerprint pattern="^Brocade (?:Communications? Systems, Inc\. )?([^,\(]+)(?: \([^\)]+\))?,(?: Extended route scalability,)? IronWare Version V?(\S+) .*$">
@@ -1079,6 +1082,47 @@
1079
1082
  <param pos="2" name="os.version"/>
1080
1083
  </fingerprint>
1081
1084
 
1085
+ <fingerprint pattern="^Brocade VDX Switch, BR-(\S+), Network Operating System Software Version (\S+)\.$">
1086
+ <description>Brocade VDX Switch</description>
1087
+ <example hw.product="VDX6740" os.version="7.0.2b">Brocade VDX Switch, BR-VDX6740, Network Operating System Software Version 7.0.2b.</example>
1088
+ <param pos="0" name="os.vendor" value="Brocade"/>
1089
+ <param pos="0" name="os.device" value="Switch"/>
1090
+ <param pos="0" name="os.family" value="NetworkOS"/>
1091
+ <param pos="2" name="os.version"/>
1092
+ <param pos="0" name="hw.vendor" value="Brocade"/>
1093
+ <param pos="0" name="hw.family" value="VDX"/>
1094
+ <param pos="1" name="hw.product"/>
1095
+ <param pos="0" name="hw.device" value="Switch"/>
1096
+ </fingerprint>
1097
+
1098
+ <fingerprint pattern="^([^,]+), (VDX\S+), Network Operating System Software Version (\S+)\.$">
1099
+ <description>Brocade VDX Switch w/Hostname</description>
1100
+ <example host.name="core02" hw.product="VDX6740T-1G" os.version="7.0.1b">core02, VDX6740T-1G, Network Operating System Software Version 7.0.1b.</example>
1101
+ <param pos="0" name="os.vendor" value="Brocade"/>
1102
+ <param pos="0" name="os.device" value="Switch"/>
1103
+ <param pos="0" name="os.family" value="NetworkOS"/>
1104
+ <param pos="3" name="os.version"/>
1105
+ <param pos="0" name="hw.vendor" value="Brocade"/>
1106
+ <param pos="0" name="hw.family" value="VDX"/>
1107
+ <param pos="2" name="hw.product"/>
1108
+ <param pos="0" name="hw.device" value="Switch"/>
1109
+ <param pos="1" name="host.name"/>
1110
+ </fingerprint>
1111
+
1112
+ <fingerprint pattern="^([^,]+), BR-(\S+), Network Operating System Software Version (\S+)\.$">
1113
+ <description>Brocade VDX Switch w/Hostname and BR prefix</description>
1114
+ <example host.name="core01" hw.product="VDX6740" os.version="7.0.2b">core01, BR-VDX6740, Network Operating System Software Version 7.0.2b.</example>
1115
+ <param pos="0" name="os.vendor" value="Brocade"/>
1116
+ <param pos="0" name="os.device" value="Switch"/>
1117
+ <param pos="0" name="os.family" value="NetworkOS"/>
1118
+ <param pos="3" name="os.version"/>
1119
+ <param pos="0" name="hw.vendor" value="Brocade"/>
1120
+ <param pos="0" name="hw.family" value="VDX"/>
1121
+ <param pos="2" name="hw.product"/>
1122
+ <param pos="0" name="hw.device" value="Switch"/>
1123
+ <param pos="1" name="host.name"/>
1124
+ </fingerprint>
1125
+
1082
1126
  <!--======================================================================
1083
1127
  BROTHER
1084
1128
  =======================================================================-->
@@ -1796,6 +1840,21 @@ Copyright (c) 1995-2005 by Cisco Systems
1796
1840
  <param pos="1" name="os.version"/>
1797
1841
  </fingerprint>
1798
1842
 
1843
+ <!--======================================================================
1844
+ Cumulus
1845
+ =======================================================================-->
1846
+
1847
+ <fingerprint pattern="^Cumulus Linux (\S+) \(Linux Kernel ([^\)]+)\)">
1848
+ <description>Cumulus Linux</description>
1849
+ <example os.version="3.7.2" os.version.version="4.1.33-1+cl3u17">Cumulus Linux 3.7.2 (Linux Kernel 4.1.33-1+cl3u17)</example>
1850
+ <param pos="0" name="os.vendor" value="Cumulus"/>
1851
+ <param pos="0" name="os.device" value="Switch"/>
1852
+ <param pos="0" name="os.product" value="Cumulus Linux"/>
1853
+ <param pos="1" name="os.version"/>
1854
+ <param pos="2" name="os.version.version"/>
1855
+ <param pos="0" name="os.cpe23" value="cpe:/o:cumulusnetworks:cumulus_linux:{os.version}"/>
1856
+ </fingerprint>
1857
+
1799
1858
  <!--======================================================================
1800
1859
  DATA DOMAIN
1801
1860
  =======================================================================-->
@@ -4785,7 +4844,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4785
4844
  <param pos="0" name="os.vendor" value="NetApp"/>
4786
4845
  <param pos="0" name="os.family" value="Data ONTAP"/>
4787
4846
  <param pos="0" name="os.product" value="Data ONTAP"/>
4788
- <param pos="0" name="os.device" value="File Server"/>
4847
+ <param pos="0" name="os.device" value="NAS"/>
4789
4848
  <param pos="1" name="os.version"/>
4790
4849
  <param pos="0" name="os.cpe23" value="cpe:/o:netapp:data_ontap:{os.version}"/>
4791
4850
  </fingerprint>
@@ -6923,6 +6982,73 @@ Copyright (c) 1995-2005 by Cisco Systems
6923
6982
  <param pos="0" name="os.device" value="Multifunction Device"/>
6924
6983
  </fingerprint>
6925
6984
 
6985
+ <!--======================================================================
6986
+ UBIQUITI
6987
+ =======================================================================-->
6988
+
6989
+ <fingerprint pattern="^(UAP-[^\s]+) ([0-9][.a-zA-Z0-9\-]+)$">
6990
+ <description>Ubiquiti Wireless UAP</description>
6991
+ <example hw.product="UAP-AC-Mesh-Pro" hw.version="4.3.20.11298">UAP-AC-Mesh-Pro 4.3.20.11298</example>
6992
+ <param pos="0" name="hw.vendor" value="Ubiquiti"/>
6993
+ <param pos="0" name="hw.device" value="WAP"/>
6994
+ <param pos="1" name="hw.product"/>
6995
+ <param pos="2" name="hw.version"/>
6996
+ <param pos="0" name="os.vendor" value="Ubiquiti"/>
6997
+ <param pos="0" name="os.family" value="Linux"/>
6998
+ <param pos="0" name="os.device" value="WAP"/>
6999
+ </fingerprint>
7000
+
7001
+ <fingerprint pattern="^(EdgeSwitch [^,]+), ([0-9][.a-zA-Z0-9\-]+), Linux ([0-9][.a-zA-Z0-9\-]+)">
7002
+ <description>Ubiquiti EdgeSwitch w/Version and Linux version</description>
7003
+ <example hw.product="EdgeSwitch 48-Port Lite" hw.version="1.8.1.5145168" os.version="3.6.5-1b505fb7">EdgeSwitch 48-Port Lite, 1.8.1.5145168, Linux 3.6.5-1b505fb7, 1.1.0.5102011</example>
7004
+ <param pos="0" name="hw.vendor" value="Ubiquiti"/>
7005
+ <param pos="0" name="hw.device" value="Switch"/>
7006
+ <param pos="1" name="hw.product"/>
7007
+ <param pos="2" name="hw.version"/>
7008
+ <param pos="0" name="os.vendor" value="Ubiquiti"/>
7009
+ <param pos="0" name="os.family" value="Linux"/>
7010
+ <param pos="0" name="os.device" value="Switch"/>
7011
+ <param pos="3" name="os.version"/>
7012
+ </fingerprint>
7013
+
7014
+ <fingerprint pattern="^(USW GigaBit Ethernet Switch), firmware v?([0-9][.a-zA-Z0-9\-]+)$">
7015
+ <description>Ubiquiti GigaBit Ethernet Switch w/Version</description>
7016
+ <example hw.product="USW GigaBit Ethernet Switch" hw.version="5.34.0.12180">USW GigaBit Ethernet Switch, firmware 5.34.0.12180</example>
7017
+ <example hw.product="USW GigaBit Ethernet Switch" hw.version="4.3.20.1129">USW GigaBit Ethernet Switch, firmware v4.3.20.1129</example>
7018
+ <param pos="0" name="hw.vendor" value="Ubiquiti"/>
7019
+ <param pos="0" name="hw.device" value="Switch"/>
7020
+ <param pos="1" name="hw.product"/>
7021
+ <param pos="2" name="hw.version"/>
7022
+ <param pos="0" name="os.vendor" value="Ubiquiti"/>
7023
+ <param pos="0" name="os.family" value="Linux"/>
7024
+ <param pos="0" name="os.device" value="Switch"/>
7025
+ </fingerprint>
7026
+
7027
+ <fingerprint pattern="^(USW-[^\s]+), ([0-9][.a-zA-Z0-9\-]+), Linux ([0-9][.a-zA-Z0-9\-]+)$">
7028
+ <description>Ubiquiti Switch w/Version and Linux version</description>
7029
+ <example hw.product="USW-8P-60" hw.version="4.3.20.11298" os.version="3.6.5">USW-8P-60, 4.3.20.11298, Linux 3.6.5</example>
7030
+ <param pos="0" name="hw.vendor" value="Ubiquiti"/>
7031
+ <param pos="0" name="hw.device" value="Switch"/>
7032
+ <param pos="1" name="hw.product"/>
7033
+ <param pos="2" name="hw.version"/>
7034
+ <param pos="0" name="os.vendor" value="Ubiquiti"/>
7035
+ <param pos="0" name="os.family" value="Linux"/>
7036
+ <param pos="0" name="os.device" value="Switch"/>
7037
+ <param pos="3" name="os.version"/>
7038
+ </fingerprint>
7039
+
7040
+ <fingerprint pattern="^(USW-[^\s]+), ([0-9][.a-zA-Z0-9\-]+)$">
7041
+ <description>Ubiquiti Switch w/Version (no Linux version)</description>
7042
+ <example hw.product="USW-5-Flex" hw.version="4.0.80.10875">USW-5-Flex, 4.0.80.10875</example>
7043
+ <param pos="0" name="hw.vendor" value="Ubiquiti"/>
7044
+ <param pos="0" name="hw.device" value="Switch"/>
7045
+ <param pos="1" name="hw.product"/>
7046
+ <param pos="2" name="hw.version"/>
7047
+ <param pos="0" name="os.vendor" value="Ubiquiti"/>
7048
+ <param pos="0" name="os.family" value="Linux"/>
7049
+ <param pos="0" name="os.device" value="Switch"/>
7050
+ </fingerprint>
7051
+
6926
7052
  <!--======================================================================
6927
7053
  UNISYS
6928
7054
  =======================================================================-->
@@ -6957,6 +7083,8 @@ Copyright (c) 1995-2005 by Cisco Systems
6957
7083
  <param pos="1" name="os.product"/>
6958
7084
  <param pos="2" name="os.version"/>
6959
7085
  <param pos="3" name="os.arch"/>
7086
+ <param pos="0" name="os.device" value="Hypervisor"/>
7087
+ <param pos="0" name="hw.device" value="Hypervisor"/>
6960
7088
  </fingerprint>
6961
7089
 
6962
7090
  <fingerprint pattern="^&quot;vSphere Management Assistant ([\d\.]+)&quot;$">