recog 2.3.18 → 2.3.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (73) hide show
  1. checksums.yaml +4 -4
  2. data/.github/dependabot.yml +8 -0
  3. data/.github/workflows/ci.yml +26 -0
  4. data/.github/workflows/verify.yml +89 -0
  5. data/CONTRIBUTING.md +6 -0
  6. data/README.md +17 -0
  7. data/bin/recog_standardize +33 -12
  8. data/bin/recog_verify +1 -2
  9. data/cpe-remap.yaml +355 -200
  10. data/features/verify.feature +14 -14
  11. data/identifiers/README.md +24 -10
  12. data/identifiers/fields.txt +105 -0
  13. data/identifiers/hw_device.txt +8 -0
  14. data/identifiers/hw_family.txt +19 -0
  15. data/identifiers/hw_product.txt +122 -0
  16. data/identifiers/os_device.txt +2 -1
  17. data/identifiers/os_family.txt +3 -0
  18. data/identifiers/os_product.txt +46 -8
  19. data/identifiers/service_family.txt +10 -1
  20. data/identifiers/service_product.txt +90 -2
  21. data/identifiers/vendor.txt +104 -0
  22. data/lib/recog/db.rb +2 -1
  23. data/lib/recog/fingerprint.rb +18 -5
  24. data/lib/recog/nizer.rb +1 -82
  25. data/lib/recog/verifier.rb +5 -5
  26. data/lib/recog/verifier_factory.rb +3 -3
  27. data/lib/recog/verify_reporter.rb +14 -4
  28. data/lib/recog/version.rb +1 -1
  29. data/requirements.txt +1 -1
  30. data/spec/lib/fingerprint_self_test_spec.rb +1 -0
  31. data/spec/lib/recog/verify_reporter_spec.rb +69 -0
  32. data/tools/dev/hooks/pre-commit +21 -0
  33. data/update_cpes.py +19 -6
  34. data/xml/apache_modules.xml +60 -0
  35. data/xml/apache_os.xml +38 -38
  36. data/xml/dhcp_vendor_class.xml +206 -0
  37. data/xml/dns_versionbind.xml +11 -1
  38. data/xml/favicons.xml +270 -45
  39. data/xml/ftp_banners.xml +89 -64
  40. data/xml/h323_callresp.xml +99 -99
  41. data/xml/hp_pjl_id.xml +3 -3
  42. data/xml/html_title.xml +1051 -62
  43. data/xml/http_cookies.xml +294 -85
  44. data/xml/http_servers.xml +551 -122
  45. data/xml/http_wwwauth.xml +139 -43
  46. data/xml/imap_banners.xml +8 -8
  47. data/xml/ldap_searchresult.xml +1 -0
  48. data/xml/mdns_device-info_txt.xml +720 -27
  49. data/xml/mysql_banners.xml +3 -2
  50. data/xml/nntp_banners.xml +4 -4
  51. data/xml/ntp_banners.xml +79 -65
  52. data/xml/operating_system.xml +6 -6
  53. data/xml/pop_banners.xml +11 -11
  54. data/xml/rsh_resp.xml +3 -3
  55. data/xml/rtsp_servers.xml +7 -0
  56. data/xml/sip_banners.xml +374 -9
  57. data/xml/sip_user_agents.xml +377 -5
  58. data/xml/smb_native_lm.xml +32 -1
  59. data/xml/smb_native_os.xml +160 -33
  60. data/xml/smtp_banners.xml +168 -129
  61. data/xml/smtp_ehlo.xml +1 -1
  62. data/xml/smtp_expn.xml +1 -0
  63. data/xml/smtp_help.xml +10 -10
  64. data/xml/smtp_noop.xml +2 -2
  65. data/xml/smtp_vrfy.xml +1 -0
  66. data/xml/snmp_sysdescr.xml +508 -214
  67. data/xml/snmp_sysobjid.xml +25 -25
  68. data/xml/ssh_banners.xml +145 -29
  69. data/xml/telnet_banners.xml +240 -61
  70. data/xml/tls_jarm.xml +162 -0
  71. data/xml/x509_issuers.xml +237 -2
  72. data/xml/x509_subjects.xml +369 -49
  73. metadata +10 -3
data/identifiers/README.md CHANGED
@@ -1,16 +1,27 @@
1
1
  # Recog: Identifiers
2
2
 
3
- This directory contains lists of standard identifiers for mapping Recog matches. The goal is define a standard set of constants to represent known software, hardware, vendors, and categories.
3
+ This directory contains lists of standard identifiers for mapping Recog matches.
4
+ The goal is define a standard set of constants to represent known software,
5
+ hardware, vendors, and categories.
4
6
 
5
- This is currently incomplete and will be updated as standardization work moves forward.
7
+ This is currently incomplete and will be updated as standardization work moves
8
+ forward.
6
9
 
7
- Fingerprints should use these identifiers whenever possible; if a different name or syntax for a given identifier is preferred, this should be implemented in the application through a mapping function.
10
+ Fingerprints should use these identifiers whenever possible; if a different name
11
+ or syntax for a given identifier is preferred, this should be implemented in the
12
+ application through a mapping function.
8
13
 
9
14
  ## Lists
10
15
 
16
+ ### Fields
17
+
18
+ `fields.txt` defines the various fields (`os.vendor`, etc.) used to assert
19
+ information about a match.
20
+
11
21
  ### Vendors
12
22
 
13
- `vendor.txt` defines known vendor names, covering services, operating systems, and hardware.
23
+ `vendor.txt` defines known vendor names, covering services, operating systems,
24
+ and hardware.
14
25
 
15
26
  ### Operating Systems
16
27
 
@@ -22,14 +33,14 @@ Fingerprints should use these identifiers whenever possible; if a different name
22
33
 
23
34
  `os_device.txt` defines known types of devices by function or purpose.
24
35
 
25
-
26
36
  ### Hardware
27
37
 
28
38
  `hw_product.txt` defines known hardware product names.
29
39
 
30
40
  `hw_family.txt` defines known hardware product families.
31
41
 
32
- `hw_device.txt` defines known types of devices by function or purpose (overlaps with `os_device.txt`).
42
+ `hw_device.txt` defines known types of devices by function or purpose (overlaps
43
+ with `os_device.txt`).
33
44
 
34
45
  ### Services
35
46
 
@@ -47,10 +58,13 @@ Fingerprints should use these identifiers whenever possible; if a different name
47
58
 
48
59
  ## Pending Work
49
60
 
50
- * All existing fingerprints should be correlated against these lists to identify mismatches and updated accordingly.
61
+ * All existing fingerprints should be correlated against these lists to
62
+ identify mismatches and updated accordingly.
51
63
 
52
- * All net new identifiers from the existing fingerprints should be merged into these lists.
64
+ * All net new identifiers from the existing fingerprints should be merged into
65
+ these lists.
53
66
 
54
- * All fingerprint assertions should be enumerated, documented, and standardized where possible (`host.mac`, etc).
67
+ * All fingerprint assertions should be enumerated, documented, and standardized
68
+ where possible (`host.mac`, etc).
55
69
 
56
- * Hardware identifiers should be enumerated, consolidated, and standardized.
70
+ * Hardware identifiers should be enumerated, consolidated, and standardized.
data/identifiers/fields.txt ADDED
@@ -0,0 +1,105 @@
1
+ agilent.serial
2
+ apache.info
3
+ apache.variant
4
+ apache.variant.version
5
+ aptinex.model
6
+ chromecast.capabilities
7
+ chromecast.generation
8
+ cisco.imc_model
9
+ cisco.model
10
+ cookie
11
+ dell.service_tag
12
+ digi.serial_number
13
+ extron.model
14
+ host.domain
15
+ host.ip
16
+ host.mac
17
+ host.mac_eui64
18
+ host.mac_local
19
+ host.name
20
+ host.time
21
+ hw.certainty
22
+ hw.cpe23
23
+ hw.device
24
+ hw.family
25
+ hw.model
26
+ hw.product
27
+ hw.serial_number
28
+ hw.series
29
+ hw.vendor
30
+ hw.version
31
+ imail.eval
32
+ jetty.info
33
+ junction.cookie
34
+ junction.name
35
+ lantronix.serial_number
36
+ lenovo.machine_model
37
+ lenovo.machine_type
38
+ linux.kernel.version
39
+ loadbalancer.poolname
40
+ mdaemon.unregistered
41
+ mercur.os.info
42
+ metainfo.version
43
+ metainfo.version.version
44
+ ms.nttp.version
45
+ notes.build.version
46
+ ntmail.id
47
+ openssh.comment
48
+ openssh.cvepatch
49
+ os.arch
50
+ os.build
51
+ os.certainty
52
+ os.cpe23
53
+ os.device
54
+ os.edition
55
+ os.family
56
+ os.model
57
+ os.product
58
+ os.rev
59
+ os.vendor
60
+ os.version
61
+ os.version.version
62
+ os.version.version.version
63
+ postfix.os.info
64
+ postoffice.build
65
+ postoffice.id
66
+ procurve.model
67
+ proftpd.server.name
68
+ pureftpd.config
69
+ python.version
70
+ qpopper.version
71
+ securetransport.build
72
+ sendmail.config.version
73
+ sendmail.hpux.phne.version
74
+ sendmail.vendor.version
75
+ service.certainty
76
+ service.component.cpe23
77
+ service.component.family
78
+ service.component.product
79
+ service.component.vendor
80
+ service.component.version
81
+ service.cpe23
82
+ service.device
83
+ service.edition
84
+ service.family
85
+ service.node
86
+ service.product
87
+ service.protocol
88
+ service.vendor
89
+ service.version
90
+ service.version.version
91
+ service.version.version.version
92
+ service.version.version.version.version
93
+ siemens.model
94
+ snmp.fpmib.oid.1
95
+ snmp.fpmib.oid.2
96
+ system.time
97
+ system.time.format
98
+ system.time.micros
99
+ system.time.millis
100
+ tandberg.model
101
+ thttpd.mx-patch
102
+ tomcat.info
103
+ unify.model
104
+ wd2go.device_id
105
+ zmailer.ident
data/identifiers/hw_device.txt CHANGED
@@ -22,6 +22,7 @@ Ethernet Adapter
22
22
  Firewall
23
23
  HMI Controller
24
24
  Handheld Scanner
25
+ Hypervisor
25
26
  IP Camera
26
27
  IPS
27
28
  Industrial Control
@@ -30,6 +31,7 @@ KVM
30
31
  Laptop
31
32
  Light Bulb
32
33
  Lights Out Management
34
+ Media Player
33
35
  Media Receiver
34
36
  Media Server
35
37
  Mobile Phone
@@ -41,16 +43,19 @@ Network Audio
41
43
  Network Management Device
42
44
  PLC
43
45
  Power Device
46
+ Power Meter
44
47
  Power Relay
45
48
  Powerline
46
49
  Print Server
47
50
  Printer
51
+ Relay Controller
48
52
  Router
49
53
  SD-WAN Appliance
50
54
  SIP Device
51
55
  SIP Gateway
52
56
  Scanner
53
57
  Security Appliance
58
+ Sensor
54
59
  Smart TV
55
60
  Storage
56
61
  Storage Appliance
@@ -60,6 +65,8 @@ Tablet
60
65
  Tape Library
61
66
  Telecom
62
67
  Test Instrument
68
+ Thin Client
69
+ UPS
63
70
  VPN
64
71
  Video Conference
65
72
  Video Conferencing
@@ -71,6 +78,7 @@ VoIP Switch
71
78
  Voice Appliance
72
79
  WAP
73
80
  WLAN Repeater
81
+ Web Cam
74
82
  Whiteboard
75
83
  Wireless Controller
76
84
  Wireless Presenter
data/identifiers/hw_family.txt CHANGED
@@ -5,17 +5,21 @@ AirPort
5
5
  Apple TV
6
6
  Communication Manager
7
7
  DVR
8
+ Data ONTAP
8
9
  DiskStation
9
10
  Document Centre
10
11
  EDR
12
+ Eurotherm
11
13
  Extended Systems ExtendNet
12
14
  FRITZ!Box
15
+ FRITZ!Fon
13
16
  FRITZ!Powerline
14
17
  FRITZ!WLAN Repeater
15
18
  FS
16
19
  Firewall-1
17
20
  Forms Printer
18
21
  FortiGate
22
+ FortiVoice
19
23
  GW25
20
24
  GXV
21
25
  GXW
@@ -27,6 +31,7 @@ ILOM
27
31
  IMDVR
28
32
  ION
29
33
  JetDirect
34
+ LX Series
30
35
  LaserJet
31
36
  LinkCom Xpress
32
37
  MGate
@@ -42,9 +47,13 @@ Multifunction
42
47
  My Book
43
48
  NE
44
49
  NPort
50
+ NetScaler
45
51
  NetVanta
52
+ Netscaler
46
53
  Network Audio
54
+ Network Security Appliance
47
55
  Network Video Door Station
56
+ OpenScape Desk Phone
48
57
  Optra
49
58
  Orbi
50
59
  POWER System
@@ -59,6 +68,7 @@ Router
59
68
  S500 Range
60
69
  SIP Device
61
70
  SIP Gateway
71
+ SL2100
62
72
  Service Access Switch
63
73
  Service Router
64
74
  Simatic HMI
@@ -79,9 +89,13 @@ TelePresence
79
89
  Time Capsule
80
90
  TippingPoint
81
91
  Turbo Station
92
+ UNIVERGE
82
93
  UniFi
83
94
  Unified Security Gateway
95
+ VDX
84
96
  VSX
97
+ VVX
98
+ Vigor
85
99
  VoIP
86
100
  WD2GO
87
101
  WiMax
@@ -93,6 +107,7 @@ Xserve
93
107
  ZXDSL
94
108
  ZXHN
95
109
  ZXV
110
+ airMAX
96
111
  iLO
97
112
  iMac
98
113
  iPad
@@ -100,3 +115,7 @@ iPad Air
100
115
  iPad Pro
101
116
  iPad mini
102
117
  iPhone
118
+ iPod
119
+ iSTAR Door Controllers
120
+ imageClass
121
+ imageRunner
data/identifiers/hw_product.txt CHANGED
@@ -3,6 +3,7 @@
3
3
  34972A Data Logger
4
4
  3PAR
5
5
  53230A Frequency Counter
6
+ 883 VoIP
6
7
  ADB-4820CD
7
8
  APIC
8
9
  AV Receiver
@@ -14,20 +15,25 @@ Adaptive Security Appliance
14
15
  AirPort Express
15
16
  AirPort Extreme
16
17
  Alarm Panel
18
+ AmpliFi
17
19
  AppDynamics
18
20
  Apple TV (2nd generation)
19
21
  Apple TV (3rd generation)
20
22
  Apple TV (4th generation)
21
23
  Apple TV 4K
24
+ Apple TV 4K (2nd generation)
22
25
  Appliance
23
26
  ArchiveTeam Warrior
24
27
  Asset Management
28
+ AutoDome
25
29
  AutoVu SharpV
30
+ BlackBox
26
31
  BladeSystem Onboard Administrator
27
32
  Border GW
28
33
  Bridge
29
34
  CC EtherNet/IP
30
35
  CP
36
+ CU360
31
37
  Camera
32
38
  Captive Portal
33
39
  CarDetector
@@ -35,20 +41,30 @@ Catalyst
35
41
  Catalyst 1900
36
42
  Celerra
37
43
  Chromecast
44
+ ClearPass Policy Manager
38
45
  ClickShare
39
46
  CloudKey
47
+ Color Bulb
48
+ CommServer
40
49
  CommandPost
41
50
  ConnectUPS Web Card
42
51
  Crosswork SON Appliance
52
+ D Series
53
+ DCS-825L
43
54
  DCS-932
44
55
  DD OS
45
56
  DNA Center
46
57
  DSL Router
58
+ DX800A
59
+ Data ONTAP
47
60
  Digital Signage Player
48
61
  Discover
49
62
  Discovery
63
+ DocCam
50
64
  Document Centre
65
+ Drone Detector
51
66
  DuraFon
67
+ E5810 Gateway Device
52
68
  ECOM100
53
69
  EDR-G902
54
70
  EDR-G903
@@ -57,9 +73,13 @@ EP-series
57
73
  EXA Signal Analyzer
58
74
  Eagle Eye Director II
59
75
  EchoLife Home Gateway
76
+ EdgeRouter X
60
77
  EdgeSwitch
61
78
  Elevation
79
+ Email Security Gateway
62
80
  EqualLogic
81
+ Eternus
82
+ Ethernet Relay Controller
63
83
  Ethernet Relay Module
64
84
  Excella
65
85
  Fastmark M5
@@ -70,13 +90,26 @@ Firewall-1
70
90
  FlexiPacket Hub
71
91
  FortiMail
72
92
  FortiManager
93
+ GXP1610
94
+ GXP1615
95
+ GXP1625
96
+ GXP1628
97
+ GXP2200
73
98
  GigaVUE
74
99
  HDHomeRun
75
100
  HDIPCam
101
+ HT801
102
+ HT802
103
+ HT812
104
+ HT813
105
+ HT814
106
+ HT818
107
+ Helium Miner
76
108
  HiPer Access Router Card
77
109
  Home Controller
78
110
  Home Gateway
79
111
  HomePod
112
+ HomePod mini
80
113
  Hue
81
114
  HyperFlex Connect
82
115
  IA Appliance
@@ -89,6 +122,8 @@ IP Link Control Processor
89
122
  IP2IR
90
123
  IPMI
91
124
  IVR
125
+ Infinity Controler
126
+ Instreamer
92
127
  IntelliSlot Web Card
93
128
  Internet Payment Gateway
94
129
  Internet Phone Adapter
@@ -99,7 +134,10 @@ J9155A
99
134
  JetDirect
100
135
  K1000
101
136
  KWS-1043N
137
+ KX-NS1000
102
138
  Key Management
139
+ Key Management Server
140
+ LORIX ONE
103
141
  Lantick Ethernet Relay Controller
104
142
  Lencore Sound Manager 2
105
143
  MDS 9000
@@ -115,6 +153,7 @@ Mac mini (Late 2009)
115
153
  Mac mini (Late 2012)
116
154
  Mac mini (Late 2014)
117
155
  Mac mini (Late 2018)
156
+ Mac mini (M1, 2020)
118
157
  Mac mini (Mid 2007)
119
158
  Mac mini (Mid 2010)
120
159
  Mac mini (Mid 2011)
@@ -132,16 +171,20 @@ MacBook Air (13-inch, Early 2014)
132
171
  MacBook Air (13-inch, Late 2010)
133
172
  MacBook Air (13-inch, Mid 2011)
134
173
  MacBook Air (13-inch, Mid 2012)
174
+ MacBook Air (M1, 2020)
135
175
  MacBook Air (Mid 2009)
136
176
  MacBook Air (Retina, 13-inch, 2018)
137
177
  MacBook Air (Retina, 13-inch, 2019)
178
+ MacBook Air (Retina, 13-inch, 2020)
138
179
  MacBook Pro (13-inch, 2016, Four Thunderbolt 3 ports)
139
180
  MacBook Pro (13-inch, 2016, Two Thunderbolt 3 ports)
140
181
  MacBook Pro (13-inch, 2017, Four Thunderbolt 3 ports)
141
182
  MacBook Pro (13-inch, 2017, Two Thunderbolt 3 ports)
142
183
  MacBook Pro (13-inch, 2018, Four Thunderbolt 3 ports)
143
184
  MacBook Pro (13-inch, 2019, Two Thunderbolt 3 ports)
185
+ MacBook Pro (13-inch, 2020)
144
186
  MacBook Pro (13-inch, Late 2011)
187
+ MacBook Pro (13-inch, M1, 2020)
145
188
  MacBook Pro (13-inch, Mid 2009)
146
189
  MacBook Pro (13-inch, Mid 2010)
147
190
  MacBook Pro (13-inch, Mid 2012)
@@ -153,6 +196,8 @@ MacBook Pro (15-inch, Late 2008)
153
196
  MacBook Pro (15-inch, Late 2011)
154
197
  MacBook Pro (15-inch, Mid 2009)
155
198
  MacBook Pro (15-inch, Mid 2010)
199
+ MacBook Pro (15-inch, Mid 2012)
200
+ MacBook Pro (16-inch, 2019)
156
201
  MacBook Pro (17-inch, Early 2008)
157
202
  MacBook Pro (17-inch, Late 2011)
158
203
  MacBook Pro (17-inch, Mid 2009)
@@ -164,58 +209,86 @@ MacBook Pro (Retina, 15-inch, Early 2013)
164
209
  MacBook Pro (Retina, 15-inch, Late 2013)
165
210
  MacBook Pro (Retina, 15-inch, Mid 2015)
166
211
  Makito X Decoder
212
+ Media Gateway
167
213
  MediaLink Controller
168
214
  MediaSense
169
215
  Meeting Management
170
216
  Meeting Server
171
217
  MegaRAC
218
+ Meraki Device
172
219
  Mercury
173
220
  Mergepoint
174
221
  Miniserver
175
222
  My Book Live
223
+ N1913A Power Meter
176
224
  N5172B Signal Generator
225
+ NAM
177
226
  NAS4Free
178
227
  NFVIS
179
228
  NPort
229
+ NR900
230
+ NetScaler Gateway
231
+ NetScaler SDX Gateway
180
232
  NetScreen
181
233
  NetVR
182
234
  Netbox
235
+ Netscaler Gateway
236
+ Network Camera
183
237
  Network Gateway
184
238
  Network Node
239
+ Network Security Appliance
185
240
  Nexus 1000V
186
241
  Nexus Player
242
+ Novus UPS
187
243
  OfficeConnect Switch
188
244
  OnHub
189
245
  OpenManage
190
246
  OpenManage Switch
191
247
  OpenNAC
248
+ Orbi micro
192
249
  Orbit IP Camera
250
+ PCoIP Endpoint Device
193
251
  PDR M800
252
+ PIAF Virtual Appliance
194
253
  PLAY
195
254
  PLC-5
196
255
  Paragon-100G
197
256
  Photonic Switch
257
+ Plug Outdoor
198
258
  PoliWall
259
+ PowerLogic Power Meter
199
260
  PowerVault 124T
200
261
  Prime Collaboration Manager
201
262
  Primergy
202
263
  Printer
203
264
  Prosafe Plus
265
+ Quad Plus Receiver
266
+ R Series
267
+ RT31P2
204
268
  RTU
205
269
  Rack PDU Card
270
+ RadioLinx
206
271
  Raspberry Pi
207
272
  ReadyNAS
208
273
  RecoverPoint
209
274
  ReeCam
210
275
  Roku
211
276
  Room Alert
277
+ Roomba
212
278
  S7 DALI Gateway
279
+ SD-WAN
280
+ SHDSL Router
213
281
  SHIELD
214
282
  SIP Gateway
215
283
  SIParator Firewall
284
+ SL2100
216
285
  SLS
217
286
  SPA
287
+ SPA112
288
+ SPA122
218
289
  SRP
290
+ SV8100
291
+ SV9100
219
292
  ScanFront
220
293
  Scrutinizer
221
294
  Sensor
@@ -227,9 +300,11 @@ Site Recovery Manager
227
300
  SmartEdge Sensor
228
301
  Softswitch
229
302
  SolsticePod
303
+ SonicPoint
230
304
  SoundPoint
231
305
  Spot
232
306
  Stealthwatch
307
+ Steelhead
233
308
  Storage Appliance
234
309
  Sub
235
310
  Sunny WebBox
@@ -238,6 +313,7 @@ SuperStack 3 Firewall
238
313
  SuperStack II
239
314
  Symmetry EN-2DBC
240
315
  System Management
316
+ TG789vac
241
317
  TelePresence
242
318
  TelePresence MCU
243
319
  Tenable Appliance
@@ -245,13 +321,23 @@ Tenable Core
245
321
  Tetration
246
322
  Time Capsule
247
323
  TouchLink Control Panel
324
+ UCM6202
325
+ UCM6204
326
+ UCM6208
248
327
  UCS Manager
328
+ UDS
329
+ UPS
330
+ USG20-VPN
331
+ USG40
332
+ USG60
333
+ Ultra Door Controller
249
334
  UniFi Cloud Key
250
335
  UniFi NVR
251
336
  UniFi Security Gateway
252
337
  Univerge
253
338
  Universal Media Gateway
254
339
  VBrick Rev
340
+ VPN Gateway
255
341
  Verizon FiOS Router
256
342
  Video Controller
257
343
  Vigor
@@ -259,10 +345,12 @@ Virtual Connect Manager
259
345
  Virtual Traffic Manager
260
346
  Vood
261
347
  WLAN AP
348
+ WNR2000
262
349
  WebBox
263
350
  Whiteboard
264
351
  Wireless Dock
265
352
  Wireless LAN Controller
353
+ Wireless Radio
266
354
  Wireless Router
267
355
  XCC
268
356
  Xfinity Broadband Router
@@ -279,6 +367,8 @@ iCOM Control Panel
279
367
  iDRAC
280
368
  iLO
281
369
  iLO 3
370
+ iLO 4
371
+ iMac (20/24-inch, Early 2008)
282
372
  iMac (21.5-inch, 2017)
283
373
  iMac (21.5-inch, Late 2012)
284
374
  iMac (21.5-inch, Late 2013)
@@ -287,6 +377,7 @@ iMac (21.5-inch, Mid 2010)
287
377
  iMac (21.5-inch, Mid 2011)
288
378
  iMac (21.5-inch, Mid 2014)
289
379
  iMac (24-inch, Early 2009)
380
+ iMac (24-inch, M1, 2021)
290
381
  iMac (27-inch, Late 2009)
291
382
  iMac (27-inch, Late 2012)
292
383
  iMac (27-inch, Late 2013)
@@ -297,25 +388,47 @@ iMac (Retina 4K, 21.5-inch, 2019)
297
388
  iMac (Retina 4K, 21.5-inch, Late 2015)
298
389
  iMac (Retina 5K, 27-inch, 2017)
299
390
  iMac (Retina 5K, 27-inch, 2019)
391
+ iMac (Retina 5K, 27-inch, 2020)
300
392
  iMac (Retina 5K, 27-inch, Late 2015)
301
393
  iMac (Retina 5K, 27-inch, Mid 2015)
302
394
  iMac Pro (Retina 5K, Late 2017)
303
395
  iPad (4th generation)
304
396
  iPad (5th generation)
305
397
  iPad (6th generation)
398
+ iPad (7th generation)
399
+ iPad (8th generation)
400
+ iPad (9th generation)
306
401
  iPad Air
307
402
  iPad Air (3rd generation)
403
+ iPad Air (4th generation)
308
404
  iPad Air 2
309
405
  iPad Pro (10.5-inch)
310
406
  iPad Pro (11-inch)
407
+ iPad Pro (11-inch, 2nd generation)
408
+ iPad Pro (11-inch, 3rd generation)
311
409
  iPad Pro (12.9-inch)
410
+ iPad Pro (12.9-inch, 2nd generation)
411
+ iPad Pro (12.9-inch, 3rd generation)
412
+ iPad Pro (12.9-inch, 4th generation)
312
413
  iPad Pro (9.7-inch)
313
414
  iPad mini
314
415
  iPad mini (5th generation)
416
+ iPad mini (6th generation)
315
417
  iPad mini 2
316
418
  iPad mini 3
317
419
  iPad mini 4
318
420
  iPhone
421
+ iPhone 11
422
+ iPhone 11 Pro
423
+ iPhone 11 Pro Max
424
+ iPhone 12 5G
425
+ iPhone 12 Mini 5G
426
+ iPhone 12 Pro 5G
427
+ iPhone 12 Pro Max 5G
428
+ iPhone 13
429
+ iPhone 13 Pro
430
+ iPhone 13 Pro Max
431
+ iPhone 13 mini
319
432
  iPhone 3G
320
433
  iPhone 3GS
321
434
  iPhone 4
@@ -332,8 +445,17 @@ iPhone 7 Plus
332
445
  iPhone 8
333
446
  iPhone 8 Plus
334
447
  iPhone SE
448
+ iPhone SE (2020)
335
449
  iPhone X
336
450
  iPhone XR
337
451
  iPhone XS
338
452
  iPhone XS Max
453
+ iPod Touch (1st generation)
454
+ iPod Touch (2nd generation)
455
+ iPod Touch (3rd generation)
456
+ iPod Touch (4th generation)
457
+ iPod Touch (5th generation)
458
+ iPod Touch (6th generation)
459
+ iPod Touch (7th generation)
460
+ iSTAR Ultra
339
461
  vManage
data/identifiers/os_device.txt CHANGED
@@ -14,7 +14,6 @@ DSU/CSU
14
14
  DVR
15
15
  Device Server
16
16
  Fax Server
17
- File Server
18
17
  Firewall
19
18
  Frame Relay
20
19
  HMI Controller
@@ -52,6 +51,8 @@ Remote Access Server
52
51
  Remote Terminal
53
52
  Router
54
53
  SD-WAN Appliance
54
+ SIP Device
55
+ SIP Gateway
55
56
  SSL-VPN
56
57
  Scanner
57
58
  Security Appliance
data/identifiers/os_family.txt CHANGED
@@ -123,6 +123,7 @@ Netopia
123
123
  NetportExpress
124
124
  Netscaler
125
125
  Network Printer
126
+ NetworkOS
126
127
  OPTI-MX
127
128
  OS/400
128
129
  OfficeConnect
@@ -131,6 +132,7 @@ OpenServer
131
132
  OpenVMS
132
133
  OpenWRT
133
134
  Optra
135
+ PAN-OS
134
136
  PIX
135
137
  PLC
136
138
  Packet-Optical
@@ -183,6 +185,7 @@ System Storage
183
185
  T3 Termination
184
186
  TASKalfa
185
187
  TDS750 Series
188
+ Teradici
186
189
  Time Capsule
187
190
  TippingPoint
188
191
  Total Access