recog 2.3.16 → 2.3.17

Sign up to get free protection for your applications and to get access to all the features.
Files changed (39) hide show
  1. checksums.yaml +4 -4
  2. data/bin/recog_standardize +2 -2
  3. data/cpe-remap.yaml +44 -14
  4. data/identifiers/hw_device.txt +3 -4
  5. data/identifiers/hw_family.txt +6 -0
  6. data/identifiers/hw_product.txt +17 -6
  7. data/identifiers/os_architecture.txt +0 -10
  8. data/identifiers/os_device.txt +11 -31
  9. data/identifiers/os_family.txt +1 -95
  10. data/identifiers/os_product.txt +9 -117
  11. data/identifiers/service_family.txt +4 -36
  12. data/identifiers/service_product.txt +211 -92
  13. data/identifiers/vendor.txt +46 -194
  14. data/lib/recog/version.rb +1 -1
  15. data/requirements.txt +1 -1
  16. data/update_cpes.py +92 -44
  17. data/xml/dns_versionbind.xml +15 -0
  18. data/xml/favicons.xml +40 -17
  19. data/xml/ftp_banners.xml +19 -18
  20. data/xml/hp_pjl_id.xml +1 -1
  21. data/xml/html_title.xml +42 -22
  22. data/xml/http_cookies.xml +4 -1
  23. data/xml/http_servers.xml +23 -17
  24. data/xml/http_wwwauth.xml +20 -20
  25. data/xml/ldap_searchresult.xml +9 -6
  26. data/xml/ntp_banners.xml +1 -1
  27. data/xml/operating_system.xml +1 -0
  28. data/xml/sip_user_agents.xml +3 -3
  29. data/xml/smb_native_os.xml +1 -0
  30. data/xml/smtp_banners.xml +4 -2
  31. data/xml/smtp_vrfy.xml +2 -1
  32. data/xml/snmp_sysdescr.xml +31 -30
  33. data/xml/telnet_banners.xml +8 -8
  34. data/xml/x509_issuers.xml +4 -3
  35. data/xml/x509_subjects.xml +23 -16
  36. metadata +2 -5
  37. data/identifiers/software_class.txt +0 -26
  38. data/identifiers/software_family.txt +0 -91
  39. data/identifiers/software_product.txt +0 -333
data/xml/ftp_banners.xml CHANGED
@@ -522,9 +522,9 @@ more text</example>
522
522
  <param pos="0" name="service.vendor" value="APC"/>
523
523
  <param pos="0" name="service.product" value="FTP"/>
524
524
  <param pos="0" name="os.vendor" value="APC"/>
525
- <param pos="0" name="os.device" value="Power device"/>
525
+ <param pos="0" name="os.device" value="Power Device"/>
526
526
  <param pos="0" name="hw.vendor" value="APC"/>
527
- <param pos="0" name="hw.device" value="Power device"/>
527
+ <param pos="0" name="hw.device" value="Power Device"/>
528
528
  </fingerprint>
529
529
 
530
530
  <fingerprint pattern="^(\S+) Network Management Card AOS v(\d+\..+) FTP server ready\.$">
@@ -537,11 +537,11 @@ more text</example>
537
537
  <param pos="0" name="service.family" value="AOS"/>
538
538
  <param pos="2" name="service.version"/>
539
539
  <param pos="0" name="os.vendor" value="APC"/>
540
- <param pos="0" name="os.device" value="Power device"/>
540
+ <param pos="0" name="os.device" value="Power Device"/>
541
541
  <param pos="1" name="os.product"/>
542
542
  <param pos="2" name="os.version"/>
543
543
  <param pos="0" name="hw.vendor" value="APC"/>
544
- <param pos="0" name="hw.device" value="Power device"/>
544
+ <param pos="0" name="hw.device" value="Power Device"/>
545
545
  </fingerprint>
546
546
 
547
547
  <fingerprint pattern="^(\S+) FTP server \(EMC-SNAS: ([^\)]+)\)(?: \S+)?$">
@@ -560,6 +560,7 @@ more text</example>
560
560
  <param pos="0" name="hw.vendor" value="EMC"/>
561
561
  <param pos="0" name="hw.device" value="Storage"/>
562
562
  <param pos="0" name="hw.product" value="Celerra"/>
563
+ <param pos="0" name="hw.cpe23" value="cpe:/h:emc:celerra_network_attached_storage:-"/>
563
564
  </fingerprint>
564
565
 
565
566
  <fingerprint pattern="^JD FTP Server Ready.*$">
@@ -603,7 +604,7 @@ more text</example>
603
604
  <param pos="0" name="service.vendor" value="Blue Coat"/>
604
605
  <param pos="0" name="service.product" value="Proxy"/>
605
606
  <param pos="0" name="os.vendor" value="Blue Coat"/>
606
- <param pos="0" name="os.device" value="Web proxy"/>
607
+ <param pos="0" name="os.device" value="Web Proxy"/>
607
608
  </fingerprint>
608
609
 
609
610
  <fingerprint pattern="^---freeFTPd 1.0---warFTPd 1.65---$">
@@ -634,7 +635,7 @@ more text</example>
634
635
  <param pos="0" name="os.vendor" value="IBM"/>
635
636
  <param pos="0" name="os.product" value="4690"/>
636
637
  <param pos="0" name="os.family" value="4690"/>
637
- <param pos="0" name="os.device" value="Point of sale"/>
638
+ <param pos="0" name="os.device" value="Point of Sale"/>
638
639
  </fingerprint>
639
640
 
640
641
  <fingerprint pattern="^([^ ]+) NcFTPd Server \(licensed copy\) ready\.$">
@@ -651,7 +652,7 @@ more text</example>
651
652
  <example>hostname DCS-2100 FTP server ready.</example>
652
653
  <param pos="0" name="os.vendor" value="D-Link"/>
653
654
  <param pos="0" name="os.product" value="DCS-2100"/>
654
- <param pos="0" name="os.device" value="Web cam"/>
655
+ <param pos="0" name="os.device" value="IP Camera"/>
655
656
  <param pos="1" name="host.name"/>
656
657
  </fingerprint>
657
658
 
@@ -682,12 +683,12 @@ more text</example>
682
683
  <example hw.product="233D" hw.version="4.48.4">AXIS 233D Network Dome Camera 4.48.4 (Mar 23 2010) ready.</example>
683
684
  <example hw.product="P1346" hw.version="5.50beta3">AXIS P1346 Network Camera 5.50beta3 (2014) ready</example>
684
685
  <param pos="0" name="hw.vendor" value="Axis"/>
685
- <param pos="0" name="hw.device" value="Web cam"/>
686
+ <param pos="0" name="hw.device" value="IP Camera"/>
686
687
  <param pos="1" name="hw.product"/>
687
688
  <param pos="2" name="hw.version"/>
688
689
  <param pos="0" name="os.vendor" value="AXIS"/>
689
690
  <param pos="0" name="os.family" value="Linux"/>
690
- <param pos="0" name="os.device" value="Web cam"/>
691
+ <param pos="0" name="os.device" value="IP Camera"/>
691
692
  </fingerprint>
692
693
 
693
694
  <fingerprint pattern="(?i)^AXIS (\S+) (?:(?:Mk II )?Video) (?:Encoder|Encoder Blade|Module|Server|Decoder) (\S+) .*">
@@ -732,7 +733,7 @@ more text</example>
732
733
  <example hw.product="560">AXIS 560 FTP Network Print Server V6.00 Jul 7 1999 ready.</example>
733
734
  <example hw.version="6.30.beta2">AXIS 5470e FTP Network Print Server V6.30.beta2 Sep 25 2002 ready.</example>
734
735
  <param pos="0" name="hw.vendor" value="Axis"/>
735
- <param pos="0" name="hw.device" value="Print server"/>
736
+ <param pos="0" name="hw.device" value="Print Server"/>
736
737
  <param pos="1" name="hw.product"/>
737
738
  <param pos="2" name="hw.version"/>
738
739
  </fingerprint>
@@ -986,7 +987,7 @@ more text</example>
986
987
  <example hw.product="10/100 +IPDS" os.version="1.0">LinkCom Xpress 10/100 +IPDS FTP version 1.0 ready</example>
987
988
  <param pos="0" name="hw.vendor" value="MPI Technologies"/>
988
989
  <param pos="0" name="hw.family" value="LinkCom Xpress"/>
989
- <param pos="0" name="hw.device" value="Print server"/>
990
+ <param pos="0" name="hw.device" value="Print Server"/>
990
991
  <param pos="1" name="hw.product"/>
991
992
  <param pos="2" name="os.version"/>
992
993
  </fingerprint>
@@ -996,7 +997,7 @@ more text</example>
996
997
  <example hw.product="EIO PRO 10">LinkCom Xpress EIO PRO 10</example>
997
998
  <param pos="0" name="hw.vendor" value="MPI Technologies"/>
998
999
  <param pos="0" name="hw.family" value="LinkCom Xpress"/>
999
- <param pos="0" name="hw.device" value="Print server"/>
1000
+ <param pos="0" name="hw.device" value="Print Server"/>
1000
1001
  <param pos="1" name="hw.product"/>
1001
1002
  </fingerprint>
1002
1003
 
@@ -1039,7 +1040,7 @@ more text</example>
1039
1040
  <example>EUFSALE MarkNet X2011e FTP Server 4.20.21 ready.</example>
1040
1041
  <param pos="0" name="os.vendor" value="Lexmark"/>
1041
1042
  <param pos="0" name="os.family" value="MarkNet"/>
1042
- <param pos="0" name="os.device" value="Print server"/>
1043
+ <param pos="0" name="os.device" value="Print Server"/>
1043
1044
  <param pos="1" name="os.product"/>
1044
1045
  <param pos="2" name="os.version"/>
1045
1046
  </fingerprint>
@@ -1189,11 +1190,11 @@ more text</example>
1189
1190
  <example>ESI-2999A Version 6.30a.07 ready.</example>
1190
1191
  <param pos="0" name="os.vendor" value="Sybase"/>
1191
1192
  <param pos="0" name="os.family" value="Extended Systems ExtendNet"/>
1192
- <param pos="0" name="os.device" value="Print server"/>
1193
+ <param pos="0" name="os.device" value="Print Server"/>
1193
1194
  <param pos="1" name="os.product"/>
1194
1195
  <param pos="2" name="os.version"/>
1195
1196
  <param pos="0" name="hw.family" value="Extended Systems ExtendNet"/>
1196
- <param pos="0" name="hw.device" value="Print server"/>
1197
+ <param pos="0" name="hw.device" value="Print Server"/>
1197
1198
  <param pos="1" name="hw.product"/>
1198
1199
  </fingerprint>
1199
1200
 
@@ -1233,7 +1234,7 @@ more text</example>
1233
1234
  <param pos="0" name="service.product" value="Fiery Print Server"/>
1234
1235
  <param pos="0" name="os.vendor" value="EFI"/>
1235
1236
  <param pos="0" name="os.product" value="Fiery Print Server"/>
1236
- <param pos="0" name="os.device" value="Print server"/>
1237
+ <param pos="0" name="os.device" value="Print Server"/>
1237
1238
  </fingerprint>
1238
1239
 
1239
1240
  <!-- Conjectured based on known MX FTP fingerprints -->
@@ -1289,11 +1290,11 @@ more text</example>
1289
1290
  <example os.version="V56.17.5Z">ZBR-79071 Version V56.17.5Z ready.</example>
1290
1291
  <example os.version="7.02">ZBR-46687 Version 7.02 ready.</example>
1291
1292
  <param pos="0" name="os.vendor" value="ZebraNet"/>
1292
- <param pos="0" name="os.device" value="Print server"/>
1293
+ <param pos="0" name="os.device" value="Print Server"/>
1293
1294
  <param pos="1" name="os.product"/>
1294
1295
  <param pos="2" name="os.version"/>
1295
1296
  <param pos="0" name="hw.vendor" value="ZebraNet"/>
1296
- <param pos="0" name="hw.device" value="Print server"/>
1297
+ <param pos="0" name="hw.device" value="Print Server"/>
1297
1298
  <param pos="1" name="hw.product"/>
1298
1299
  </fingerprint>
1299
1300
 
data/xml/hp_pjl_id.xml CHANGED
@@ -393,7 +393,7 @@
393
393
  <example>EX4112-4127</example>
394
394
  <param pos="0" name="os.vendor" value="Xerox"/>
395
395
  <param pos="0" name="os.family" value="EX"/>
396
- <param pos="0" name="os.device" value="Print server"/>
396
+ <param pos="0" name="os.device" value="Print Server"/>
397
397
  <param pos="1" name="os.product"/>
398
398
  </fingerprint>
399
399
 
data/xml/html_title.xml CHANGED
@@ -378,8 +378,10 @@
378
378
  <param pos="0" name="os.vendor" value="Ubiquiti"/>
379
379
  <param pos="0" name="os.family" value="Linux"/>
380
380
  <param pos="0" name="os.product" value="EdgeOS"/>
381
+ <param pos="0" name="os.cpe23" value="cpe:/o:ui:edgeos:-"/>
381
382
  <param pos="0" name="hw.vendor" value="Ubiquiti"/>
382
383
  <param pos="0" name="hw.product" value="EdgeSwitch"/>
384
+ <param pos="0" name="hw.cpe23" value="cpe:/h:ui:edgeswitch:-"/>
383
385
  </fingerprint>
384
386
 
385
387
  <fingerprint pattern="^EdgeOS$">
@@ -388,6 +390,7 @@
388
390
  <param pos="0" name="os.vendor" value="Ubiquiti"/>
389
391
  <param pos="0" name="os.family" value="Linux"/>
390
392
  <param pos="0" name="os.product" value="EdgeOS"/>
393
+ <param pos="0" name="os.cpe23" value="cpe:/o:ui:edgeos:-"/>
391
394
  <param pos="0" name="hw.vendor" value="Ubiquiti"/>
392
395
  </fingerprint>
393
396
 
@@ -621,14 +624,14 @@
621
624
  <description>Eltek Power Controller</description>
622
625
  <example>WebPower</example>
623
626
  <param pos="0" name="hw.vendor" value="Eltek"/>
624
- <param pos="0" name="hw.device" value="Power device"/>
627
+ <param pos="0" name="hw.device" value="Power Device"/>
625
628
  </fingerprint>
626
629
 
627
630
  <fingerprint pattern="(Expert Power Control NET \d+x\d+) - (.*)$">
628
631
  <description>Gude Expert Power Control</description>
629
632
  <example host.name="Rack42" hw.product="Expert Power Control NET 2x6">Expert Power Control NET 2x6 - Rack42</example>
630
633
  <param pos="0" name="hw.vendor" value="Gude"/>
631
- <param pos="0" name="hw.device" value="Power device"/>
634
+ <param pos="0" name="hw.device" value="Power Device"/>
632
635
  <param pos="1" name="hw.product"/>
633
636
  <param pos="2" name="host.name"/>
634
637
  </fingerprint>
@@ -637,7 +640,7 @@
637
640
  <description>Sentry Switched CDU</description>
638
641
  <example>Sentry Switched CDU</example>
639
642
  <param pos="0" name="hw.vendor" value="ServerTech"/>
640
- <param pos="0" name="hw.device" value="Power device"/>
643
+ <param pos="0" name="hw.device" value="Power Device"/>
641
644
  <param pos="0" name="hw.product" value="Sentry Switched CDU"/>
642
645
  </fingerprint>
643
646
 
@@ -645,7 +648,7 @@
645
648
  <description>Emerson Network Power Rack PDU Card</description>
646
649
  <example>Emerson Network Power Rack PDU Card</example>
647
650
  <param pos="0" name="hw.vendor" value="Emerson"/>
648
- <param pos="0" name="hw.device" value="Power device"/>
651
+ <param pos="0" name="hw.device" value="Power Device"/>
649
652
  <param pos="0" name="hw.product" value="Rack PDU Card"/>
650
653
  </fingerprint>
651
654
 
@@ -656,7 +659,7 @@
656
659
  <example hw.vendor="Vertiv">Vertiv IntelliSlot Web Card</example>
657
660
  <example hw.vendor="Liebert">Liebert IntelliSlot Web Card</example>
658
661
  <param pos="1" name="hw.vendor"/>
659
- <param pos="0" name="hw.device" value="Power device"/>
662
+ <param pos="0" name="hw.device" value="Power Device"/>
660
663
  <param pos="0" name="hw.product" value="IntelliSlot Web Card"/>
661
664
  </fingerprint>
662
665
 
@@ -664,7 +667,7 @@
664
667
  <description>ConnectUPS Web/SNMP Card</description>
665
668
  <example>ConnectUPS Web/SNMP Card</example>
666
669
  <param pos="0" name="hw.vendor" value="APC"/>
667
- <param pos="0" name="hw.device" value="Power device"/>
670
+ <param pos="0" name="hw.device" value="Power Device"/>
668
671
  <param pos="0" name="hw.product" value="ConnectUPS Web Card"/>
669
672
  </fingerprint>
670
673
 
@@ -1001,7 +1004,7 @@
1001
1004
  <description>Cisco IP Camera</description>
1002
1005
  <example>Cisco IP Camera</example>
1003
1006
  <param pos="0" name="hw.vendor" value="Cisco"/>
1004
- <param pos="0" name="hw.device" value="Web cam"/>
1007
+ <param pos="0" name="hw.device" value="IP Camera"/>
1005
1008
  </fingerprint>
1006
1009
 
1007
1010
  <fingerprint pattern="^Cisco TelePresence MCU">
@@ -1158,19 +1161,19 @@
1158
1161
  <description>Axis Communications Web Cam</description>
1159
1162
  <example>AXIS</example>
1160
1163
  <param pos="0" name="hw.vendor" value="AXIS"/>
1161
- <param pos="0" name="hw.device" value="Web cam"/>
1164
+ <param pos="0" name="hw.device" value="IP Camera"/>
1162
1165
  <param pos="0" name="os.vendor" value="AXIS"/>
1163
1166
  <param pos="0" name="os.family" value="Linux"/>
1164
- <param pos="0" name="os.device" value="Web cam"/>
1167
+ <param pos="0" name="os.device" value="IP Camera"/>
1165
1168
  </fingerprint>
1166
1169
 
1167
1170
  <fingerprint pattern="^Hanwha Techwin$">
1168
1171
  <description>Hanwha Techwin IP Camera</description>
1169
1172
  <example>Hanwha Techwin</example>
1170
1173
  <param pos="0" name="hw.vendor" value="Hanwha Techwin"/>
1171
- <param pos="0" name="hw.device" value="Web cam"/>
1174
+ <param pos="0" name="hw.device" value="IP Camera"/>
1172
1175
  <param pos="0" name="os.vendor" value="Hanwha Techwin"/>
1173
- <param pos="0" name="os.device" value="Web cam"/>
1176
+ <param pos="0" name="os.device" value="IP Camera"/>
1174
1177
  <param pos="0" name="os.family" value="Linux"/>
1175
1178
  </fingerprint>
1176
1179
 
@@ -1179,10 +1182,10 @@
1179
1182
  <example hw.product="WV-NS202A">WV-NS202A Network Camera</example>
1180
1183
  <example hw.product="WV-NS954">WV-NS954 Network Camera</example>
1181
1184
  <param pos="0" name="hw.vendor" value="Panasonic"/>
1182
- <param pos="0" name="hw.device" value="Web cam"/>
1185
+ <param pos="0" name="hw.device" value="IP Camera"/>
1183
1186
  <param pos="1" name="hw.product"/>
1184
1187
  <param pos="0" name="os.vendor" value="Panasonic"/>
1185
- <param pos="0" name="os.device" value="Web cam"/>
1188
+ <param pos="0" name="os.device" value="IP Camera"/>
1186
1189
  <param pos="0" name="os.family" value="Linux"/>
1187
1190
  </fingerprint>
1188
1191
 
@@ -1623,9 +1626,9 @@
1623
1626
  <fingerprint pattern="^Liebert OpenComms Network Interface Card$">
1624
1627
  <description>Liebert UPS</description>
1625
1628
  <example>Liebert OpenComms Network Interface Card</example>
1626
- <param pos="0" name="hw.device" value="Power device"/>
1629
+ <param pos="0" name="hw.device" value="Power Device"/>
1627
1630
  <param pos="0" name="hw.vendor" value="Liebert"/>
1628
- <param pos="0" name="os.device" value="Power device"/>
1631
+ <param pos="0" name="os.device" value="Power Device"/>
1629
1632
  <param pos="0" name="os.vendor" value="Liebert"/>
1630
1633
  </fingerprint>
1631
1634
 
@@ -2001,7 +2004,7 @@
2001
2004
  <description>Mobotix Network Camera</description>
2002
2005
  <example>Redirect to userimage: /control/userimage.html</example>
2003
2006
  <param pos="0" name="hw.vendor" value="Mobotix"/>
2004
- <param pos="0" name="hw.device" value="Web cam"/>
2007
+ <param pos="0" name="hw.device" value="IP Camera"/>
2005
2008
  <param pos="0" name="hw.product" value="IP Camera"/>
2006
2009
  </fingerprint>
2007
2010
 
@@ -2060,6 +2063,7 @@
2060
2063
  <param pos="0" name="os.vendor" value="Data Domain"/>
2061
2064
  <param pos="0" name="os.product" value="DD OS"/>
2062
2065
  <param pos="0" name="os.device" value="Storage"/>
2066
+ <param pos="0" name="os.cpe23" value="cpe:/o:dell:emc_data_domain_os:-"/>
2063
2067
  <param pos="0" name="hw.vendor" value="Data Domain"/>
2064
2068
  <param pos="0" name="hw.product" value="DD OS"/>
2065
2069
  <param pos="0" name="hw.device" value="Storage"/>
@@ -2193,7 +2197,7 @@
2193
2197
  <example hw.product="IQA22N">IQA22N IQEYE1A1613: Live Images</example>
2194
2198
  <example hw.product="IQeye703">IQeye703 IQEYE011750: Live Images</example>
2195
2199
  <param pos="0" name="hw.vendor" value="IQinVision"/>
2196
- <param pos="0" name="hw.device" value="Web cam"/>
2200
+ <param pos="0" name="hw.device" value="IP Camera"/>
2197
2201
  <param pos="1" name="hw.product"/>
2198
2202
  </fingerprint>
2199
2203
 
@@ -2215,7 +2219,7 @@
2215
2219
  <description>Genetec AutoVu SharpV ALPR Camera</description>
2216
2220
  <example>Genetec - SHARPV01111</example>
2217
2221
  <param pos="0" name="hw.vendor" value="Genetec"/>
2218
- <param pos="0" name="hw.device" value="Web cam"/>
2222
+ <param pos="0" name="hw.device" value="IP Camera"/>
2219
2223
  <param pos="0" name="hw.product" value="AutoVu SharpV"/>
2220
2224
  </fingerprint>
2221
2225
 
@@ -2242,6 +2246,7 @@
2242
2246
  <example>TwonkyMedia server media browser</example>
2243
2247
  <param pos="0" name="service.vendor" value="Lynx Technology"/>
2244
2248
  <param pos="0" name="service.product" value="Twonky Media Server"/>
2249
+ <param pos="0" name="service.cpe23" value="cpe:/a:lynxtechnology:twonky_server:-"/>
2245
2250
  </fingerprint>
2246
2251
 
2247
2252
  <fingerprint pattern="^Spiceworks(?: Server Busy| Help Desk)?$">
@@ -2346,6 +2351,9 @@
2346
2351
  <description>OpenMediaVault</description>
2347
2352
  <example host.name="raspberrypi">openmediavault control panel - raspberrypi</example>
2348
2353
  <example host.name="raspberrypi">OpenMediaVault web administration interface - raspberrypi</example>
2354
+ <param pos="0" name="service.vendor" value="OpenMediaVault"/>
2355
+ <param pos="0" name="service.product" value="OpenMediaVault"/>
2356
+ <param pos="0" name="service.cpe23" value="cpe:/a:openmediavault:openmediavault:-"/>
2349
2357
  <param pos="0" name="os.vendor" value="OpenMediaVault"/>
2350
2358
  <param pos="0" name="os.family" value="Linux"/>
2351
2359
  <param pos="0" name="os.product" value="OpenMediaVault"/>
@@ -2392,6 +2400,7 @@
2392
2400
  <param pos="0" name="service.vendor" value="CrushFTP"/>
2393
2401
  <param pos="0" name="service.product" value="CrushFTP Web Interface"/>
2394
2402
  <param pos="0" name="service.certainty" value="0.5"/>
2403
+ <param pos="0" name="service.cpe23" value="cpe:/a:crushftp:crushftp:-"/>
2395
2404
  </fingerprint>
2396
2405
 
2397
2406
  <fingerprint pattern="^OpenEdge Explorer$">
@@ -2399,6 +2408,7 @@
2399
2408
  <example>OpenEdge Explorer</example>
2400
2409
  <param pos="0" name="service.vendor" value="Progress"/>
2401
2410
  <param pos="0" name="service.product" value="OpenEdge Explorer"/>
2411
+ <param pos="0" name="service.cpe23" value="cpe:/a:progress:openedge:-"/>
2402
2412
  </fingerprint>
2403
2413
 
2404
2414
  <fingerprint pattern="^Consul by HashiCorp$">
@@ -2444,7 +2454,8 @@
2444
2454
  <example>Swagger UI</example>
2445
2455
  <example>Swagger Editor</example>
2446
2456
  <param pos="0" name="service.vendor" value="Swagger"/>
2447
- <param pos="0" name="service.product" value="UI"/>
2457
+ <param pos="0" name="service.product" value="Swagger UI"/>
2458
+ <param pos="0" name="service.cpe23" value="cpe:/a:smartbear:swagger_ui:-"/>
2448
2459
  </fingerprint>
2449
2460
 
2450
2461
  <fingerprint pattern="^Emby$">
@@ -2517,7 +2528,9 @@
2517
2528
  <description>Metasploit Pro (and Community Edition Web UI)</description>
2518
2529
  <example>Metasploit</example>
2519
2530
  <param pos="0" name="service.vendor" value="Rapid7"/>
2520
- <param pos="0" name="service.product" value="Metasploit Pro"/>
2531
+ <param pos="0" name="service.product" value="Metasploit"/>
2532
+ <param pos="0" name="service.edition" value="Pro"/>
2533
+ <param pos="0" name="service.cpe23" value="cpe:/a:rapid7:metasploit:-"/>
2521
2534
  </fingerprint>
2522
2535
 
2523
2536
  <fingerprint pattern="^Makito X Decoder$">
@@ -2561,6 +2574,7 @@
2561
2574
  <param pos="0" name="service.vendor" value="ownCloud"/>
2562
2575
  <param pos="0" name="service.product" value="ownCloud Server"/>
2563
2576
  <param pos="0" name="service.certainty" value="0.5"/>
2577
+ <param pos="0" name="service.cpe23" value="cpe:/a:owncloud:owncloud:-"/>
2564
2578
  </fingerprint>
2565
2579
 
2566
2580
  <fingerprint pattern="^Octopus Deploy$">
@@ -2590,8 +2604,9 @@
2590
2604
  <example>TurnKey Moodle</example>
2591
2605
  <example>New Site</example>
2592
2606
  <param pos="0" name="service.vendor" value="Moodle"/>
2593
- <param pos="0" name="service.product" value="Moodle CMS"/>
2607
+ <param pos="0" name="service.product" value="Moodle"/>
2594
2608
  <param pos="0" name="service.certainty" value="0.5"/>
2609
+ <param pos="0" name="service.cpe23" value="cpe:/a:moodle:moodle:-"/>
2595
2610
  </fingerprint>
2596
2611
 
2597
2612
  <fingerprint pattern="^ArchiveTeam Warrior$">
@@ -2644,6 +2659,7 @@
2644
2659
  <example>Kodi</example>
2645
2660
  <param pos="0" name="service.vendor" value="Kodi"/>
2646
2661
  <param pos="0" name="service.product" value="Media Server"/>
2662
+ <param pos="0" name="service.cpe23" value="cpe:/a:kodi:kodi:-"/>
2647
2663
  </fingerprint>
2648
2664
 
2649
2665
  <fingerprint pattern="^(?:Drupal|TurnKey Drupal\d+|Select an installation profile)$">
@@ -2654,6 +2670,7 @@
2654
2670
  <example>Select an installation profile</example>
2655
2671
  <param pos="0" name="service.vendor" value="Drupal"/>
2656
2672
  <param pos="0" name="service.product" value="CMS"/>
2673
+ <param pos="0" name="service.cpe23" value="cpe:/a:drupal:drupal:-"/>
2657
2674
  </fingerprint>
2658
2675
 
2659
2676
  <fingerprint pattern="^LibreNMS$">
@@ -2709,10 +2726,13 @@
2709
2726
  <fingerprint pattern="^Pulse Connect Secure - SSL">
2710
2727
  <description>Pulse Secure VPN</description>
2711
2728
  <example>Pulse Connect Secure - SSL</example>
2729
+ <param pos="0" name="service.vendor" value="Pulse Secure"/>
2730
+ <param pos="0" name="service.product" value="Pulse Connect Secure"/>
2731
+ <param pos="0" name="service.cpe23" value="cpe:/a:pulsesecure:pulse_connect_secure:-"/>
2712
2732
  <param pos="0" name="os.vendor" value="Pulse Secure"/>
2713
2733
  <param pos="0" name="os.family" value="SSL-VPN"/>
2714
2734
  <param pos="0" name="os.device" value="SSL-VPN"/>
2715
- <param pos="0" name="os.product" value="SSL-VPN"/>
2735
+ <param pos="0" name="os.product" value="Pulse Connect Secure"/>
2716
2736
  </fingerprint>
2717
2737
 
2718
2738
  </fingerprints>
data/xml/http_cookies.xml CHANGED
@@ -156,10 +156,13 @@
156
156
  <fingerprint pattern="^DSSignInURL=/">
157
157
  <description>Pulse Secure VPN</description>
158
158
  <example>DSSignInURL=/; path=/; secure</example>
159
+ <param pos="0" name="service.vendor" value="Pulse Secure"/>
160
+ <param pos="0" name="service.product" value="Pulse Connect Secure"/>
161
+ <param pos="0" name="service.cpe23" value="cpe:/a:pulsesecure:pulse_connect_secure:-"/>
159
162
  <param pos="0" name="os.vendor" value="Pulse Secure"/>
160
163
  <param pos="0" name="os.family" value="SSL-VPN"/>
161
164
  <param pos="0" name="os.device" value="SSL-VPN"/>
162
- <param pos="0" name="os.product" value="SSL-VPN"/>
165
+ <param pos="0" name="os.product" value="Pulse Connect Secure"/>
163
166
  </fingerprint>
164
167
 
165
168
  <fingerprint pattern="^(EktGUID|ecm)=.*">
data/xml/http_servers.xml CHANGED
@@ -963,14 +963,14 @@
963
963
  <example>ReeCam IP Camera</example>
964
964
  <param pos="0" name="hw.vendor" value="Shenzhen Reecam Tech. Ltd."/>
965
965
  <param pos="0" name="hw.product" value="ReeCam"/>
966
- <param pos="0" name="hw.device" value="Web cam"/>
966
+ <param pos="0" name="hw.device" value="IP Camera"/>
967
967
  </fingerprint>
968
968
 
969
969
  <fingerprint pattern="^Netwave IP Camera$">
970
970
  <description>Netwave cameras</description>
971
971
  <example>Netwave IP Camera</example>
972
972
  <param pos="0" name="hw.vendor" value="Netwave"/>
973
- <param pos="0" name="hw.device" value="Web cam"/>
973
+ <param pos="0" name="hw.device" value="IP Camera"/>
974
974
  </fingerprint>
975
975
 
976
976
  <fingerprint pattern="^Cougar/([0-9.]*)$">
@@ -1013,7 +1013,7 @@
1013
1013
  <example>camera</example>
1014
1014
  <example>IPCamera Login</example>
1015
1015
  <example>Mini Dome IP Camera</example>
1016
- <param pos="0" name="hw.device" value="Web cam"/>
1016
+ <param pos="0" name="hw.device" value="IP Camera"/>
1017
1017
  </fingerprint>
1018
1018
 
1019
1019
  <fingerprint pattern="^ASP.NET$">
@@ -1496,6 +1496,7 @@
1496
1496
  <param pos="0" name="service.product" value="Abyss Web Server X1"/>
1497
1497
  <param pos="0" name="service.family" value="Abyss Web Server"/>
1498
1498
  <param pos="1" name="service.version"/>
1499
+ <param pos="0" name="service.cpe23" value="cpe:/a:aprelium:abyss_web_server_x1:{service.version}"/>
1499
1500
  <param pos="0" name="os.vendor" value="Microsoft"/>
1500
1501
  <param pos="0" name="os.family" value="Windows"/>
1501
1502
  <param pos="0" name="os.product" value="Windows"/>
@@ -1508,6 +1509,7 @@
1508
1509
  <param pos="0" name="service.product" value="Abyss Web Server X1"/>
1509
1510
  <param pos="0" name="service.family" value="Abyss Web Server"/>
1510
1511
  <param pos="1" name="service.version"/>
1512
+ <param pos="0" name="service.cpe23" value="cpe:/a:aprelium:abyss_web_server_x1:{service.version}"/>
1511
1513
  <param pos="0" name="os.vendor" value="Microsoft"/>
1512
1514
  <param pos="0" name="os.family" value="Windows"/>
1513
1515
  <param pos="0" name="os.product" value="Windows"/>
@@ -1693,6 +1695,7 @@
1693
1695
  <example>SAP Internet Graphics Server</example>
1694
1696
  <param pos="0" name="service.vendor" value="SAP"/>
1695
1697
  <param pos="0" name="service.product" value="Internet Graphics Server"/>
1698
+ <param pos="0" name="service.cpe23" value="cpe:/a:sap:internet_graphics_server:-"/>
1696
1699
  <param pos="0" name="service.component.vendor" value="SAP"/>
1697
1700
  <param pos="0" name="service.component.product" value="NetWeaver Application Server"/>
1698
1701
  <param pos="0" name="service.component.cpe23" value="cpe:/a:sap:netweaver_application_server:-"/>
@@ -1767,7 +1770,7 @@
1767
1770
  <param pos="0" name="service.product" value="NetCache"/>
1768
1771
  <param pos="1" name="service.version"/>
1769
1772
  <param pos="0" name="os.vendor" value="Blue Coat"/>
1770
- <param pos="0" name="os.device" value="Web proxy"/>
1773
+ <param pos="0" name="os.device" value="Web Proxy"/>
1771
1774
  <param pos="0" name="os.family" value="NetCache"/>
1772
1775
  <param pos="0" name="os.product" value="NetCache"/>
1773
1776
  </fingerprint>
@@ -1781,7 +1784,7 @@
1781
1784
  <param pos="0" name="os.vendor" value="NetApp"/>
1782
1785
  <param pos="0" name="os.family" value="Data ONTAP"/>
1783
1786
  <param pos="0" name="os.product" value="Data ONTAP"/>
1784
- <param pos="0" name="os.device" value="File server"/>
1787
+ <param pos="0" name="os.device" value="File Server"/>
1785
1788
  <param pos="1" name="os.version"/>
1786
1789
  <param pos="0" name="os.cpe23" value="cpe:/o:netapp:data_ontap:{os.version}"/>
1787
1790
  </fingerprint>
@@ -1790,7 +1793,7 @@
1790
1793
  <description>Blue Coat security appliance</description>
1791
1794
  <example>BlueCoat-Security-Appliance</example>
1792
1795
  <param pos="0" name="os.vendor" value="Blue Coat"/>
1793
- <param pos="0" name="os.device" value="Web proxy"/>
1796
+ <param pos="0" name="os.device" value="Web Proxy"/>
1794
1797
  <param pos="0" name="os.family" value="Blue Coat"/>
1795
1798
  <param pos="0" name="os.product" value="Appliance"/>
1796
1799
  </fingerprint>
@@ -2153,7 +2156,7 @@
2153
2156
  <fingerprint pattern="^D-Link MiniAVServer$">
2154
2157
  <description>D-Link embedded web server for web cams</description>
2155
2158
  <param pos="0" name="os.vendor" value="D-Link"/>
2156
- <param pos="0" name="os.device" value="Web cam"/>
2159
+ <param pos="0" name="os.device" value="IP Camera"/>
2157
2160
  </fingerprint>
2158
2161
 
2159
2162
  <fingerprint pattern="^ListManagerWeb/(\S+) .*$">
@@ -2583,7 +2586,7 @@
2583
2586
  <param pos="0" name="service.family" value="emHTTPD"/>
2584
2587
  <param pos="1" name="service.version"/>
2585
2588
  <param pos="0" name="os.vendor" value="Microplex"/>
2586
- <param pos="0" name="os.device" value="Print server"/>
2589
+ <param pos="0" name="os.device" value="Print Server"/>
2587
2590
  </fingerprint>
2588
2591
 
2589
2592
  <fingerprint pattern="^UPS_Server/((?:\d+\.)*\d+)$">
@@ -2791,7 +2794,7 @@
2791
2794
  <param pos="0" name="service.vendor" value="Akamai"/>
2792
2795
  <param pos="0" name="service.product" value="GHost"/>
2793
2796
  <param pos="0" name="os.vendor" value="Akamai"/>
2794
- <param pos="0" name="os.device" value="Web proxy"/>
2797
+ <param pos="0" name="os.device" value="Web Proxy"/>
2795
2798
  </fingerprint>
2796
2799
 
2797
2800
  <fingerprint pattern="^gws$">
@@ -2925,6 +2928,7 @@
2925
2928
  <param pos="0" name="service.product" value="Intel(R) Active Management Technology"/>
2926
2929
  <param pos="0" name="service.family" value="Intel(R) Active Management Technology"/>
2927
2930
  <param pos="1" name="service.version"/>
2931
+ <param pos="0" name="service.cpe23" value="cpe:/a:intel:active_management_technology:{service.version}"/>
2928
2932
  </fingerprint>
2929
2933
 
2930
2934
  <fingerprint pattern="^(?:AMT|Intel\(R\) Active Management Technology)$">
@@ -2934,6 +2938,7 @@
2934
2938
  <param pos="0" name="service.vendor" value="Intel"/>
2935
2939
  <param pos="0" name="service.product" value="Intel(R) Active Management Technology"/>
2936
2940
  <param pos="0" name="service.family" value="Intel(R) Active Management Technology"/>
2941
+ <param pos="0" name="service.cpe23" value="cpe:/a:intel:active_management_technology:-"/>
2937
2942
  </fingerprint>
2938
2943
 
2939
2944
  <fingerprint pattern="^Intel\(R\) Standard Manageability\s(\d+\.\d+\.\d+\.\d+|\d+\.\d+\.\d+|\d+\.\d+)">
@@ -2944,6 +2949,7 @@
2944
2949
  <param pos="0" name="service.product" value="Intel(R) Standard Manageability"/>
2945
2950
  <param pos="0" name="service.family" value="Intel(R) Active Management Technology"/>
2946
2951
  <param pos="1" name="service.version"/>
2952
+ <param pos="0" name="service.cpe23" value="cpe:/a:intel:standard_manageability:{service.version}"/>
2947
2953
  </fingerprint>
2948
2954
 
2949
2955
  <fingerprint pattern="^Sunny WebBox$">
@@ -2955,7 +2961,7 @@
2955
2961
  <param pos="0" name="hw.vendor" value="SMA"/>
2956
2962
  <param pos="0" name="hw.family" value="Sunny"/>
2957
2963
  <param pos="0" name="hw.product" value="Sunny WebBox"/>
2958
- <param pos="0" name="hw.device" value="Power device"/>
2964
+ <param pos="0" name="hw.device" value="Power Device"/>
2959
2965
  <param pos="0" name="hw.cpe23" value="cpe:/h:sma:sunny_webbox:-"/>
2960
2966
  <param pos="0" name="os.vendor" value="Microsoft"/>
2961
2967
  <param pos="0" name="os.family" value="Windows"/>
@@ -2968,7 +2974,7 @@
2968
2974
  <example>EnergyICT RTU 101-F25CE1-1524</example>
2969
2975
  <param pos="0" name="hw.family" value="Honeywell"/>
2970
2976
  <param pos="0" name="hw.product" value="RTU"/>
2971
- <param pos="0" name="hw.device" value="Power device"/>
2977
+ <param pos="0" name="hw.device" value="Power Device"/>
2972
2978
  </fingerprint>
2973
2979
 
2974
2980
  <fingerprint pattern="^AV-TECH AV787 Video Web Server$">
@@ -3121,7 +3127,7 @@
3121
3127
  <description>Huawei Echolife / Home Gateway (and possibly other) devices with UPnP</description>
3122
3128
  <example>Linux UPnP/1.0 Huawei-ATP-IGD</example>
3123
3129
  <param pos="0" name="hw.vendor" value="Huawei"/>
3124
- <param pos="0" name="hw.device" value="Broadband router"/>
3130
+ <param pos="0" name="hw.device" value="Broadband Router"/>
3125
3131
  </fingerprint>
3126
3132
 
3127
3133
  <fingerprint pattern="(?i)^OpenWRT/kamikaze UPnP/\S+ MiniUPnPd/([\d.]+)$">
@@ -3708,7 +3714,7 @@
3708
3714
  <description>Steinsvik Orbit IP Camera (Truen TCAM Rebrand)</description>
3709
3715
  <example>Linux/2.6.28.9-Mozart-8G, UPnP/1.0, Portable SDK for UPnP devices/1.6.6</example>
3710
3716
  <param pos="0" name="hw.vendor" value="Steinsvik"/>
3711
- <param pos="0" name="hw.device" value="Web cam"/>
3717
+ <param pos="0" name="hw.device" value="IP Camera"/>
3712
3718
  <param pos="0" name="hw.product" value="Orbit IP Camera"/>
3713
3719
  <param pos="0" name="os.vendor" value="Steinsvik"/>
3714
3720
  <param pos="0" name="os.family" value="Linux"/>
@@ -3738,9 +3744,9 @@
3738
3744
  <description>Axis Network Camera</description>
3739
3745
  <example>Linux/4.9.94-axis5, UPnP/1.0, Portable SDK for UPnP devices/1.6.22</example>
3740
3746
  <param pos="0" name="hw.vendor" value="AXIS"/>
3741
- <param pos="0" name="hw.device" value="Web cam"/>
3747
+ <param pos="0" name="hw.device" value="IP Camera"/>
3742
3748
  <param pos="0" name="os.vendor" value="AXIS"/>
3743
- <param pos="0" name="os.device" value="Web cam"/>
3749
+ <param pos="0" name="os.device" value="IP Camera"/>
3744
3750
  <param pos="0" name="os.family" value="Linux"/>
3745
3751
  <param pos="0" name="os.product" value="Linux"/>
3746
3752
  <param pos="1" name="os.version"/>
@@ -3987,7 +3993,7 @@
3987
3993
  <description>ANNKE IP Camera</description>
3988
3994
  <example>MWS 0.01</example>
3989
3995
  <param pos="0" name="hw.vendor" value="ANNKE"/>
3990
- <param pos="0" name="hw.device" value="Web cam"/>
3996
+ <param pos="0" name="hw.device" value="IP Camera"/>
3991
3997
  <param pos="0" name="hw.product" value="IP Camera"/>
3992
3998
  </fingerprint>
3993
3999
 
@@ -4077,7 +4083,7 @@
4077
4083
  <example>Xfinity Broadband Router Server</example>
4078
4084
  <param pos="0" name="hw.vendor" value="Comcast"/>
4079
4085
  <param pos="0" name="hw.product" value="Xfinity Broadband Router"/>
4080
- <param pos="0" name="hw.device" value="Broadband router"/>
4086
+ <param pos="0" name="hw.device" value="Broadband Router"/>
4081
4087
  </fingerprint>
4082
4088
 
4083
4089
  <fingerprint pattern="^IX Series IX21\d\d \(magellan-sec\) Software, Version ([^, ]+), (?:MAINTENANCE )?RELEASE SOFTWARE$">