recog 2.3.19 → 2.3.20

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.
@@ -1,3 +1,4 @@
1
+ 3CX
1
2
  3Com
2
3
  8x8 Inc.
3
4
  A.K.I Software
@@ -6,6 +7,7 @@ ACT Security
6
7
  ADB
7
8
  ADC
8
9
  ADTRAN
10
+ AIOHTTP Project
9
11
  ALCATEL
10
12
  ALT
11
13
  ALU
@@ -91,6 +93,7 @@ BT
91
93
  Bandura Labs
92
94
  Bangteng
93
95
  Barco
96
+ Barracuda
94
97
  Berkeley Software Design Inc.
95
98
  Bftpd Project
96
99
  Bigfoot
@@ -159,6 +162,7 @@ Compuware
159
162
  Conectiva
160
163
  Conexant
161
164
  Congruency, Inc.
165
+ ConnectWise
162
166
  Couchbase
163
167
  Cradlepoint
164
168
  Crestron
@@ -215,7 +219,9 @@ Embedthis
215
219
  Emby
216
220
  Emerson
217
221
  Emulex
222
+ Encode
218
223
  Enterasys
224
+ Envoy Proxy
219
225
  Epson
220
226
  EqualLogic
221
227
  Equivalence (OpenH323)
@@ -240,6 +246,7 @@ Firefly
240
246
  Floosietek
241
247
  FlowPoint
242
248
  Flussonic
249
+ Flyspray
243
250
  Folding@home
244
251
  Fortinet
245
252
  Foscam
@@ -326,6 +333,8 @@ Internet Archive
326
333
  Inveo
327
334
  Ipswitch
328
335
  Isilon
336
+ Istio
337
+ JFrog
329
338
  Jamf
330
339
  Jellyfin
331
340
  Jenkins
@@ -371,6 +380,7 @@ Linksys
371
380
  Linux
372
381
  LiteSpeed Technologies
373
382
  LiveWorks Limited
383
+ Logitech
374
384
  Lotus
375
385
  Loxone
376
386
  Lucent
@@ -413,6 +423,7 @@ Mitel
413
423
  Mobatek
414
424
  Mobotix
415
425
  Mocana
426
+ MoinMoin
416
427
  Moodle
417
428
  Mort Bay
418
429
  Motion Media Technology
@@ -453,6 +464,7 @@ Netwave
453
464
  Network Alchemy Limited
454
465
  Network Equipment Technologies
455
466
  Neustar
467
+ Nextcloud
456
468
  Nokia
457
469
  Nokia-Siemens
458
470
  Nominum
@@ -461,6 +473,7 @@ Norton
461
473
  Novell
462
474
  OPNsense
463
475
  Objective Communications
476
+ Observium
464
477
  Oce
465
478
  Octopus
466
479
  Oki
@@ -499,6 +512,7 @@ Paramiko
499
512
  Paul Smith Computer Services
500
513
  Pelco
501
514
  Percona
515
+ Perl
502
516
  Phacility
503
517
  Philips
504
518
  Philips Video Conferencing Systems
@@ -578,6 +592,7 @@ SSH Communications Security
578
592
  STARFACE GmhH
579
593
  SUSE
580
594
  SafeNet
595
+ Sage
581
596
  Samba
582
597
  Samsung
583
598
  Sangoma
@@ -611,6 +626,7 @@ Silver Peak
611
626
  Siqura
612
627
  Slackware
613
628
  SmoothWall
629
+ SnapServer
614
630
  Sofrel
615
631
  Softing
616
632
  SolarWinds
@@ -654,6 +670,7 @@ TP-LINK
654
670
  TRENDnet
655
671
  TVersity
656
672
  TYPO3
673
+ Tableau
657
674
  Tandberg
658
675
  Taobao
659
676
  Tasman Networks
@@ -680,6 +697,7 @@ Tokutek
680
697
  Tor Project
681
698
  TornadoWeb
682
699
  Toshiba
700
+ Traefik Labs
683
701
  Treck
684
702
  Tridium
685
703
  Troy
@@ -710,6 +728,7 @@ VideoServer
710
728
  Vignette
711
729
  Vine
712
730
  Vircom
731
+ Visuality Systems
713
732
  Vizio
714
733
  VocalTec Communications, Inc.
715
734
  Västgöta-Data AB
@@ -719,12 +738,14 @@ Washington University
719
738
  WatchGuard
720
739
  WeOnlyDo
721
740
  WebTrends
741
+ Webmin
722
742
  Westbay Engineers
723
743
  Westell
724
744
  Western Digital
725
745
  White Box
726
746
  Wildix
727
747
  Wind River
748
+ Wowza
728
749
  Wowza Media Systems
729
750
  X.Org
730
751
  XAMPP
@@ -755,6 +776,7 @@ cPanel
755
776
  cz.nic
756
777
  enGenius
757
778
  estos
779
+ etherpad
758
780
  exim
759
781
  gdnsd
760
782
  home.pl
@@ -766,11 +788,11 @@ lighttpd
766
788
  mod_ssl
767
789
  mod_wsgi
768
790
  nginx
791
+ ninenines
769
792
  noVNC
770
793
  ownCloud
771
794
  pfSense
772
795
  port25
773
- proxmox
774
796
  qmail
775
797
  rPath
776
798
  vsFTPd Project
data/lib/recog/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Recog
2
- VERSION = '2.3.19'
2
+ VERSION = '2.3.20'
3
3
  end
data/requirements.txt CHANGED
@@ -1,2 +1,2 @@
1
- lxml==4.6.2
1
+ lxml==4.6.3
2
2
  pyyaml
data/update_cpes.py CHANGED
@@ -16,8 +16,17 @@ def parse_cpe_vp_map(file):
16
16
  parser = etree.XMLParser(remove_comments=False)
17
17
  doc = etree.parse(file, parser)
18
18
  namespaces = {'ns': 'http://cpe.mitre.org/dictionary/2.0', 'meta': 'http://scap.nist.gov/schema/cpe-dictionary-metadata/0.2'}
19
- for cpe_name in doc.xpath("//ns:cpe-list/ns:cpe-item/@name", namespaces=namespaces):
19
+ for entry in doc.xpath("//ns:cpe-list/ns:cpe-item", namespaces=namespaces):
20
+ cpe_name = entry.get("name")
21
+ if not cpe_name:
22
+ continue
23
+
24
+ # If the entry is deprecated then don't add it to our list of valid CPEs.
25
+ if entry.get("deprecated"):
26
+ continue
27
+
20
28
  cpe_match = re.match('^cpe:/([aho]):([^:]+):([^:]+)', cpe_name)
29
+
21
30
  if cpe_match:
22
31
  cpe_type, vendor, product = cpe_match.group(1, 2, 3)
23
32
  if cpe_type not in vp_map:
@@ -86,7 +95,11 @@ def lookup_cpe(vendor, product, cpe_type, cpe_table, remap):
86
95
 
87
96
  # Everything else depends on a remap of some sort.
88
97
  # get the remappings for this one vendor string.
89
- vendor_remap = remap.get(vendor, None)
98
+ vendor_remap = None
99
+
100
+ remap_type = remap.get(cpe_type, None)
101
+ if remap_type:
102
+ vendor_remap = remap_type.get(vendor, None)
90
103
 
91
104
  if vendor_remap:
92
105
  # If we have product remappings, work that angle next
@@ -220,6 +220,36 @@
220
220
  <param pos="0" name="service.component.product" value="mod_auth_ldap"/>
221
221
  </fingerprint>
222
222
 
223
+ <fingerprint pattern="mod_auth_oracle/(\S+)$">
224
+ <description>mod_auth_oracle with version</description>
225
+ <example service.component.version="1.2.3">mod_auth_oracle/1.2.3</example>
226
+ <param pos="0" name="service.component.vendor" value="Apache"/>
227
+ <param pos="0" name="service.component.product" value="mod_auth_oracle"/>
228
+ <param pos="1" name="service.component.version"/>
229
+ </fingerprint>
230
+
231
+ <fingerprint pattern="mod_auth_oracle/?$">
232
+ <description>mod_auth_oracle without version</description>
233
+ <example>mod_auth_oracle/</example>
234
+ <param pos="0" name="service.component.vendor" value="Apache"/>
235
+ <param pos="0" name="service.component.product" value="mod_auth_oracle"/>
236
+ </fingerprint>
237
+
238
+ <fingerprint pattern="mod_auth_pgsql/(\S+)$">
239
+ <description>mod_auth_pgsql with version</description>
240
+ <example service.component.version="1.2.3">mod_auth_pgsql/1.2.3</example>
241
+ <param pos="0" name="service.component.vendor" value="Apache"/>
242
+ <param pos="0" name="service.component.product" value="mod_auth_pgsql"/>
243
+ <param pos="1" name="service.component.version"/>
244
+ </fingerprint>
245
+
246
+ <fingerprint pattern="mod_auth_pgsql/?$">
247
+ <description>mod_auth_pgsql without version</description>
248
+ <example>mod_auth_pgsql/</example>
249
+ <param pos="0" name="service.component.vendor" value="Apache"/>
250
+ <param pos="0" name="service.component.product" value="mod_auth_pgsql"/>
251
+ </fingerprint>
252
+
223
253
  <fingerprint pattern="mod_auth_radius/(\S+)$">
224
254
  <description>mod_auth_radius with version</description>
225
255
  <example service.component.version="1.2.3">mod_auth_radius/1.2.3</example>
@@ -978,6 +1008,36 @@
978
1008
  <param pos="0" name="service.component.product" value="mod_filter"/>
979
1009
  </fingerprint>
980
1010
 
1011
+ <fingerprint pattern="mod_frontpage/(\S+)$">
1012
+ <description>mod_frontpage with version</description>
1013
+ <example service.component.version="1.2.3">mod_frontpage/1.2.3</example>
1014
+ <param pos="0" name="service.component.vendor" value="Apache"/>
1015
+ <param pos="0" name="service.component.product" value="mod_frontpage"/>
1016
+ <param pos="1" name="service.component.version"/>
1017
+ </fingerprint>
1018
+
1019
+ <fingerprint pattern="mod_frontpage/?$">
1020
+ <description>mod_frontpage without version</description>
1021
+ <example>mod_frontpage/</example>
1022
+ <param pos="0" name="service.component.vendor" value="Apache"/>
1023
+ <param pos="0" name="service.component.product" value="mod_frontpage"/>
1024
+ </fingerprint>
1025
+
1026
+ <fingerprint pattern="mod_gzip/(\S+)$">
1027
+ <description>mod_gzip with version</description>
1028
+ <example service.component.version="1.2.3">mod_gzip/1.2.3</example>
1029
+ <param pos="0" name="service.component.vendor" value="Apache"/>
1030
+ <param pos="0" name="service.component.product" value="mod_gzip"/>
1031
+ <param pos="1" name="service.component.version"/>
1032
+ </fingerprint>
1033
+
1034
+ <fingerprint pattern="mod_gzip/?$">
1035
+ <description>mod_gzip without version</description>
1036
+ <example>mod_gzip/</example>
1037
+ <param pos="0" name="service.component.vendor" value="Apache"/>
1038
+ <param pos="0" name="service.component.product" value="mod_gzip"/>
1039
+ </fingerprint>
1040
+
981
1041
  <fingerprint pattern="mod_headers/(\S+)$">
982
1042
  <description>mod_headers with version</description>
983
1043
  <example service.component.version="1.2.3">mod_headers/1.2.3</example>
@@ -427,7 +427,7 @@
427
427
  <param pos="0" name="service.cpe23" value="cpe:/a:powerdns:authoritative_server:{service.version}"/>
428
428
  </fingerprint>
429
429
 
430
- <fingerprint pattern="^PowerDNS Authoritative Server (\d\.[\w.]+(?:-rc\d)?(?:-alpha\d)?(?:-beta\d)?[^ ]*) \(built [\w\s:]+ by [\w]+\@[\w.-:-]*\)$">
430
+ <fingerprint pattern="^PowerDNS Authoritative Server (\d\.[\w.]+(?:-rc\d)?(?:-alpha\d)?(?:-beta\d)?[^ ]*) \(built [\w\s:]+ by [\w]+\@[\w.:-]*\)$">
431
431
  <description>PowerDNS Authoritative Server: format 2</description>
432
432
  <example service.version="4.0.4">PowerDNS Authoritative Server 4.0.4 (built Jul 26 2017 15:04:27 by root@FreeBSD:11:amd64-default-job-03)</example>
433
433
  <example service.version="4.0.0-rc2">PowerDNS Authoritative Server 4.0.0-rc2 (built Jul 4 2016 15:44:39 by root@foo-bar.baz)</example>
data/xml/favicons.xml CHANGED
@@ -149,6 +149,7 @@
149
149
  <param pos="0" name="service.vendor" value="RStudio"/>
150
150
  <param pos="0" name="service.product" value="Connect"/>
151
151
  <param pos="0" name="service.certainty" value="0.5"/>
152
+ <param pos="0" name="service.cpe23" value="cpe:/a:rstudio:connect:-"/>
152
153
  </fingerprint>
153
154
 
154
155
  <fingerprint pattern="^84b0fc44f58bfee1a303ee3398a86670$">
@@ -236,6 +237,7 @@
236
237
  <param pos="0" name="service.vendor" value="ManageEngine"/>
237
238
  <param pos="0" name="service.product" value="ADAudit Plus"/>
238
239
  <param pos="0" name="service.certainty" value="0.5"/>
240
+ <param pos="0" name="service.cpe23" value="cpe:/a:zohocorp:manageengine_adaudit_plus:-"/>
239
241
  </fingerprint>
240
242
 
241
243
  <fingerprint pattern="^e9d6d23a961ea23a3e961266876e0ffd$">
@@ -1064,7 +1066,9 @@
1064
1066
  <param pos="0" name="os.vendor" value="SonicWall"/>
1065
1067
  <param pos="0" name="os.device" value="Firewall"/>
1066
1068
  <param pos="0" name="os.family" value="SonicOS"/>
1069
+ <param pos="0" name="os.product" value="SonicOS"/>
1067
1070
  <param pos="0" name="os.certainty" value="0.5"/>
1071
+ <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
1068
1072
  </fingerprint>
1069
1073
 
1070
1074
  <fingerprint pattern="^e4fd990b4b8a5d61bd5ddb98cdfc7190$">
@@ -1186,7 +1190,7 @@
1186
1190
  <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
1187
1191
  <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
1188
1192
  <param pos="0" name="os.certainty" value="0.5"/>
1189
- <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance:-"/>
1193
+ <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:-"/>
1190
1194
  <param pos="0" name="hw.vendor" value="Cisco"/>
1191
1195
  <param pos="0" name="hw.family" value="Adaptive Security Appliance"/>
1192
1196
  <param pos="0" name="hw.product" value="Adaptive Security Appliance"/>
@@ -1370,6 +1374,7 @@
1370
1374
  <param pos="0" name="os.device" value="Network Management Device"/>
1371
1375
  <param pos="0" name="os.product" value="NetScaler"/>
1372
1376
  <param pos="0" name="os.certainty" value="0.5"/>
1377
+ <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_firmware:-"/>
1373
1378
  <param pos="0" name="service.vendor" value="Citrix"/>
1374
1379
  <param pos="0" name="service.family" value="NetScaler"/>
1375
1380
  <param pos="0" name="service.device" value="Network Management Device"/>
@@ -1386,6 +1391,7 @@
1386
1391
  <param pos="0" name="os.device" value="Network Management Device"/>
1387
1392
  <param pos="0" name="os.product" value="NetScaler Gateway"/>
1388
1393
  <param pos="0" name="os.certainty" value="0.5"/>
1394
+ <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_gateway_firmware:-"/>
1389
1395
  <param pos="0" name="service.vendor" value="Citrix"/>
1390
1396
  <param pos="0" name="service.family" value="NetScaler"/>
1391
1397
  <param pos="0" name="service.device" value="Network Management Device"/>
@@ -1472,9 +1478,11 @@
1472
1478
  <param pos="0" name="hw.device" value="Firewall"/>
1473
1479
  <param pos="0" name="hw.certainty" value="0.5"/>
1474
1480
  <param pos="0" name="os.vendor" value="Palo Alto Networks"/>
1475
- <param pos="0" name="os.product" value="PANOS"/>
1481
+ <param pos="0" name="os.product" value="PAN-OS"/>
1482
+ <param pos="0" name="os.family" value="PAN-OS"/>
1476
1483
  <param pos="0" name="os.device" value="Firewall"/>
1477
1484
  <param pos="0" name="os.certainty" value="0.5"/>
1485
+ <param pos="0" name="os.cpe23" value="cpe:/o:paloaltonetworks:pan-os:-"/>
1478
1486
  </fingerprint>
1479
1487
 
1480
1488
  <fingerprint pattern="^efe29d50711d9b093d8187e97cc0e593$">
@@ -1576,6 +1584,7 @@
1576
1584
  <param pos="0" name="os.family" value="iLO"/>
1577
1585
  <param pos="0" name="os.product" value="iLO 3"/>
1578
1586
  <param pos="0" name="os.certainty" value="0.5"/>
1587
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_3_firmware:-"/>
1579
1588
  </fingerprint>
1580
1589
 
1581
1590
  <fingerprint pattern="^(?:ad93b3973782b03ea62a43bd6602ba8b|d521487f45fa7657450edfd6c16e4a63)$">
@@ -1586,12 +1595,13 @@
1586
1595
  <param pos="0" name="hw.vendor" value="HP"/>
1587
1596
  <param pos="0" name="hw.product" value="iLO"/>
1588
1597
  <param pos="0" name="hw.certainty" value="0.5"/>
1589
- <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights_out:-"/>
1598
+ <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights-out:-"/>
1590
1599
  <param pos="0" name="os.vendor" value="HP"/>
1591
1600
  <param pos="0" name="os.device" value="Lights Out Management"/>
1592
1601
  <param pos="0" name="os.family" value="iLO"/>
1593
1602
  <param pos="0" name="os.product" value="iLO"/>
1594
1603
  <param pos="0" name="os.certainty" value="0.5"/>
1604
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_firmware:-"/>
1595
1605
  </fingerprint>
1596
1606
 
1597
1607
  <fingerprint pattern="^d11917dc7e651b21f0f75cd0dc309e8a$">
data/xml/ftp_banners.xml CHANGED
@@ -404,8 +404,6 @@ more text</example>
404
404
  <param pos="0" name="service.cpe23" value="cpe:/a:pureftpd:pure-ftpd:{service.version}"/>
405
405
  </fingerprint>
406
406
 
407
- <!-- CPEs for Serv-U 15.x and above changed to SolarWinds -->
408
-
409
407
  <fingerprint pattern="^Serv-U FTP Server v(15\.\S+) ready\.\.\.$">
410
408
  <description>SolarWinds Serv-U with version </description>
411
409
  <example service.version="15.1.3.25">Serv-U FTP Server v15.1.3.25 ready...</example>
@@ -421,10 +419,10 @@ more text</example>
421
419
  <example service.version="2.5n">Serv-U FTP-Server v2.5n for WinSock ready...</example>
422
420
  <example service.version="6.0">Serv-U FTP Server v6.0 for WinSock ready</example>
423
421
  <param pos="0" name="service.vendor" value="Serv-U"/>
424
- <param pos="0" name="service.product" value="Serv-U"/>
422
+ <param pos="0" name="service.product" value="Serv-U FTP Server"/>
425
423
  <param pos="0" name="service.family" value="Serv-U"/>
426
424
  <param pos="1" name="service.version"/>
427
- <param pos="0" name="service.cpe23" value="cpe:/a:serv-u:serv-u:{service.version}"/>
425
+ <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:serv-u_ftp_server:{service.version}"/>
428
426
  <param pos="0" name="os.vendor" value="Microsoft"/>
429
427
  <param pos="0" name="os.family" value="Windows"/>
430
428
  <param pos="0" name="os.product" value="Windows"/>
@@ -436,10 +434,10 @@ more text</example>
436
434
  <example service.version="7.2">Serv-U FTP Server v7.2 ready...</example>
437
435
  <example service.version="14.0">Serv-U FTP Server v14.0 ready...</example>
438
436
  <param pos="0" name="service.vendor" value="Serv-U"/>
439
- <param pos="0" name="service.product" value="Serv-U"/>
437
+ <param pos="0" name="service.product" value="Serv-U FTP Server"/>
440
438
  <param pos="0" name="service.family" value="Serv-U"/>
441
439
  <param pos="1" name="service.version"/>
442
- <param pos="0" name="service.cpe23" value="cpe:/a:serv-u:serv-u:{service.version}"/>
440
+ <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:serv-u_ftp_server:{service.version}"/>
443
441
  </fingerprint>
444
442
 
445
443
  <fingerprint pattern="^Welcom to Serv-U FTP Server$">
data/xml/html_title.xml CHANGED
@@ -7,6 +7,11 @@
7
7
  <example>301 Moved Permanently</example>
8
8
  </fingerprint>
9
9
 
10
+ <fingerprint pattern="^302 Found$">
11
+ <description>302 Found - generic -- assert nothing.</description>
12
+ <example>302 Found</example>
13
+ </fingerprint>
14
+
10
15
  <fingerprint pattern="^400 Bad Request$">
11
16
  <description>400 Bad Request - generic -- assert nothing.</description>
12
17
  <example>400 Bad Request</example>
@@ -17,9 +22,38 @@
17
22
  <example>401 Unauthorized</example>
18
23
  </fingerprint>
19
24
 
20
- <fingerprint pattern="^404 Not Found$">
25
+ <fingerprint pattern="^403 Forbidden$">
26
+ <description>403 Forbidden - generic -- assert nothing.</description>
27
+ <example>403 Forbidden</example>
28
+ </fingerprint>
29
+
30
+ <fingerprint pattern="^(?:404 )?Not Found$">
21
31
  <description>404 Not Found - generic -- assert nothing.</description>
22
32
  <example>404 Not Found</example>
33
+ <example>Not Found</example>
34
+ </fingerprint>
35
+
36
+ <fingerprint pattern="^Invalid URL$">
37
+ <description>Invalid URL - generic -- assert nothing.</description>
38
+ <example>Invalid URL</example>
39
+ </fingerprint>
40
+
41
+ <fingerprint pattern="^ERROR: The request could not be satisfied$">
42
+ <description>Amazon CloudFront web load balancer endpoint</description>
43
+ <example>ERROR: The request could not be satisfied</example>
44
+ <param pos="0" name="service.vendor" value="Amazon"/>
45
+ <param pos="0" name="service.family" value="CloudFront"/>
46
+ <param pos="0" name="service.product" value="CloudFront Load Balancer"/>
47
+ <param pos="0" name="service.cpe23" value="cpe:/a:amazon:amazon_cloudfront:-"/>
48
+ </fingerprint>
49
+
50
+ <fingerprint pattern="^Microsoft Azure Web App - Error 404$">
51
+ <description>Microsoft Azure Web App - Error 404</description>
52
+ <example>Microsoft Azure Web App - Error 404</example>
53
+ <param pos="0" name="service.vendor" value="Microsoft"/>
54
+ <param pos="0" name="service.family" value="Azure"/>
55
+ <param pos="0" name="service.product" value="Azure App Service on Azure Stack"/>
56
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:azure_app_service_on_azure_stack:-"/>
23
57
  </fingerprint>
24
58
 
25
59
  <fingerprint pattern="^Index of /">
@@ -103,14 +137,41 @@
103
137
  <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:-"/>
104
138
  </fingerprint>
105
139
 
106
- <fingerprint pattern="^Apache Tomcat/(\S+)$">
140
+ <fingerprint pattern="^Apache Tomcat/(\S+)(?: - Error report)?$">
107
141
  <description>Apache tomcat with minimal version information</description>
108
142
  <example service.version="8.0.32">Apache Tomcat/8.0.32</example>
143
+ <example service.version="5.5.29">Apache Tomcat/5.5.29 - Error report</example>
144
+ <param pos="0" name="service.vendor" value="Apache"/>
145
+ <param pos="0" name="service.product" value="Tomcat"/>
146
+ <param pos="0" name="service.family" value="Tomcat"/>
147
+ <param pos="1" name="service.version"/>
148
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
149
+ </fingerprint>
150
+
151
+ <fingerprint pattern="^Apache Tomcat/(\S+) \(Ubuntu\) - Error report$">
152
+ <description>Apache Tomcat - Error report on Ubuntu</description>
153
+ <example service.version="8.0.32">Apache Tomcat/8.0.32 (Ubuntu) - Error report</example>
154
+ <param pos="0" name="service.vendor" value="Apache"/>
155
+ <param pos="0" name="service.product" value="Tomcat"/>
156
+ <param pos="0" name="service.family" value="Tomcat"/>
157
+ <param pos="1" name="service.version"/>
158
+ <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
159
+ <param pos="0" name="os.vendor" value="Ubuntu"/>
160
+ <param pos="0" name="os.product" value="Linux"/>
161
+ <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:-"/>
162
+ </fingerprint>
163
+
164
+ <fingerprint pattern="^Apache Tomcat/(\S+) \(Debian\) - Error report$">
165
+ <description>Apache Tomcat - Error report on Debian</description>
166
+ <example service.version="7.0.56">Apache Tomcat/7.0.56 (Debian) - Error report</example>
109
167
  <param pos="0" name="service.vendor" value="Apache"/>
110
168
  <param pos="0" name="service.product" value="Tomcat"/>
111
169
  <param pos="0" name="service.family" value="Tomcat"/>
112
170
  <param pos="1" name="service.version"/>
113
171
  <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
172
+ <param pos="0" name="os.vendor" value="Debian"/>
173
+ <param pos="0" name="os.product" value="Linux"/>
174
+ <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
114
175
  </fingerprint>
115
176
 
116
177
  <fingerprint pattern="^AiCloud">
@@ -302,6 +363,14 @@
302
363
  <param pos="0" name="service.cpe23" value="cpe:/a:parallels:parallels_plesk_panel:-"/>
303
364
  </fingerprint>
304
365
 
366
+ <fingerprint pattern="^Sage X3$">
367
+ <description>Sage X3 Syracuse Web Server</description>
368
+ <example>Sage X3</example>
369
+ <param pos="0" name="service.vendor" value="Sage"/>
370
+ <param pos="0" name="service.family" value="Sage X3 Syracuse Web Server"/>
371
+ <param pos="0" name="service.product" value="Sage X3 Syracuse Web Server"/>
372
+ </fingerprint>
373
+
305
374
  <fingerprint pattern="^Web Viewer for Samsung DVR$">
306
375
  <description>Samsung DVRs</description>
307
376
  <example>Web Viewer for Samsung DVR</example>
@@ -315,6 +384,32 @@
315
384
  <param pos="0" name="os.vendor" value="SonicWall"/>
316
385
  <param pos="0" name="os.device" value="Firewall"/>
317
386
  <param pos="0" name="os.family" value="SonicOS"/>
387
+ <param pos="0" name="os.product" value="SonicOS"/>
388
+ <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
389
+ </fingerprint>
390
+
391
+ <fingerprint pattern="^SonicWall Universal Management Suite v(\d+\.\d+)$">
392
+ <description>SonicWall Universal Management Appliance - with version</description>
393
+ <example service.version="8.7">SonicWall Universal Management Suite v8.7</example>
394
+ <param pos="0" name="service.vendor" value="SonicWall"/>
395
+ <param pos="0" name="service.product" value="Universal Management Appliance"/>
396
+ <param pos="1" name="service.version"/>
397
+ <param pos="0" name="service.cpe23" value="cpe:/a:sonicwall:universal_management_appliance:{service.version}"/>
398
+ <param pos="0" name="os.vendor" value="SonicWall"/>
399
+ <param pos="0" name="os.family" value="SonicOS"/>
400
+ <param pos="0" name="os.product" value="SonicOS"/>
401
+ <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
402
+ </fingerprint>
403
+
404
+ <fingerprint pattern="^Fireware XTM User Authentication$">
405
+ <description>WatchGuard Fireware XTM login page</description>
406
+ <example>Fireware XTM User Authentication</example>
407
+ <param pos="0" name="service.vendor" value="WatchGuard"/>
408
+ <param pos="0" name="service.product" value="Fireware XTM"/>
409
+ <param pos="0" name="service.cpe23" value="cpe:/a:watchguard:fireware_xtm:-"/>
410
+ <param pos="0" name="os.vendor" value="WatchGuard"/>
411
+ <param pos="0" name="os.product" value="Fireware"/>
412
+ <param pos="0" name="os.cpe23" value="cpe:/o:watchguard:fireware:-"/>
318
413
  </fingerprint>
319
414
 
320
415
  <fingerprint pattern="^(.*).nbsp;-.nbsp;Synology.nbsp;DiskStation$">
@@ -335,6 +430,10 @@
335
430
  <description>Synology with WebStation web hosting</description>
336
431
  <example>Hello! Welcome to Synology Web Station!</example>
337
432
  <example>Hallo! Herzlich Willkommen bei Synology Web Station!</example>
433
+ <param pos="0" name="service.vendor" value="Synology"/>
434
+ <param pos="0" name="service.family" value="Diskstation"/>
435
+ <param pos="0" name="service.product" value="Web Station"/>
436
+ <param pos="0" name="service.cpe23" value="cpe:/a:synology:web_station:-"/>
338
437
  <param pos="0" name="hw.vendor" value="Synology"/>
339
438
  <param pos="0" name="hw.family" value="DiskStation"/>
340
439
  <param pos="0" name="hw.device" value="NAS"/>
@@ -429,6 +528,50 @@
429
528
  <param pos="0" name="hw.device" value="DVR"/>
430
529
  </fingerprint>
431
530
 
531
+ <!-- Various products by Zyxel -->
532
+
533
+ <fingerprint pattern="^USG60$">
534
+ <description>Zyxel USG60 Unified Security Gateway</description>
535
+ <example>USG60</example>
536
+ <param pos="0" name="os.vendor" value="Zyxel"/>
537
+ <param pos="0" name="os.product" value="USG60 firmware"/>
538
+ <param pos="0" name="os.device" value="Firewall"/>
539
+ <param pos="0" name="os.cpe23" value="cpe:/o:zyxel:usg60_firmware:-"/>
540
+ <param pos="0" name="hw.vendor" value="Zyxel"/>
541
+ <param pos="0" name="hw.family" value="Unified Security Gateway"/>
542
+ <param pos="0" name="hw.product" value="USG60"/>
543
+ <param pos="0" name="hw.device" value="Firewall"/>
544
+ <param pos="0" name="hw.cpe23" value="cpe:/h:zyxel:usg60:-"/>
545
+ </fingerprint>
546
+
547
+ <fingerprint pattern="^USG40$">
548
+ <description>Zyxel USG40 Unified Security Gateway</description>
549
+ <example>USG40</example>
550
+ <param pos="0" name="os.vendor" value="Zyxel"/>
551
+ <param pos="0" name="os.product" value="USG40 firmware"/>
552
+ <param pos="0" name="os.device" value="Firewall"/>
553
+ <param pos="0" name="os.cpe23" value="cpe:/o:zyxel:usg40_firmware:-"/>
554
+ <param pos="0" name="hw.vendor" value="Zyxel"/>
555
+ <param pos="0" name="hw.family" value="Unified Security Gateway"/>
556
+ <param pos="0" name="hw.product" value="USG40"/>
557
+ <param pos="0" name="hw.device" value="Firewall"/>
558
+ <param pos="0" name="hw.cpe23" value="cpe:/h:zyxel:usg40:-"/>
559
+ </fingerprint>
560
+
561
+ <fingerprint pattern="^USG20-VPN$">
562
+ <description>Zyxel USG20-VPN Unified Security Gateway</description>
563
+ <example>USG20-VPN</example>
564
+ <param pos="0" name="os.vendor" value="Zyxel"/>
565
+ <param pos="0" name="os.product" value="USG20-VPN firmware"/>
566
+ <param pos="0" name="os.device" value="Firewall"/>
567
+ <param pos="0" name="os.cpe23" value="cpe:/o:zyxel:usg20-vpn_firmware:-"/>
568
+ <param pos="0" name="hw.vendor" value="Zyxel"/>
569
+ <param pos="0" name="hw.family" value="Unified Security Gateway"/>
570
+ <param pos="0" name="hw.product" value="USG20-VPN"/>
571
+ <param pos="0" name="hw.device" value="Firewall"/>
572
+ <param pos="0" name="hw.cpe23" value="cpe:/h:zyxel:usg20-vpn:-"/>
573
+ </fingerprint>
574
+
432
575
  <fingerprint pattern="^RomPager Embedded Web Server Toolkit$">
433
576
  <description>Embedded HTTP server used by many vendors and device
434
577
  types, including APC, 3Com, Andover Controls, Cisco VoIP, D-Link,
@@ -440,6 +583,18 @@
440
583
  <param pos="0" name="service.product" value="RomPager"/>
441
584
  </fingerprint>
442
585
 
586
+ <fingerprint pattern="^Wowza Streaming Engine 4 (Subscription|Perpetual Pro) Edition (\d\.[\w.]+) build(\d+)$">
587
+ <description>Wowza Streaming Engine</description>
588
+ <example service.version="4.7.7.01" service.version.version="20190222144406">Wowza Streaming Engine 4 Subscription Edition 4.7.7.01 build20190222144406</example>
589
+ <example service.edition="Perpetual Pro">Wowza Streaming Engine 4 Perpetual Pro Edition 4.8.8.01 build20201216140014</example>
590
+ <param pos="0" name="service.vendor" value="Wowza"/>
591
+ <param pos="0" name="service.product" value="Streaming Engine"/>
592
+ <param pos="1" name="service.edition"/>
593
+ <param pos="2" name="service.version"/>
594
+ <param pos="3" name="service.version.version"/>
595
+ <param pos="0" name="service.cpe23" value="cpe:/a:wowza:streaming_engine:{service.version}"/>
596
+ </fingerprint>
597
+
443
598
  <fingerprint pattern="^RouterOS router configuration page$">
444
599
  <description>MikroTik RouterOS router configuration page</description>
445
600
  <example>RouterOS router configuration page</example>
@@ -535,6 +690,10 @@
535
690
  <fingerprint pattern="^Netgear Prosafe Plus Switch$">
536
691
  <description>Netgear Prosafe Plus Switch</description>
537
692
  <example>Netgear Prosafe Plus Switch</example>
693
+ <param pos="0" name="os.vendor" value="Netgear"/>
694
+ <param pos="0" name="os.device" value="Switch"/>
695
+ <param pos="0" name="os.product" value="Prosafe Firmware"/>
696
+ <param pos="0" name="os.cpe23" value="cpe:/o:netgear:prosafe_firmware:-"/>
538
697
  <param pos="0" name="hw.vendor" value="Netgear"/>
539
698
  <param pos="0" name="hw.device" value="Switch"/>
540
699
  <param pos="0" name="hw.product" value="Prosafe Plus"/>
@@ -807,11 +966,12 @@
807
966
  <param pos="0" name="hw.device" value="Lights Out Management"/>
808
967
  <param pos="0" name="hw.vendor" value="HP"/>
809
968
  <param pos="0" name="hw.product" value="iLO"/>
810
- <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights_out:-"/>
969
+ <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights-out:-"/>
811
970
  <param pos="0" name="os.vendor" value="HP"/>
812
971
  <param pos="0" name="os.device" value="Lights Out Management"/>
813
972
  <param pos="0" name="os.family" value="iLO"/>
814
973
  <param pos="0" name="os.product" value="iLO"/>
974
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_firmware:-"/>
815
975
  </fingerprint>
816
976
 
817
977
  <fingerprint pattern="^HP Integrated Lights-Out 2$">
@@ -820,24 +980,38 @@
820
980
  <param pos="0" name="hw.device" value="Lights Out Management"/>
821
981
  <param pos="0" name="hw.vendor" value="HP"/>
822
982
  <param pos="0" name="hw.product" value="iLO"/>
823
- <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights_out:-"/>
983
+ <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights-out:-"/>
824
984
  <param pos="0" name="os.vendor" value="HP"/>
825
985
  <param pos="0" name="os.device" value="Lights Out Management"/>
826
986
  <param pos="0" name="os.family" value="iLO"/>
827
987
  <param pos="0" name="os.product" value="iLO 2"/>
988
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_2_firmware:-"/>
828
989
  </fingerprint>
829
990
 
830
- <fingerprint pattern="^(iLO \d+)$">
831
- <description>HP Integrated Lights-Out 3+</description>
832
- <example hw.product="iLO 3" os.product="iLO 3">iLO 3</example>
833
- <example hw.product="iLO 4" os.product="iLO 4">iLO 4</example>
991
+ <fingerprint pattern="^iLO 3$">
992
+ <description>HP Integrated Lights-Out 3</description>
993
+ <example>iLO 3</example>
834
994
  <param pos="0" name="hw.device" value="Lights Out Management"/>
835
995
  <param pos="0" name="hw.vendor" value="HP"/>
836
- <param pos="1" name="hw.product"/>
996
+ <param pos="0" name="hw.product" value="iLO 3"/>
837
997
  <param pos="0" name="os.vendor" value="HP"/>
838
998
  <param pos="0" name="os.device" value="Lights Out Management"/>
839
999
  <param pos="0" name="os.family" value="iLO"/>
840
- <param pos="1" name="os.product"/>
1000
+ <param pos="0" name="os.product" value="iLO 3"/>
1001
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_3_firmware:-"/>
1002
+ </fingerprint>
1003
+
1004
+ <fingerprint pattern="^iLO 4$">
1005
+ <description>HP Integrated Lights-Out 4</description>
1006
+ <example>iLO 4</example>
1007
+ <param pos="0" name="hw.device" value="Lights Out Management"/>
1008
+ <param pos="0" name="hw.vendor" value="HP"/>
1009
+ <param pos="0" name="hw.product" value="iLO 4"/>
1010
+ <param pos="0" name="os.vendor" value="HP"/>
1011
+ <param pos="0" name="os.device" value="Lights Out Management"/>
1012
+ <param pos="0" name="os.family" value="iLO"/>
1013
+ <param pos="0" name="os.product" value="iLO 4"/>
1014
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:integrated_lights-out_4_firmware:-"/>
841
1015
  </fingerprint>
842
1016
 
843
1017
  <fingerprint pattern="^HPE SimpliVity OmniStack$">
@@ -993,6 +1167,14 @@
993
1167
  <param pos="0" name="hw.device" value="VoIP"/>
994
1168
  </fingerprint>
995
1169
 
1170
+ <fingerprint pattern="^3CX Phone System Management Console$">
1171
+ <description>3CX Phone System Management Console</description>
1172
+ <example>3CX Phone System Management Console</example>
1173
+ <param pos="0" name="service.vendor" value="3CX"/>
1174
+ <param pos="0" name="service.product" value="3CX Web Server"/>
1175
+ <param pos="0" name="service.cpe23" value="cpe:/a:3cx:3cx_web_server:-"/>
1176
+ </fingerprint>
1177
+
996
1178
  <fingerprint pattern="^(SPA\S+) Configuration Utility$">
997
1179
  <description>Cisco IP Phone - SPA504G Configuration Utility</description>
998
1180
  <example hw.product="SPA504G">SPA504G Configuration Utility</example>
@@ -1057,7 +1239,6 @@
1057
1239
  <param pos="0" name="os.device" value="Switch"/>
1058
1240
  <param pos="0" name="os.product" value="MDS 9000"/>
1059
1241
  <param pos="1" name="os.version"/>
1060
- <param pos="0" name="os.cpe23" value="cpe:/o:cisco:mds_9000:{os.version}"/>
1061
1242
  </fingerprint>
1062
1243
 
1063
1244
  <fingerprint pattern="^Stealthwatch Management Console$">
@@ -1111,7 +1292,7 @@
1111
1292
  <param pos="0" name="os.vendor" value="Cisco"/>
1112
1293
  <param pos="0" name="os.device" value="Wireless Controller"/>
1113
1294
  <param pos="0" name="os.product" value="Wireless LAN Controller"/>
1114
- <param pos="0" name="os.cpe23" value="cpe:/o:cisco:wireless_lan_controller:-"/>
1295
+ <param pos="0" name="os.cpe23" value="cpe:/o:cisco:wireless_lan_controller_software:-"/>
1115
1296
  <param pos="0" name="hw.vendor" value="Cisco"/>
1116
1297
  <param pos="0" name="hw.device" value="Wireless Controller"/>
1117
1298
  <param pos="0" name="hw.product" value="Wireless LAN Controller"/>
@@ -1428,7 +1609,26 @@
1428
1609
  <param pos="0" name="service.vendor" value="Citrix"/>
1429
1610
  <param pos="0" name="service.product" value="XenServer"/>
1430
1611
  <param pos="1" name="service.version"/>
1612
+ <param pos="0" name="service.device" value="Hypervisor"/>
1613
+ <param pos="0" name="service.cpe23" value="cpe:/a:citrix:xenserver:{service.version}"/>
1614
+ <param pos="0" name="os.vendor" value="Citrix"/>
1615
+ <param pos="0" name="os.product" value="XenServer"/>
1616
+ <param pos="0" name="os.device" value="Hypervisor"/>
1617
+ <param pos="0" name="hw.device" value="Hypervisor"/>
1618
+ </fingerprint>
1619
+
1620
+ <fingerprint pattern="^Welcome to Citrix Hypervisor ([0-9\.]+)$">
1621
+ <description>XenServer - Hypervisor variant</description>
1622
+ <example service.version="8.2.0">Welcome to Citrix Hypervisor 8.2.0</example>
1623
+ <param pos="0" name="service.vendor" value="Citrix"/>
1624
+ <param pos="0" name="service.product" value="XenServer"/>
1625
+ <param pos="1" name="service.version"/>
1626
+ <param pos="0" name="service.device" value="Hypervisor"/>
1431
1627
  <param pos="0" name="service.cpe23" value="cpe:/a:citrix:xenserver:{service.version}"/>
1628
+ <param pos="0" name="os.vendor" value="Citrix"/>
1629
+ <param pos="0" name="os.product" value="XenServer"/>
1630
+ <param pos="0" name="os.device" value="Hypervisor"/>
1631
+ <param pos="0" name="hw.device" value="Hypervisor"/>
1432
1632
  </fingerprint>
1433
1633
 
1434
1634
  <fingerprint pattern="^RabbitMQ Management$">
@@ -1510,10 +1710,11 @@
1510
1710
  </fingerprint>
1511
1711
 
1512
1712
  <fingerprint pattern="^Login - OpenStack Dashboard$">
1513
- <description>OpenStack Dashboard</description>
1713
+ <description>OpenStack Horizon Dashboard</description>
1514
1714
  <example>Login - OpenStack Dashboard</example>
1515
1715
  <param pos="0" name="service.vendor" value="OpenStack"/>
1516
- <param pos="0" name="service.product" value="Dashboard"/>
1716
+ <param pos="0" name="service.product" value="Horizon"/>
1717
+ <param pos="0" name="service.cpe23" value="cpe:/a:openstack:horizon:-"/>
1517
1718
  </fingerprint>
1518
1719
 
1519
1720
  <fingerprint pattern="^splunkd$">
@@ -1547,6 +1748,34 @@
1547
1748
  <param pos="0" name="service.product" value="Site Recovery Manager"/>
1548
1749
  </fingerprint>
1549
1750
 
1751
+ <fingerprint pattern="^&quot; \+ ID_VC_Welcome \+ &quot;$">
1752
+ <description>VMware vCenter</description>
1753
+ <example>" + ID_VC_Welcome + "</example>
1754
+ <param pos="0" name="service.vendor" value="VMware"/>
1755
+ <param pos="0" name="service.product" value="vCenter"/>
1756
+ <param pos="0" name="service.cpe23" value="cpe:/a:vmware:vcenter_server:-"/>
1757
+ </fingerprint>
1758
+
1759
+ <fingerprint pattern="^&quot; \+ ID_EESX_Welcome \+ &quot;$">
1760
+ <description>VMware ESXi</description>
1761
+ <example>" + ID_EESX_Welcome + "</example>
1762
+ <param pos="0" name="service.vendor" value="VMware"/>
1763
+ <param pos="0" name="os.vendor" value="VMware"/>
1764
+ <param pos="0" name="os.family" value="VMware ESX/ESXi"/>
1765
+ <param pos="0" name="os.product" value="VMware ESXi Server"/>
1766
+ <param pos="0" name="os.device" value="Hypervisor"/>
1767
+ <param pos="0" name="os.cpe23" value="cpe:/o:vmware:esxi:-"/>
1768
+ <param pos="0" name="hw.device" value="Hypervisor"/>
1769
+ </fingerprint>
1770
+
1771
+ <fingerprint pattern="^&quot; \+ ID_Converter_Welcome \+ &quot;$">
1772
+ <description>VMware Converter</description>
1773
+ <example>" + ID_Converter_Welcome + "</example>
1774
+ <param pos="0" name="service.vendor" value="VMware"/>
1775
+ <param pos="0" name="service.product" value="vCenter Converter"/>
1776
+ <param pos="0" name="service.cpe23" value="cpe:/a:vmware:vcenter_converter:-"/>
1777
+ </fingerprint>
1778
+
1550
1779
  <fingerprint pattern="^Graylog Web Interface$">
1551
1780
  <description>Graylog Web Interface</description>
1552
1781
  <example>Graylog Web Interface</example>
@@ -1602,7 +1831,7 @@
1602
1831
  <example>ManageEngine OpManager</example>
1603
1832
  <param pos="0" name="service.vendor" value="ManageEngine"/>
1604
1833
  <param pos="0" name="service.product" value="OpManager"/>
1605
- <param pos="0" name="service.cpe23" value="cpe:/a:manageengine:opmanager:-"/>
1834
+ <param pos="0" name="service.cpe23" value="cpe:/a:zohocorp:manageengine_opmanager:-"/>
1606
1835
  </fingerprint>
1607
1836
 
1608
1837
  <fingerprint pattern="^ManageEngine Desktop Central 9$">
@@ -1618,6 +1847,7 @@
1618
1847
  <example>ManageEngine ADAudit Plus</example>
1619
1848
  <param pos="0" name="service.vendor" value="ManageEngine"/>
1620
1849
  <param pos="0" name="service.product" value="ADAudit Plus"/>
1850
+ <param pos="0" name="service.cpe23" value="cpe:/a:zohocorp:manageengine_adaudit_plus:-"/>
1621
1851
  </fingerprint>
1622
1852
 
1623
1853
  <fingerprint pattern="^(ScanFront \d.+)Web Menu$">
@@ -1676,11 +1906,17 @@
1676
1906
  <param pos="0" name="os.family" value="NetScaler"/>
1677
1907
  <param pos="0" name="os.device" value="Network Management Device"/>
1678
1908
  <param pos="0" name="os.product" value="NetScaler"/>
1909
+ <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_firmware:-"/>
1679
1910
  <param pos="0" name="service.vendor" value="Citrix"/>
1680
1911
  <param pos="0" name="service.family" value="NetScaler"/>
1681
1912
  <param pos="0" name="service.device" value="Network Management Device"/>
1682
1913
  <param pos="0" name="service.product" value="NetScaler"/>
1683
1914
  <param pos="0" name="service.cpe23" value="cpe:/a:citrix:netscaler:-"/>
1915
+ <param pos="0" name="hw.vendor" value="Citrix"/>
1916
+ <param pos="0" name="hw.family" value="NetScaler"/>
1917
+ <param pos="0" name="hw.device" value="Network Management Device"/>
1918
+ <param pos="0" name="hw.product" value="NetScaler Gateway"/>
1919
+ <param pos="0" name="hw.cpe23" value="cpe:/h:citrix:netscaler_gateway:-"/>
1684
1920
  </fingerprint>
1685
1921
 
1686
1922
  <fingerprint pattern="^Netscaler Gateway$">
@@ -1690,11 +1926,17 @@
1690
1926
  <param pos="0" name="os.family" value="NetScaler"/>
1691
1927
  <param pos="0" name="os.device" value="Network Management Device"/>
1692
1928
  <param pos="0" name="os.product" value="NetScaler Gateway"/>
1929
+ <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_gateway_firmware:-"/>
1693
1930
  <param pos="0" name="service.vendor" value="Citrix"/>
1694
1931
  <param pos="0" name="service.family" value="NetScaler"/>
1695
1932
  <param pos="0" name="service.device" value="Network Management Device"/>
1696
1933
  <param pos="0" name="service.product" value="NetScaler Gateway"/>
1697
1934
  <param pos="0" name="service.cpe23" value="cpe:/a:citrix:netscaler_gateway:-"/>
1935
+ <param pos="0" name="hw.vendor" value="Citrix"/>
1936
+ <param pos="0" name="hw.family" value="NetScaler"/>
1937
+ <param pos="0" name="hw.device" value="Network Management Device"/>
1938
+ <param pos="0" name="hw.product" value="NetScaler Gateway"/>
1939
+ <param pos="0" name="hw.cpe23" value="cpe:/h:citrix:netscaler_gateway:-"/>
1698
1940
  </fingerprint>
1699
1941
 
1700
1942
  <fingerprint pattern="^Citrix (?:NetScaler SDX|ADC SDX)$">
@@ -1709,6 +1951,11 @@
1709
1951
  <param pos="0" name="service.family" value="NetScaler"/>
1710
1952
  <param pos="0" name="service.device" value="Network Management Device"/>
1711
1953
  <param pos="0" name="service.product" value="NetScaler SDX Gateway"/>
1954
+ <param pos="0" name="hw.vendor" value="Citrix"/>
1955
+ <param pos="0" name="hw.family" value="NetScaler"/>
1956
+ <param pos="0" name="hw.device" value="Network Management Device"/>
1957
+ <param pos="0" name="hw.product" value="NetScaler SDX Gateway"/>
1958
+ <param pos="0" name="hw.cpe23" value="cpe:/h:citrix:netscaler_sdx:-"/>
1712
1959
  </fingerprint>
1713
1960
 
1714
1961
  <fingerprint pattern="^Citrix NetScaler Insight Center$">
@@ -1822,22 +2069,22 @@
1822
2069
 
1823
2070
  <fingerprint pattern="^AVTECH Software, Inc\. - Room Alert(?:&amp;reg;)?\s+([a-zA-Z0-9/]+) - Advanced">
1824
2071
  <description>AVTECH RoomAlert</description>
1825
- <example hw.product="Room Alert 11E" hw.product.model="11E">AVTECH Software, Inc. - Room Alert 11E - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
1826
- <example hw.product="Room Alert 32E/W" hw.product.model="32E/W">AVTECH Software, Inc. - Room Alert 32E/W - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
1827
- <example hw.product="Room Alert 32E/W" hw.product.model="32E/W">AVTECH Software, Inc. - Room Alert&amp;reg; 32E/W - Advanced Computer Room Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
2072
+ <example hw.product="Room Alert 11E" hw.model="11E">AVTECH Software, Inc. - Room Alert 11E - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
2073
+ <example hw.product="Room Alert 32E/W" hw.model="32E/W">AVTECH Software, Inc. - Room Alert 32E/W - Advanced Computer Room Environment Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
2074
+ <example hw.product="Room Alert 32E/W" hw.model="32E/W">AVTECH Software, Inc. - Room Alert&amp;reg; 32E/W - Advanced Computer Room Monitoring, Alerting &amp;amp; Automatic Corrective Action</example>
1828
2075
  <param pos="0" name="hw.vendor" value="AVTECH"/>
1829
2076
  <param pos="0" name="hw.device" value="Monitoring"/>
1830
- <param pos="1" name="hw.product.model"/>
1831
- <param pos="0" name="hw.product" value="Room Alert {hw.product.model}"/>
2077
+ <param pos="1" name="hw.model"/>
2078
+ <param pos="0" name="hw.product" value="Room Alert {hw.model}"/>
1832
2079
  </fingerprint>
1833
2080
 
1834
2081
  <fingerprint pattern="^AVTECH Software, Inc\. - TemPageR\s+([a-zA-Z0-9/]+) - Real-Time">
1835
2082
  <description>AVTECH TepPageR</description>
1836
- <example hw.product="TemPageR 3E" hw.product.model="3E">AVTECH Software, Inc. - TemPageR 3E - Real-Time Temperature Monitor For IT &amp;amp; Facilities Environment Monitoring</example>
2083
+ <example hw.product="TemPageR 3E" hw.model="3E">AVTECH Software, Inc. - TemPageR 3E - Real-Time Temperature Monitor For IT &amp;amp; Facilities Environment Monitoring</example>
1837
2084
  <param pos="0" name="hw.vendor" value="AVTECH"/>
1838
2085
  <param pos="0" name="hw.device" value="Monitoring"/>
1839
- <param pos="1" name="hw.product.model"/>
1840
- <param pos="0" name="hw.product" value="TemPageR {hw.product.model}"/>
2086
+ <param pos="1" name="hw.model"/>
2087
+ <param pos="0" name="hw.product" value="TemPageR {hw.model}"/>
1841
2088
  </fingerprint>
1842
2089
 
1843
2090
  <fingerprint pattern="^AppDynamics$">
@@ -2227,6 +2474,47 @@
2227
2474
  <param pos="1" name="hw.product"/>
2228
2475
  </fingerprint>
2229
2476
 
2477
+ <fingerprint pattern="^Welcome to Oracle Fusion Middleware$">
2478
+ <description>Oracle Fusion Middleware</description>
2479
+ <example>Welcome to Oracle Fusion Middleware</example>
2480
+ <param pos="0" name="service.vendor" value="Oracle"/>
2481
+ <param pos="0" name="service.product" value="Fusion Middleware"/>
2482
+ <param pos="0" name="service.cpe23" value="cpe:/a:oracle:fusion_middleware:-"/>
2483
+ </fingerprint>
2484
+
2485
+ <fingerprint pattern="^Oracle Secure Global Desktop(?: Redirect Page)?$">
2486
+ <description>Oracle Secure Global Desktop</description>
2487
+ <example>Oracle Secure Global Desktop</example>
2488
+ <example>Oracle Secure Global Desktop Redirect Page</example>
2489
+ <param pos="0" name="service.vendor" value="Oracle"/>
2490
+ <param pos="0" name="service.product" value="Secure Global Desktop"/>
2491
+ <param pos="0" name="service.cpe23" value="cpe:/a:oracle:secure_global_desktop:-"/>
2492
+ </fingerprint>
2493
+
2494
+ <fingerprint pattern="^OTM - Oracle Transportation Management$">
2495
+ <description>Oracle Transportation Management</description>
2496
+ <example>OTM - Oracle Transportation Management</example>
2497
+ <param pos="0" name="service.vendor" value="Oracle"/>
2498
+ <param pos="0" name="service.product" value="Transportation Management"/>
2499
+ <param pos="0" name="service.cpe23" value="cpe:/a:oracle:transportation_management:-"/>
2500
+ </fingerprint>
2501
+
2502
+ <fingerprint pattern="^Bad Oracle Access Manager Request$">
2503
+ <description>Oracle Access Manager - Bad Request</description>
2504
+ <example>Bad Oracle Access Manager Request</example>
2505
+ <param pos="0" name="service.vendor" value="Oracle"/>
2506
+ <param pos="0" name="service.product" value="Access Manager"/>
2507
+ <param pos="0" name="service.cpe23" value="cpe:/a:oracle:access_manager:-"/>
2508
+ </fingerprint>
2509
+
2510
+ <fingerprint pattern="^Oracle Access Manager Operation Error$">
2511
+ <description>Oracle Access Manager - Operation Error</description>
2512
+ <example>Oracle Access Manager Operation Error</example>
2513
+ <param pos="0" name="service.vendor" value="Oracle"/>
2514
+ <param pos="0" name="service.product" value="Access Manager"/>
2515
+ <param pos="0" name="service.cpe23" value="cpe:/a:oracle:access_manager:-"/>
2516
+ </fingerprint>
2517
+
2230
2518
  <fingerprint pattern="^(?:Oracle\(R\) )?Integrated Lights Out Manager$">
2231
2519
  <description>Oracle iLOM</description>
2232
2520
  <example>Oracle(R) Integrated Lights Out Manager</example>
@@ -2239,6 +2527,7 @@
2239
2527
  <param pos="0" name="os.vendor" value="Oracle"/>
2240
2528
  <param pos="0" name="os.family" value="ILOM"/>
2241
2529
  <param pos="0" name="os.product" value="ILOM"/>
2530
+ <param pos="0" name="os.cpe23" value="cpe:/o:oracle:integrated_lights_out_manager_firmware:-"/>
2242
2531
  </fingerprint>
2243
2532
 
2244
2533
  <fingerprint pattern="^Genetec - SHARPV\S+$">
@@ -2342,10 +2631,11 @@
2342
2631
  </fingerprint>
2343
2632
 
2344
2633
  <fingerprint pattern="^Gerrit Code Review$">
2345
- <description>Gerrit Code Review</description>
2634
+ <description>Google's Gerrit Code Review</description>
2346
2635
  <example>Gerrit Code Review</example>
2347
- <param pos="0" name="service.vendor" value="Gerrit"/>
2348
- <param pos="0" name="service.product" value="Code Review"/>
2636
+ <param pos="0" name="service.vendor" value="Google"/>
2637
+ <param pos="0" name="service.product" value="Gerrit"/>
2638
+ <param pos="0" name="service.cpe23" value="cpe:/a:google:gerrit:-"/>
2349
2639
  </fingerprint>
2350
2640
 
2351
2641
  <fingerprint pattern=" - Ignition Gateway$">
@@ -2595,9 +2885,10 @@
2595
2885
  <param pos="0" name="service.certainty" value="0.5"/>
2596
2886
  </fingerprint>
2597
2887
 
2598
- <fingerprint pattern="^ownCloud$">
2888
+ <fingerprint pattern="^[oO]wn[cC]loud$">
2599
2889
  <description>ownCloud</description>
2600
2890
  <example>ownCloud</example>
2891
+ <example>Owncloud</example>
2601
2892
  <param pos="0" name="service.vendor" value="ownCloud"/>
2602
2893
  <param pos="0" name="service.product" value="ownCloud Server"/>
2603
2894
  <param pos="0" name="service.certainty" value="0.5"/>
@@ -2624,6 +2915,7 @@
2624
2915
  <example>RStudio Sign In</example>
2625
2916
  <param pos="0" name="service.vendor" value="RStudio"/>
2626
2917
  <param pos="0" name="service.product" value="Connect"/>
2918
+ <param pos="0" name="service.cpe23" value="cpe:/a:rstudio:connect:-"/>
2627
2919
  </fingerprint>
2628
2920
 
2629
2921
  <fingerprint pattern="^(?:TurnKey Moodle|New Site)$">
@@ -2748,7 +3040,7 @@
2748
3040
  <param pos="0" name="hw.certainty" value="0.75"/>
2749
3041
  <param pos="0" name="os.vendor" value="Dell"/>
2750
3042
  <param pos="0" name="os.product" value="iDRAC Linux"/>
2751
- <param pos="0" name="os .certainty" value="0.75"/>
3043
+ <param pos="0" name="os.certainty" value="0.75"/>
2752
3044
  </fingerprint>
2753
3045
 
2754
3046
  <fingerprint pattern="^Pulse Connect Secure - SSL">
@@ -2774,7 +3066,8 @@
2774
3066
  <description>Proxmox open-source virtualization platform</description>
2775
3067
  <example>proxmox - Proxmox Virtual Environment</example>
2776
3068
  <param pos="0" name="service.vendor" value="Proxmox"/>
2777
- <param pos="0" name="service.product" value="Proxmox"/>
3069
+ <param pos="0" name="service.product" value="Virtual Environment"/>
3070
+ <param pos="0" name="service.cpe23" value="cpe:/a:proxmox:virtual_environment:-"/>
2778
3071
  <param pos="0" name="os.vendor" value="Proxmox"/>
2779
3072
  <param pos="0" name="os.family" value="Linux"/>
2780
3073
  <param pos="0" name="os.product" value="Proxmox"/>
@@ -2890,4 +3183,44 @@
2890
3183
  <param pos="0" name="service.cpe23" value="cpe:/a:metabase:metabase:-"/>
2891
3184
  </fingerprint>
2892
3185
 
3186
+ <fingerprint pattern="Nextcloud">
3187
+ <description>Nextcloud</description>
3188
+ <example>Nextcloud</example>
3189
+ <param pos="0" name="service.vendor" value="Nextcloud"/>
3190
+ <param pos="0" name="service.product" value="Nextcloud Server"/>
3191
+ <param pos="0" name="service.cpe23" value="cpe:/a:nextcloud:nextcloud_server:-"/>
3192
+ </fingerprint>
3193
+
3194
+ <fingerprint pattern="^Observium">
3195
+ <description>Observium</description>
3196
+ <example>Observium : - Test infra</example>
3197
+ <param pos="0" name="service.vendor" value="Observium"/>
3198
+ <param pos="0" name="service.product" value="Observium"/>
3199
+ <param pos="0" name="service.cpe23" value="cpe:/a:observium:observium:-"/>
3200
+ </fingerprint>
3201
+
3202
+ <fingerprint pattern="^Login to Webmin$">
3203
+ <description>Webmin</description>
3204
+ <example>Login to Webmin</example>
3205
+ <param pos="0" name="service.vendor" value="Webmin"/>
3206
+ <param pos="0" name="service.product" value="Webmin"/>
3207
+ <param pos="0" name="service.cpe23" value="cpe:/a:webmin:webmin:-"/>
3208
+ </fingerprint>
3209
+
3210
+ <fingerprint pattern="^Login to Usermin$">
3211
+ <description>Usermin</description>
3212
+ <example>Login to Usermin</example>
3213
+ <param pos="0" name="service.vendor" value="Webmin"/>
3214
+ <param pos="0" name="service.product" value="Usermin"/>
3215
+ <param pos="0" name="service.cpe23" value="cpe:/a:webmin:usermin:-"/>
3216
+ </fingerprint>
3217
+
3218
+ <fingerprint pattern="^MoinMoinWiki">
3219
+ <description>Moinmoin wiki</description>
3220
+ <example>MoinMoinWiki - MoinMoin</example>
3221
+ <param pos="0" name="service.vendor" value="MoinMoin"/>
3222
+ <param pos="0" name="service.product" value="MoinMoin"/>
3223
+ <param pos="0" name="service.cpe23" value="cpe:/a:moinmo:moinmoin:-"/>
3224
+ </fingerprint>
3225
+
2893
3226
  </fingerprints>