recog 0.02 → 1.0.0

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 (47) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +6 -0
  3. data/.rspec +2 -1
  4. data/.travis.yml +5 -0
  5. data/.yardopts +1 -0
  6. data/Gemfile +3 -1
  7. data/README.md +12 -12
  8. data/Rakefile +22 -0
  9. data/bin/recog_verify.rb +1 -1
  10. data/features/match.feature +2 -2
  11. data/features/verify.feature +10 -7
  12. data/features/xml/no_tests.xml +0 -50
  13. data/features/xml/successful_tests.xml +7 -22
  14. data/features/xml/tests_with_failures.xml +10 -0
  15. data/features/xml/tests_with_warnings.xml +7 -0
  16. data/lib/recog/db.rb +26 -10
  17. data/lib/recog/db_manager.rb +1 -1
  18. data/lib/recog/fingerprint.rb +118 -34
  19. data/lib/recog/fingerprint/regexp_factory.rb +39 -0
  20. data/lib/recog/fingerprint/test.rb +13 -0
  21. data/lib/recog/matcher.rb +3 -3
  22. data/lib/recog/nizer.rb +16 -23
  23. data/lib/recog/verifier.rb +10 -25
  24. data/lib/recog/verifier_factory.rb +1 -1
  25. data/lib/recog/verify_reporter.rb +1 -1
  26. data/lib/recog/version.rb +1 -1
  27. data/recog.gemspec +12 -3
  28. data/spec/data/test_fingerprints.xml +12 -0
  29. data/spec/lib/fingerprint_self_test_spec.rb +8 -4
  30. data/spec/lib/{db_spec.rb → recog/db_spec.rb} +19 -7
  31. data/spec/lib/recog/fingerprint/regexp_factory.rb +61 -0
  32. data/spec/lib/recog/fingerprint_spec.rb +5 -0
  33. data/spec/lib/{formatter_spec.rb → recog/formatter_spec.rb} +1 -1
  34. data/spec/lib/{match_reporter_spec.rb → recog/match_reporter_spec.rb} +10 -9
  35. data/spec/lib/{nizer_spec.rb → recog/nizer_spec.rb} +5 -5
  36. data/spec/lib/{verify_reporter_spec.rb → recog/verify_reporter_spec.rb} +8 -7
  37. data/spec/spec_helper.rb +82 -0
  38. data/xml/apache_os.xml +48 -2
  39. data/xml/http_servers.xml +38 -6
  40. data/xml/ntp_banners.xml +4 -3
  41. data/xml/smb_native_os.xml +32 -32
  42. data/xml/smtp_expn.xml +1 -0
  43. data/xml/smtp_help.xml +2 -1
  44. data/xml/snmp_sysdescr.xml +164 -24
  45. data/xml/ssh_banners.xml +7 -3
  46. metadata +56 -8
  47. data/Gemfile.lock +0 -42
data/xml/smb_native_os.xml CHANGED
@@ -8,7 +8,7 @@
8
8
 
9
9
  <fingerprint pattern="^(Windows NT \d\.\d+)$">
10
10
  <description>Windows NT</description>
11
- <example>Windows NT 4.0</example>
11
+ <example os.product="Windows NT 4.0">Windows NT 4.0</example>
12
12
  <param pos="0" name="os.certainty" value="1.0"/>
13
13
  <param pos="0" name="os.vendor" value="Microsoft"/>
14
14
  <param pos="1" name="os.product"/>
@@ -16,8 +16,8 @@
16
16
 
17
17
  <fingerprint pattern="^(Windows (95|98|ME))$">
18
18
  <description>Windows 95/98/ME</description>
19
- <example>Windows 95</example>
20
- <example>Windows 98</example>
19
+ <example os.product="Windows 95">Windows 95</example>
20
+ <example os.product="Windows 98">Windows 98</example>
21
21
  <param pos="0" name="os.certainty" value="1.0"/>
22
22
  <param pos="0" name="os.vendor" value="Microsoft"/>
23
23
  <param pos="1" name="os.product"/>
@@ -41,7 +41,7 @@
41
41
 
42
42
  <fingerprint pattern="^Windows XP (\d+) (Service Pack \d+)$">
43
43
  <description>Windows XP</description>
44
- <example>Windows XP 2600 Service Pack 1</example>
44
+ <example os.build="2600" os.version="Service Pack 1">Windows XP 2600 Service Pack 1</example>
45
45
  <param pos="0" name="os.certainty" value="1.0"/>
46
46
  <param pos="0" name="os.vendor" value="Microsoft"/>
47
47
  <param pos="0" name="os.product" value="Windows XP"/>
@@ -51,12 +51,12 @@
51
51
 
52
52
  <fingerprint pattern="^Windows XP (\d+)$">
53
53
  <description>Windows XP</description>
54
- <example>Windows XP 2600</example>
54
+ <example os.build="2600">Windows XP 2600</example>
55
55
  <param pos="0" name="os.certainty" value="1.0"/>
56
56
  <param pos="0" name="os.vendor" value="Microsoft"/>
57
57
  <param pos="0" name="os.product" value="Windows XP"/>
58
58
  <param pos="1" name="os.build"/>
59
- </fingerprint>
59
+ </fingerprint>
60
60
 
61
61
  <fingerprint pattern="^Windows \.NET">
62
62
  <description>Windows Server 2003 Beta</description>
@@ -76,7 +76,7 @@
76
76
 
77
77
  <fingerprint pattern="^Windows Server 2003 R2 (\d+) (Service Pack \d+)$">
78
78
  <description>Windows Server 2003 R2 (SP)</description>
79
- <example>Windows Server 2003 R2 3790 Service Pack 2</example>
79
+ <example os.buid="3790" os.version="Service Pack 2">Windows Server 2003 R2 3790 Service Pack 2</example>
80
80
  <param pos="0" name="os.certainty" value="1.0"/>
81
81
  <param pos="0" name="os.vendor" value="Microsoft"/>
82
82
  <param pos="0" name="os.product" value="Windows Server 2003 R2"/>
@@ -86,7 +86,7 @@
86
86
 
87
87
  <fingerprint pattern="^Windows Server 2003 (\d+)$">
88
88
  <description>Windows Server 2003</description>
89
- <example>Windows Server 2003 3790</example>
89
+ <example os.buid="3790">Windows Server 2003 3790</example>
90
90
  <param pos="0" name="os.certainty" value="1.0"/>
91
91
  <param pos="0" name="os.vendor" value="Microsoft"/>
92
92
  <param pos="0" name="os.product" value="Windows Server 2003"/>
@@ -95,8 +95,8 @@
95
95
 
96
96
  <fingerprint pattern="^Windows Server 2003 (\d+) (Service Pack \d+)$">
97
97
  <description>Windows Server 2003 (SP)</description>
98
- <example>Windows Server 2003 3790 Service Pack 1</example>
99
- <example>Windows Server 2003 3790 Service Pack 2</example>
98
+ <example os.buid="3790" os.version="Service Pack 1">Windows Server 2003 3790 Service Pack 1</example>
99
+ <example os.buid="3790" os.version="Service Pack 2">Windows Server 2003 3790 Service Pack 2</example>
100
100
  <param pos="0" name="os.certainty" value="1.0"/>
101
101
  <param pos="0" name="os.vendor" value="Microsoft"/>
102
102
  <param pos="0" name="os.product" value="Windows Server 2003"/>
@@ -107,8 +107,8 @@
107
107
  <!-- Note that 2008 SP1 is technically "2008 Gold" according to Microsoft -->
108
108
  <fingerprint pattern="^Windows Server \(R\) 2008 (\w+|\w+ \w+|\w+ \w+ \w+)(?: (?:with|without) Hyper-V|) (\d+) (Service Pack \d+)$">
109
109
  <description>Windows Server 2008</description>
110
- <example>Windows Server (R) 2008 Enterprise without Hyper-V 6001 Service Pack 1</example>
111
- <example>Windows Server (R) 2008 Enterprise 6002 Service Pack 2</example>
110
+ <example os.edition="Enterprise" os.version="Service Pack 1">Windows Server (R) 2008 Enterprise without Hyper-V 6001 Service Pack 1</example>
111
+ <example os.edition="Enterprise" os.version="Service Pack 2">Windows Server (R) 2008 Enterprise 6002 Service Pack 2</example>
112
112
  <param pos="0" name="os.certainty" value="1.0"/>
113
113
  <param pos="0" name="os.vendor" value="Microsoft"/>
114
114
  <param pos="0" name="os.product" value="Windows Server 2008"/>
@@ -116,10 +116,10 @@
116
116
  <param pos="2" name="os.build"/>
117
117
  <param pos="3" name="os.version"/>
118
118
  </fingerprint>
119
-
119
+
120
120
  <fingerprint pattern="^Windows \(R\) Web Server 2008 (\d+) (Service Pack \d+)$">
121
121
  <description>Windows Web Server 2008 (SP)</description>
122
- <example>Windows (R) Web Server 2008 6002 Service Pack 2</example>
122
+ <example os.edition="Web" os.version="Service Pack 2">Windows (R) Web Server 2008 6002 Service Pack 2</example>
123
123
  <param pos="0" name="os.certainty" value="1.0"/>
124
124
  <param pos="0" name="os.vendor" value="Microsoft"/>
125
125
  <param pos="0" name="os.product" value="Windows Server 2008"/>
@@ -148,7 +148,7 @@
148
148
  <param pos="3" name="os.build"/>
149
149
  <param pos="4" name="os.version"/>
150
150
  </fingerprint>
151
-
151
+
152
152
  <!-- TODO: Need an example string -->
153
153
  <fingerprint pattern="^Windows \(R\) Storage Server 2008 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
154
154
  <description>Windows Web Server 2008 Storage</description>
@@ -169,7 +169,7 @@
169
169
  <param pos="1" name="os.build"/>
170
170
  <param pos="2" name="os.version"/>
171
171
  </fingerprint>
172
-
172
+
173
173
  <!-- TODO: Need an example string -->
174
174
  <fingerprint pattern="^Windows Server 2008 HPC Edition (\d+)$">
175
175
  <description>Windows Web Server 2008 HPC</description>
@@ -197,19 +197,19 @@
197
197
 
198
198
  <fingerprint pattern="^Windows Server 2008 R2 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
199
199
  <description>Windows Server 2008 R2</description>
200
- <example>Windows Server 2008 R2 Enterprise 7600</example>
201
- <example>Windows Server 2008 R2 Standard 7600</example>
202
- <example>Windows Server 2008 R2 Datacenter 7600</example>
200
+ <example os.edition="Enterprise">Windows Server 2008 R2 Enterprise 7600</example>
201
+ <example os.edition="Standard">Windows Server 2008 R2 Standard 7600</example>
202
+ <example os.edition="Datacenter">Windows Server 2008 R2 Datacenter 7600</example>
203
203
  <param pos="0" name="os.certainty" value="1.0"/>
204
204
  <param pos="0" name="os.vendor" value="Microsoft"/>
205
205
  <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
206
206
  <param pos="1" name="os.edition"/>
207
207
  <param pos="2" name="os.build"/>
208
- </fingerprint>
208
+ </fingerprint>
209
209
 
210
210
  <fingerprint pattern="^Windows Web Server 2008 R2 (\d+) (Service Pack \d+)$">
211
211
  <description>Windows Server 2008 R2 Web</description>
212
- <example>Windows Web Server 2008 R2 7601 Service Pack 1</example>
212
+ <example os.version="Service Pack 1">Windows Web Server 2008 R2 7601 Service Pack 1</example>
213
213
  <param pos="0" name="os.certainty" value="1.0"/>
214
214
  <param pos="0" name="os.vendor" value="Microsoft"/>
215
215
  <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
@@ -230,7 +230,7 @@
230
230
 
231
231
  <fingerprint pattern="^Windows Vista \(TM\) (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
232
232
  <description>Windows Vista (SP)</description>
233
- <example>Windows Vista (TM) Home Premium 6002 Service Pack 2</example>
233
+ <example os.edition="Home Premium" os.version="Service Pack 2">Windows Vista (TM) Home Premium 6002 Service Pack 2</example>
234
234
  <param pos="0" name="os.certainty" value="1.0"/>
235
235
  <param pos="0" name="os.vendor" value="Microsoft"/>
236
236
  <param pos="0" name="os.product" value="Windows Vista"/>
@@ -241,7 +241,7 @@
241
241
 
242
242
  <fingerprint pattern="^Windows Vista \(TM\) (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
243
243
  <description>Windows Vista</description>
244
- <example>Windows Vista (TM) Home Premium 6000</example>
244
+ <example os.edition="Home Premium">Windows Vista (TM) Home Premium 6000</example>
245
245
  <param pos="0" name="os.certainty" value="1.0"/>
246
246
  <param pos="0" name="os.vendor" value="Microsoft"/>
247
247
  <param pos="0" name="os.product" value="Windows Vista"/>
@@ -252,8 +252,8 @@
252
252
 
253
253
  <fingerprint pattern="^(Windows (?:7|8|8\.1)(?:| RT)) (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
254
254
  <description>Windows 7/8 (SP + Edition)</description>
255
- <example>Windows 7 Enterprise 7601 Service Pack 1</example>
256
- <example>Windows 7 Starter 7601 Service Pack 1</example>
255
+ <example os.edition="Enterprise" os.version="Service Pack 1">Windows 7 Enterprise 7601 Service Pack 1</example>
256
+ <example os.edition="Starter" os.version="Service Pack 1">Windows 7 Starter 7601 Service Pack 1</example>
257
257
  <param pos="0" name="os.certainty" value="1.0"/>
258
258
  <param pos="0" name="os.vendor" value="Microsoft"/>
259
259
  <param pos="1" name="os.product"/>
@@ -264,9 +264,9 @@
264
264
 
265
265
  <fingerprint pattern="^(Windows (?:7|8|8\.1)(?:| RT)) (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
266
266
  <description>Windows 7/8 (Edition)</description>
267
- <example>Windows 7 Enterprise 7600</example>
268
- <example>Windows 8.1 Enterprise 9600</example>
269
- <example>Windows 8 Enterprise 9200</example>
267
+ <example os.edition="Enterprise">Windows 7 Enterprise 7600</example>
268
+ <example os.edition="Enterprise">Windows 8.1 Enterprise 9600</example>
269
+ <example os.edition="Enterprise">Windows 8 Enterprise 9200</example>
270
270
  <param pos="0" name="os.certainty" value="1.0"/>
271
271
  <param pos="0" name="os.vendor" value="Microsoft"/>
272
272
  <param pos="1" name="os.product"/>
@@ -276,7 +276,7 @@
276
276
 
277
277
  <fingerprint pattern="^(Windows (?:7|8|8\.1)(?:| RT)) (\d+) (Service Pack \d+)$">
278
278
  <description>Windows 7/8 (SP)</description>
279
- <example>Windows 7 7601 Service Pack 1</example>
279
+ <example os.version="Service Pack 1">Windows 7 7601 Service Pack 1</example>
280
280
  <param pos="0" name="os.certainty" value="1.0"/>
281
281
  <param pos="0" name="os.vendor" value="Microsoft"/>
282
282
  <param pos="1" name="os.product"/>
@@ -308,7 +308,7 @@
308
308
 
309
309
  <fingerprint pattern="^Windows Server 2012 R2 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
310
310
  <description>Windows Server 2012 R2</description>
311
- <example>Windows Server 2012 R2 Standard 9600</example>
311
+ <example os.edition="Standard">Windows Server 2012 R2 Standard 9600</example>
312
312
  <param pos="0" name="os.certainty" value="1.0"/>
313
313
  <param pos="0" name="os.vendor" value="Microsoft"/>
314
314
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
@@ -380,6 +380,6 @@
380
380
  <param pos="0" name="os.product" value="VxWorks"/>
381
381
  <param pos="0" name="service.vendor" value="Wind River"/>
382
382
  <param pos="0" name="service.product" value="VxWorks CIFS"/>
383
- </fingerprint>
383
+ </fingerprint>
384
384
 
385
- </fingerprints>
385
+ </fingerprints>
data/xml/smtp_expn.xml CHANGED
@@ -47,6 +47,7 @@ See comment at the top of smtp_banners.xml for additional info.
47
47
 
48
48
  <!-- VM SMTP server doesn't like brackets in EXPN commands... -->
49
49
  <fingerprint pattern="^501[ -]Syntax Error\. Only ListId or Userid allowed as argument to this command *$">
50
+ <description>IBM VM SMTP</description>
50
51
  <param pos="0" name="service.vendor" value="IBM"/>
51
52
  <param pos="0" name="service.family" value="VM"/>
52
53
  <param pos="0" name="service.product" value="VM"/>
data/xml/smtp_help.xml CHANGED
@@ -52,6 +52,7 @@ See comment at the top of smtp_banners.xml for additional info.
52
52
  </fingerprint>
53
53
 
54
54
  <fingerprint pattern="^214[ -]([^ ]+) is running the IBM VM operating system$">
55
+ <description>IBM VM</description>
55
56
  <param pos="0" name="service.vendor" value="IBM"/>
56
57
  <param pos="0" name="service.family" value="VM"/>
57
58
  <param pos="0" name="service.product" value="VM"/>
@@ -134,7 +135,7 @@ See comment at the top of smtp_banners.xml for additional info.
134
135
  <param pos="0" name="service.vendor" value="qmail"/>
135
136
  <param pos="0" name="service.family" value="qmail"/>
136
137
  <param pos="0" name="service.product" value="qmail"/>
137
- </fingerprint>
138
+ </fingerprint>
138
139
 
139
140
  <fingerprint pattern="^214[ -].*contact the Digital Customer Support Center at 1-800-354-9000.*$">
140
141
  <description>
data/xml/snmp_sysdescr.xml CHANGED
@@ -5,7 +5,7 @@
5
5
  'sysDescr' (OID 1.3.6.1.2.1.1.1) variable.
6
6
  -->
7
7
  <fingerprints matches="snmp.sys_description">
8
-
8
+
9
9
  <!--======================================================================
10
10
  3COM
11
11
  =======================================================================-->
@@ -445,7 +445,7 @@
445
445
  Accelerated Technology
446
446
  =======================================================================-->
447
447
 
448
- <!-- This is an embedded SNMP stack but does not uniquely identify the OS
448
+ <!-- This is an embedded SNMP stack but does not uniquely identify the OS
449
449
  http://www.acceleratedtechnology.com.tw/embedded/net_manage.html#snmp
450
450
  -->
451
451
  <fingerprint pattern="^Nucleus SNMP Agent$">
@@ -1408,7 +1408,7 @@
1408
1408
  <example>Linux SystemEDGE Management Agent, Concord Communications, Inc.</example>
1409
1409
  <example>SystemEDGE Management Agent, CA, Inc.</example>
1410
1410
  <example>SystemEDGE for LINUX</example>
1411
- <example>SystemEDGE for Windows</example>
1411
+ <example>SystemEDGE for Windows</example>
1412
1412
  <param pos="0" name="service.vendor" value="CA"/>
1413
1413
  <param pos="0" name="service.family" value="SystemEdge"/>
1414
1414
  <param pos="0" name="service.product" value="Management Agent"/>
@@ -1459,6 +1459,7 @@
1459
1459
  <example>IP530 rev 00, IPSO schotter 4.2-BUILD106a04 releng 1515 02.19.2010-165807 i386</example>
1460
1460
  <example>IP650 rev AA729002-408, IPSO ebola-mgate 3.5-FCS14 releng 1041 01.11.2003-012500 i386</example>
1461
1461
  <example>IP650 rev AA729002-408, IPSO semalfw05 3.7.1-BUILD020 releng 1299 02.09.2005-020308 i386</example>
1462
+ <param pos="0" name="os.certainty" value="0.95"/>
1462
1463
  <param pos="0" name="os.vendor" value="Check Point"/>
1463
1464
  <param pos="0" name="os.family" value="IPSO"/>
1464
1465
  <param pos="0" name="os.product" value="IPSO"/>
@@ -1526,10 +1527,28 @@
1526
1527
  <!--======================================================================
1527
1528
  CISCO
1528
1529
  =======================================================================-->
1530
+ <fingerprint pattern="^Cisco Adaptive Security Appliance Version (\d+\.\d+\(\d+\)\d*)">
1531
+ <description>Cisco Adaptive Security Appliance</description>
1532
+ <example os.version="8.0(2)">Cisco Adaptive Security Appliance Version 8.0(2)</example>
1533
+ <example os.version="8.2(0)227">Cisco Adaptive Security Appliance Version 8.2(0)227</example>
1534
+ <example os.version="7.1(0)182">Cisco Adaptive Security Appliance Version 7.1(0)182 </example>
1535
+ <example os.version="8.1(0)15">Cisco Adaptive Security Appliance Version 8.1(0)15</example>
1536
+ <example os.version="8.0(4)28">Cisco Adaptive Security Appliance Version 8.0(4)28</example>
1537
+ <example os.version="7.2(1)4">Cisco Adaptive Security Appliance Version 7.2(1)4</example>
1538
+ <example os.version="8.4(5)">Cisco Adaptive Security Appliance Version 8.4(5)</example>
1539
+ <example os.version="8.4(2)">Cisco Adaptive Security Appliance Version 8.4(2)</example>
1540
+ <example of.versoin="7.2(4)17">Cisco Adaptive Security Appliance Version 7.2(4)17</example>
1541
+ <param pos="0" name="os.certainty" value="0.85"/>
1542
+ <param pos="0" name="os.vendor" value="Cisco"/>
1543
+ <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
1544
+ <param pos="0" name="os.device" value="Firewall"/>
1545
+ <param pos="1" name="os.version"/>
1546
+ </fingerprint>
1529
1547
 
1530
1548
  <fingerprint pattern="^Cisco 761 Software Version (.*) -.*$">
1531
1549
  <description>Cisco 761</description>
1532
1550
  <example>Cisco 761 Software Version c760-i.b.NET3 4.2(3) - Aug 21 1998 17:05:41 ISDN Stack Revision NET3 2.10</example>
1551
+ <param pos="0" name="os.certainty" value="0.85"/>
1533
1552
  <param pos="0" name="os.vendor" value="Cisco"/>
1534
1553
  <param pos="0" name="os.family" value="760 Series"/>
1535
1554
  <param pos="0" name="os.product" value="761"/>
@@ -1542,6 +1561,7 @@
1542
1561
  <example>Cisco Systems, Inc./VPN 3000 Concentrator Series Version 3.0.2.Rel built by vmurphy on Apr 05 2001 21:41:33</example>
1543
1562
  <example>Cisco Systems, Inc./VPN 3000 Concentrator Version 4.1.3.Rel built by vmurphy on Apr 12 2004 04:06:15</example>
1544
1563
  <example>Cisco Systems, Inc./VPN 3000 Concentrator Version 4.1.7.H built by vmurphy on Oct 03 2005 23:20:53</example>
1564
+ <param pos="0" name="os.certainty" value="0.85"/>
1545
1565
  <param pos="0" name="os.vendor" value="Cisco"/>
1546
1566
  <param pos="0" name="os.product" value="VPN 3000 Concentrator"/>
1547
1567
  <param pos="0" name="os.device" value="VPN"/>
@@ -1556,6 +1576,7 @@
1556
1576
  <example>Cisco Network Analysis Module (WS-SVC-NAM-2), Version 5.0(1) RELEASE SOFTWARE [fc4]</example>
1557
1577
  <example>Cisco Network Analysis Module (WS-SVC-NAM-2-250S), Version 4.1(1) RELEASE SOFTWARE [fc2]</example>
1558
1578
  <example>Cisco Network Analysis Module (WS-SVC-NAM-2), Version 3.6(1b)</example>
1579
+ <param pos="0" name="os.certainty" value="0.85"/>
1559
1580
  <param pos="0" name="os.vendor" value="Cisco"/>
1560
1581
  <param pos="0" name="os.product" value="NAM"/>
1561
1582
  <param pos="0" name="os.device" value="General"/>
@@ -1565,6 +1586,7 @@
1565
1586
  <fingerprint pattern="^(?:Cisco )?Network Analysis Module \(WS-([^\-]+)-NAM\)$">
1566
1587
  <description>Cisco Catalyst Network Analysis Module</description>
1567
1588
  <example>Network Analysis Module (WS-X6380-NAM)</example>
1589
+ <param pos="0" name="os.certainty" value="0.85"/>
1568
1590
  <param pos="0" name="os.vendor" value="Cisco"/>
1569
1591
  <param pos="0" name="os.product" value="NAM"/>
1570
1592
  <param pos="0" name="os.device" value="General"/>
@@ -1576,6 +1598,7 @@
1576
1598
  <example>Cisco Internetwork Operating System Software ..IOS (tm) C1700 Software (C1700-Y-M), Version 12.2(4)YB, EARLY DEPLOYMENT RELEASE SOFTWARE (fc1)..Synched to technology version 12.2(6.8)T2..TAC Support: http://www.cisco.com/tac..Copyright (c) 1986-2002 by ci</example>
1577
1599
  <example>Cisco Internetwork Operating System Software ..IOS (tm) C2600 Software (C2600-I-M), Version 12.0(3)T3, RELEASE SOFTWARE (fc1)..Copyright (c) 1986-1999 by cisco Systems, Inc...Compiled Thu 15-Apr-99 15:41 by kpma</example>
1578
1600
  <example>Cisco IOS Software, C1700 Software (C1700-ADVSECURITYK9-M), Version 12.3(11)YZ2, RELEASE SOFTWARE (fc2)..Technical Support: http://www.cisco.com/techsupport..Copyright (c) 1986-2007 by Cisco Systems, Inc...Compiled Wed 08-Aug-07 19:22 by dchih</example>
1601
+ <param pos="0" name="os.certainty" value="0.85"/>
1579
1602
  <param pos="0" name="os.vendor" value="Cisco"/>
1580
1603
  <param pos="0" name="os.product" value="IOS"/>
1581
1604
  <param pos="0" name="os.family" value="IOS"/>
@@ -1605,6 +1628,7 @@ Copyright (c) 1995-2002 by Cisco Systems, Inc.
1605
1628
  Cisco Catalyst Operating System Software, Version 5.5(16)
1606
1629
  Copyright (c) 1995-2002 by Cisco Systems, Inc.
1607
1630
  </example>
1631
+ <param pos="0" name="os.certainty" value="0.85"/>
1608
1632
  <param pos="0" name="os.vendor" value="Cisco"/>
1609
1633
  <param pos="0" name="os.product" value="CatOS"/>
1610
1634
  <param pos="0" name="os.family" value="CatOS"/>
@@ -1618,6 +1642,7 @@ Copyright (c) 1995-2002 by Cisco Systems, Inc.
1618
1642
  Cisco Catalyst Operating System Software, Version 8.3(7)
1619
1643
  Copyright (c) 1995-2005 by Cisco Systems
1620
1644
  </example>
1645
+ <param pos="0" name="os.certainty" value="0.85"/>
1621
1646
  <param pos="0" name="os.vendor" value="Cisco"/>
1622
1647
  <param pos="0" name="os.product" value="CatOS"/>
1623
1648
  <param pos="0" name="os.family" value="CatOS"/>
@@ -1629,6 +1654,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1629
1654
  <fingerprint pattern="^Hardware:(\S+),.*Software:UCOS (\S+)$">
1630
1655
  <description>Cisco UCOS</description>
1631
1656
  <example>Hardware:7845H2, 2 Intel(R) Xeon(R) CPU 5140 @ 2.33GHz, 4096 MB Memory: Software:UCOS 3.0.0.0-54</example>
1657
+ <param pos="0" name="os.certainty" value="0.85"/>
1632
1658
  <param pos="0" name="os.vendor" value="Cisco"/>
1633
1659
  <param pos="0" name="os.family" value="UCOS"/>
1634
1660
  <param pos="0" name="os.device" value="VoIP"/>
@@ -1640,6 +1666,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1640
1666
  <fingerprint pattern="^Cisco (VG2\S+) version (\S+)$">
1641
1667
  <description>Cisco VG200 series analog voice gateway</description>
1642
1668
  <example>Cisco VG248 version 1.3(1)</example>
1669
+ <param pos="0" name="os.certainty" value="0.85"/>
1643
1670
  <param pos="0" name="os.vendor" value="Cisco"/>
1644
1671
  <param pos="0" name="os.family" value="VG200"/>
1645
1672
  <param pos="0" name="os.device" value="VoIP"/>
@@ -1658,6 +1685,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1658
1685
  <example>WLSE 1133 Release 2.13FCS Wed Feb 22 02:00:55 UTC 2006 (C) Copyright 2006 by Cisco Systems Inc.</example>
1659
1686
  <example>WLSE 1133 Release 2.15.2 Thu May 29 12:45:16 UTC 2008 (C) Copyright 2007 by Cisco Systems Inc.</example>
1660
1687
  <example>WLSE 1133 Release 2.15.4 Mon Dec 6 15:19:46 UTC 2010 (C) Copyright 2010 by Cisco Systems Inc.</example>
1688
+ <param pos="0" name="os.certainty" value="0.85"/>
1661
1689
  <param pos="0" name="os.vendor" value="Cisco"/>
1662
1690
  <param pos="0" name="os.family" value="WLSE"/>
1663
1691
  <param pos="0" name="os.device" value="WAP"/>
@@ -1697,16 +1725,18 @@ Copyright (c) 1995-2005 by Cisco Systems
1697
1725
  <example>Cisco NX-OS(tm) n5000, Software (n5000-uk9), Version 4.0(1a)N2(1), RELEASE SOFTWARE (fc2) Copyright (c) 2002-2008 by Cisco Systems, Inc. Device Manager Version 4.1(5P1), Compiled 2/25/2009 0:00:00</example>
1698
1726
  <example>Cisco NX-OS(tm) n7000, Software (n7000-s1-dk9), Version 6.0(1), RELEASE SOFTWARE Copyright (c) 2002-2011 by Cisco Systems, Inc. Compiled 9/25/2011 2:00:00</example>
1699
1727
  <example>Cisco NX-OS(tm) n7000, Software (n7000-s1-dk9), Version 6.0(2), RELEASE SOFTWARE Copyright (c) 2002-2011 by Cisco Systems, Inc. Compiled 11/15/2011 12:00:00</example>
1728
+ <param pos="0" name="os.certainty" value="0.85"/>
1700
1729
  <param pos="0" name="os.vendor" value="Cisco"/>
1701
1730
  <param pos="0" name="os.device" value="Switch"/>
1702
1731
  <param pos="1" name="os.product"/>
1703
- <param pos="2" name="hw.product"/>
1732
+ <param pos="2" name="hw.series"/>
1704
1733
  <param pos="3" name="os.version"/>
1705
1734
  </fingerprint>
1706
1735
 
1707
1736
  <fingerprint pattern="^Cisco Controller$">
1708
1737
  <description>Cisco Controller</description>
1709
1738
  <example>Cisco Controller</example>
1739
+ <param pos="0" name="os.certainty" value="0.85"/>
1710
1740
  <param pos="0" name="os.vendor" value="Cisco"/>
1711
1741
  <param pos="0" name="os.device" value="WAP"/>
1712
1742
  <param pos="0" name="os.product" value="Wireless LAN Controller"/>
@@ -1849,6 +1879,17 @@ Copyright (c) 1995-2005 by Cisco Systems
1849
1879
  <param pos="1" name="os.product"/>
1850
1880
  </fingerprint>
1851
1881
 
1882
+ <fingerprint pattern="^Dell (\d{4}[cd]?n) (?:Laser )?MFP.*$">
1883
+ <description>Dell Laser Printer</description>
1884
+ <example>Dell 2135cn MFP; Net 12.10, Controller 200903191302, Engine 03.00.10</example>
1885
+ <example>Dell 2335dn MFP; 2.70.03.02;Engine 1.10.65;NIC V4.01.30(2335dn MFP) 02-05-2010;S/N JQF9FG1</example>
1886
+ <example>Dell 2355dn Laser MFP; V2.70.45.30 May-20-2013;Engine 1.20.25;NIC V4.01.42(2355dn MFP) 4-23-2013;S/N 3DKCJM1</example>
1887
+ <param pos="0" name="os.vendor" value="Dell"/>
1888
+ <param pos="0" name="os.family" value="Laser Printer"/>
1889
+ <param pos="0" name="os.device" value="Multifunction Device"/>
1890
+ <param pos="1" name="os.product"/>
1891
+ </fingerprint>
1892
+
1852
1893
  <fingerprint pattern="^Dell(?:.*Laser.*)? (\w*\d{4}cn)(?:.*Net |; V)(\S+)(?:,| ).*$">
1853
1894
  <description>Dell Color Laser Printer</description>
1854
1895
  <example>Dell Laser Printer 5100cn (Net 6.26, Controller 200408201123, Engine 01.00.04)</example>
@@ -2410,7 +2451,36 @@ Copyright (c) 1995-2005 by Cisco Systems
2410
2451
  <param pos="0" name="os.device" value="Switch"/>
2411
2452
  <param pos="1" name="os.product"/>
2412
2453
  </fingerprint>
2413
-
2454
+
2455
+ <!--======================================================================
2456
+ FreeBSD
2457
+ =======================================================================-->
2458
+
2459
+ <fingerprint pattern="(^FreeBSD) \S+ ([\d\.]+-(?:STABLE|RELEASE)(?:-p\d+)?).*\s(\w+)$">
2460
+ <description>FreeBSD 10.0</description>
2461
+ <example>FreeBSD freebsd-10-x64-ports-p 10.0-RELEASE-p4 FreeBSD 10.0-RELEASE-p4 #0: Tue Jun 3 13:14:57 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64</example>
2462
+ <example>FreeBSD freebsd-92-x64-snmp 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64</example>
2463
+ <example>FreeBSD freebsd-84-x64-pkgng-p.vuln.lax.rapid7.com 8.4-RELEASE-p11 FreeBSD 8.4-RELEASE-p11 #0: Tue Jun 3 07:47:34 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64</example>
2464
+ <example>FreeBSD freebsd-8-stable-x64-p.vuln.lax.rapid7.com 8.4-STABLE FreeBSD 8.4-STABLE #0 r266809: Wed May 28 16:54:28 EDT 2014 root@freebsd-8-stable-x64-p.vuln.lax.rapid7.com:/usr/obj/usr/src/sys/GENERIC amd64</example>
2465
+ <example>FreeBSD freebsd-64-x64-u.vuln.lax.rapid7.com 6.4-RELEASE FreeBSD 6.4-RELEASE #0: Wed Nov 26 08:21:48 UTC 2008 root@palmer.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64</example>
2466
+ <param pos="0" name="os.certainty" value="0.9"/>
2467
+ <param pos="0" name="os.family" value="Linux"/>
2468
+ <param pos="0" name="os.vendor" value="Linux"/>
2469
+ <param pos="0" name="os.device" value="General"/>
2470
+ <param pos="1" name="os.product"/>
2471
+ <param pos="2" name="os.version"/>
2472
+ <param pos="3" name="os.arch"/>
2473
+ </fingerprint>
2474
+
2475
+ <fingerprint pattern="^FreeBSD">
2476
+ <description>FreeBSD generic</description>
2477
+ <example>FreeBSD freebsd</example>
2478
+ <param pos="0" name="os.certainty" value="0.5"/>
2479
+ <param pos="0" name="os.family" value="Linux"/>
2480
+ <param pos="0" name="os.product" value="Linux"/>
2481
+ <param pos="0" name="os.device" value="General"/>
2482
+ </fingerprint>
2483
+
2414
2484
  <!--======================================================================
2415
2485
  FUJI XEROX
2416
2486
  =======================================================================-->
@@ -2449,6 +2519,35 @@ Copyright (c) 1995-2005 by Cisco Systems
2449
2519
  <param pos="1" name="os.product"/>
2450
2520
  </fingerprint>
2451
2521
 
2522
+ <!--======================================================================
2523
+ Gigamon
2524
+ =======================================================================-->
2525
+
2526
+ <fingerprint pattern="^Linux (\S+) .*GigaVUE-H-Series ([\d\.]+) .* (\S+)$">
2527
+ <description>Garrett DynaStar Industrial Router</description>
2528
+ <example>Linux giga1-hd1-wax 2.6.34-GIGAMONuni-gvhd GigaVUE-H-Series 3.0.06 #1681 2013-11-06 07:42:52 ppc</example>
2529
+ <example>Linux GigaVUE-HB1-2 2.6.34-GIGAMONuni-gvhb1 GigaVUE-H-Series 3.0.02 #13 2013-08-22 09:58:43 ppc</example>
2530
+ <param pos="0" name="os.vendor" value="Gigamon"/>
2531
+ <param pos="0" name="os.device" value="Monitoring"/>
2532
+ <param pos="0" name="os.product" value="GigaVUE HD"/>
2533
+ <param pos="0" name="os.family" value="GigaVUE HD"/>
2534
+ <param pos="2" name="os.version"/>
2535
+ <param pos="3" name="os.arch"/>
2536
+ <param pos="1" name="host.name"/>
2537
+ </fingerprint>
2538
+
2539
+ <fingerprint pattern="^Linux (\S+) .*GigaVUE-TA1 ([\d\.]+) .* (\S+)$">
2540
+ <description>Gigamon GigaVue TA</description>
2541
+ <example>Linux GigaVUE-TA1 2.6.34-GIGAMONsmp-gvag GigaVUE-TA1 2.5.02 #5 2013-03-15 18:08:44 SMP ppc</example>
2542
+ <param pos="0" name="os.vendor" value="Gigamon"/>
2543
+ <param pos="0" name="os.device" value="Monitoring"/>
2544
+ <param pos="0" name="os.product" value="GigaVUE TA1"/>
2545
+ <param pos="0" name="os.family" value="GigaVUE TA"/>
2546
+ <param pos="2" name="os.version"/>
2547
+ <param pos="3" name="os.arch"/>
2548
+ <param pos="1" name="host.name"/>
2549
+ </fingerprint>
2550
+
2452
2551
  <!--======================================================================
2453
2552
  HP / Compaq
2454
2553
  =======================================================================-->
@@ -2725,7 +2824,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2725
2824
  </fingerprint>
2726
2825
 
2727
2826
  <fingerprint pattern="^ProCurve (\S+) (.*?) Switch, revision ([^,]+),.*$">
2728
- <description>HP ProCurve Switch</description>
2827
+ <description>HP ProCurve Switch</description>
2729
2828
  <example>ProCurve J9145A 2910al-24G Switch, revision W.14.03, ROM W.14.04 (/sw/code/build/sbm(t4a_RC3))</example>
2730
2829
  <example>ProCurve J9145A 2910al-24G Switch, revision W.14.30, ROM W.14.04 (/sw/code/build/sbm(t4a))</example>
2731
2830
  <example>ProCurve J9145A 2910al-24G Switch, revision W.14.38, ROM W.14.04 (/sw/code/build/sbm(t4a))</example>
@@ -2756,7 +2855,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2756
2855
  </fingerprint>
2757
2856
 
2758
2857
  <fingerprint pattern="^ProCurve (\S+) Switch ([^,]+), revision ([^,]+),.*$">
2759
- <description>HP Switch</description>
2858
+ <description>HP Switch</description>
2760
2859
  <example>ProCurve j9020a Switch 2510-48, revision U.11.04, ROM R.10.06 (/sw/code/build/dosx(ndx))</example>
2761
2860
  <example>ProCurve j9020a Switch 2510-48, revision U.11.08, ROM R.10.06 (/sw/code/build/dosx(ndx))</example>
2762
2861
  <example>ProCurve j9020a Switch 2510-48, revision U.11.11, ROM R.10.06 (/sw/code/build/dosx(ndx))</example>
@@ -2769,7 +2868,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2769
2868
  </fingerprint>
2770
2869
 
2771
2870
  <fingerprint pattern="^HP(\S+) HP ProCurve Switch ([^,]+), revision ([^,]+),.*$">
2772
- <description>HP ProCurve Switch</description>
2871
+ <description>HP ProCurve Switch</description>
2773
2872
  <example>HPJ3298A HP ProCurve Switch 212M, revision D.05.04, ROM D.05.01 (/sw/code/build/srao(f98))</example>
2774
2873
  <example>HPJ4121A HP ProCurve Switch 4000M, revision C.05.04, ROM C.05.02 (/sw/code/build/vgro(f98))</example>
2775
2874
  <example>HPJ4122A HP ProCurve Switch 2400M, revision C.05.04, ROM C.05.02 (/sw/code/build/vgro(f98))</example>
@@ -2781,7 +2880,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2781
2880
  </fingerprint>
2782
2881
 
2783
2882
  <fingerprint pattern="^HP (\S+) (\S+) Switch, revision ([^,]+),.*$">
2784
- <description>HP Switch</description>
2883
+ <description>HP Switch</description>
2785
2884
  <example>HP J9145A E2910al-24G Switch, revision W.15.08.0007, ROM W.14.06 (/ws/swbuildm/rel_galt_qaoff/code/build/sbm(rel_galt_qaoff)) (Formerly ProCurve)</example>
2786
2885
  <example>HP J9623A E2620-24 Switch, revision RA.15.05.0006, ROM RA.15.10 (/sw/code/build/xform(RA_15_05)) (Formerly ProCurve)</example>
2787
2886
  <example>HP J9625A E2620-24-PoEP Switch, revision RA.15.05.0006, ROM RA.15.10 (/sw/code/build/xform(RA_15_05)) (Formerly ProCurve)</example>
@@ -2794,7 +2893,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2794
2893
  </fingerprint>
2795
2894
 
2796
2895
  <fingerprint pattern="^HP (\S+) Switch ([^,]+), revision ([^,]+),.*$">
2797
- <description>HP Switch</description>
2896
+ <description>HP Switch</description>
2798
2897
  <example>HP J8692A Switch E3500yl-24G, revision K.15.05.0002, ROM K.15.13 (/sw/code/build/btm(K_15_05)) (Formerly ProCurve)</example>
2799
2898
  <example>HP J8697A Switch E5406zl, revision K.15.06.0006, ROM K.15.19 (/sw/code/build/btm(K_15_06)) (Formerly ProCurve)</example>
2800
2899
  <example>HP J8698A Switch E5412zl, revision K.15.06.0016, ROM K.15.28 (/ws/swbuildm/ec_rel_eureka_qaoff/code/build/btm(ec_rel_eureka_qaoff)) (Formerly ProCurve)</example>
@@ -2812,7 +2911,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2812
2911
  </fingerprint>
2813
2912
 
2814
2913
  <fingerprint pattern="^HP(\S+) ProCurve \S+ Hub \d+M+, ROM ([^,]+),.*$">
2815
- <description>HP ProCurve Hub</description>
2914
+ <description>HP ProCurve Hub</description>
2816
2915
  <example>HPJ3288A ProCurve 10/100 Hub 12M, ROM A.01.00, EEPROM A.01.00, HW A.02.00</example>
2817
2916
  <example>HPJ3289A ProCurve 10/100 Hub 24M, ROM A.01.00, EEPROM A.01.00, HW A.02.00</example>
2818
2917
  <param pos="0" name="os.family" value="ProCurve"/>
@@ -2822,7 +2921,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2822
2921
  </fingerprint>
2823
2922
 
2824
2923
  <fingerprint pattern="^PROCURVE (\S+) - (\S+)$">
2825
- <description>HP ProCurve Switch</description>
2924
+ <description>HP ProCurve Switch</description>
2826
2925
  <example>PROCURVE J9028A - PB.02.01</example>
2827
2926
  <example>PROCURVE J9028A - PB.02.03</example>
2828
2927
  <example>PROCURVE J9028A - PB.03.02</example>
@@ -2842,7 +2941,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2842
2941
  <example>HP ProCurve Access Point 420: v2.1.5 v3.0.6</example>
2843
2942
  <example>HP Procurve Access Point 420: v2.0.38 v1.1.8 SN:TW517QB0VM</example>
2844
2943
  <example>HP Procurve Access Point 420: v2.0.38 v1.1.8 SN:TW525QB1T8</example>
2845
- <example>HP Procurve Access Point 420: v2.0.39 v1.1.8 SN:TW439QB0JJ</example>
2944
+ <example>HP Procurve Access Point 420: v2.0.39 v1.1.8 SN:TW439QB0JJ</example>
2846
2945
  <param pos="0" name="os.vendor" value="HP"/>
2847
2946
  <param pos="0" name="os.family" value="ProCurve"/>
2848
2947
  <param pos="0" name="os.device" value="WAP"/>
@@ -3056,6 +3155,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3056
3155
  </fingerprint>
3057
3156
 
3058
3157
  <fingerprint pattern = "^PC BL Enclosure Integrated Administrator$">
3158
+ <description>PC BL Enclosure</description>
3059
3159
  <example>PC BL Enclosure Integrated Administrator</example>
3060
3160
  <param pos="0" name="os.vendor" value="HP"/>
3061
3161
  <param pos="0" name="os.family" value="ProLiant"/>
@@ -3066,6 +3166,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3066
3166
  </fingerprint>
3067
3167
 
3068
3168
  <fingerprint pattern = "^HP PC Blade Switch$">
3169
+ <description>HP PC Blade Switch</description>
3069
3170
  <example>HP PC Blade Switch</example>
3070
3171
  <param pos="0" name="os.vendor" value="HP"/>
3071
3172
  <param pos="0" name="os.product" value="Blade System"/>
@@ -3271,7 +3372,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3271
3372
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0044B47A4C00 Base Operating System Runtime AIX version: 04.02.0001.0000 TCP/IP Client Support version: 04.02.0001.0000</example>
3272
3373
  <example>IBM PowerPC Personal Computer.Machine Type: 0x0807004c Processor id: 003003334C00.Base Operating System Runtime AIX version: 04.02.0001.0000.TCP/IP Client Support version: 04.02.0001.0000</example>
3273
3374
  <example>Motorola PowerPC Personal Computer Machine Type: 0x080000e1 Processor id: 00264E54E100 Base Operating System Runtime AIX version: 04.02.0001.0000 TCP/IP Client Support version: 04.02.0001.0000</example>
3274
- <example>Motorola PowerPC Personal Computer Machine Type: 0x080000e2 Processor id: 0034D907E200 Base Operating System Runtime AIX version: 04.02.0001.0000 TCP/IP Client Support version: 04.02.0001.0000</example>
3375
+ <example>Motorola PowerPC Personal Computer Machine Type: 0x080000e2 Processor id: 0034D907E200 Base Operating System Runtime AIX version: 04.02.0001.0000 TCP/IP Client Support version: 04.02.0001.0000</example>
3275
3376
  <param pos="0" name="os.vendor" value="IBM"/>
3276
3377
  <param pos="0" name="os.product" value="AIX"/>
3277
3378
  <param pos="0" name="os.device" value="General"/>
@@ -3311,7 +3412,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3311
3412
  <example>IBM PowerPC CHRP Computer Machine Type: n 7040-681*SN-n 83859AA Serial Number: n 83859AA Base Operating System Runtime AIX version: 05.01.0000.0035 TCP/IP Client Support version: 05.01.0000.0035</example>
3312
3413
  <example>IBM PowerPC CHRP Computer Machine Type: n 7044-270*SN-n 10A252F Serial Number: n 10A252F Base Operating System Runtime AIX version: 05.01.0000.0025 TCP/IP Client Support version: 05.01.0000.0025</example>
3313
3414
  <example>IBM PowerPC CHRP Computer Tipo de M.quina: 0x0800004c Id de Procesador: 000025534C00 Base Operating System Runtime AIX versi.n: 05.01.0000.0000 TCP/IP Client Support versi.n: 05.01.0000.0000</example>
3314
- <example>Ordinateur CHRP PowerPC IBM Type de machine : 0x0800004c ID processeur : 005DA8CA4C00 Base Operating System Runtime AIX version : 05.01.0000.0051 TCP/IP Client Support version : 05.01.0000.0062</example>
3415
+ <example>Ordinateur CHRP PowerPC IBM Type de machine : 0x0800004c ID processeur : 005DA8CA4C00 Base Operating System Runtime AIX version : 05.01.0000.0051 TCP/IP Client Support version : 05.01.0000.0062</example>
3315
3416
  <param pos="0" name="os.vendor" value="IBM"/>
3316
3417
  <param pos="0" name="os.product" value="AIX"/>
3317
3418
  <param pos="0" name="os.device" value="General"/>
@@ -3485,7 +3586,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3485
3586
  <param pos="0" name="os.version" value="7.1"/>
3486
3587
  <param pos="0" name="os.certainty" value="0.9"/>
3487
3588
  </fingerprint>
3488
-
3589
+
3489
3590
 
3490
3591
 
3491
3592
 
@@ -3552,6 +3653,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3552
3653
  =======================================================================-->
3553
3654
 
3554
3655
  <fingerprint pattern="^NetportExpress\(TM\) PRO/100 3-port Print Server$">
3656
+ <description>NetportExpress Print Server</description>
3555
3657
  <param pos="0" name="os.vendor" value="Intel"/>
3556
3658
  <param pos="0" name="os.family" value="NetportExpress"/>
3557
3659
  <param pos="0" name="os.product" value="PRO/100"/>
@@ -4017,8 +4119,10 @@ Copyright (c) 1995-2005 by Cisco Systems
4017
4119
  <example>Juniper Networks, Inc. srx650 internet router, kernel JUNOS 12.1R2.9 #0: 2012-05-31 08:58:52 UTC builder@greteth:/volume/build/junos/12.1/release/12.1R2.9/obj-octeon/junos/bsd/kernels/JSRXNLE/kernel Build date: 2012-05-31 11:07:04 UTC Copyright (c) 1</example>
4018
4120
  <example>Juniper Networks, Inc. t640 internet router, kernel JUNOS 9.2R4.4 #0: 2009-05-27 07:54:10 UTC builder@amalath.juniper.net:/volume/build/junos/9.2/release/9.2R4.4/obj-i386/sys/compile/JUNIPER Build date: 2009-05-27 08:11:51 UTC Copyright (c) 1996-2009</example>
4019
4121
  <param pos="0" name="os.vendor" value="Juniper"/>
4122
+ <param pos="0" name="os.family" value="Junos"/>
4020
4123
  <param pos="0" name="os.device" value="Router"/>
4021
- <param pos="1" name="os.product"/>
4124
+ <param pos="0" name="os.product" value="Junos OS"/>
4125
+ <param pos="1" name="hw.model"/>
4022
4126
  <param pos="2" name="os.version"/>
4023
4127
  </fingerprint>
4024
4128
 
@@ -4165,7 +4269,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4165
4269
  <example>Lantronix EPS4-100 Version B3.7/109(030909)</example>
4166
4270
  <example>Lantronix EPS4-100 Version V3.5/7(981112)</example>
4167
4271
  <example>Lantronix EPS4-100 Version V3.6/4(000712)</example>
4168
- <example>Lantronix EPS4-100 Version V3.7/1(031017)</example>
4272
+ <example>Lantronix EPS4-100 Version V3.7/1(031017)</example>
4169
4273
  <param pos="0" name="os.vendor" value="Lantronix"/>
4170
4274
  <param pos="0" name="os.device" value="Printer"/>
4171
4275
  <param pos="2" name="os.version"/>
@@ -4390,7 +4494,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4390
4494
  <param pos="1" name="os.product"/>
4391
4495
  <param pos="2" name="os.family"/>
4392
4496
  <param pos="3" name="os.version"/>
4393
- </fingerprint>
4497
+ </fingerprint>
4394
4498
 
4395
4499
  <fingerprint pattern="^Lantronix ((NTS)\S*) V(\S+)$">
4396
4500
  <description>Lantronix NTS</description>
@@ -4443,7 +4547,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4443
4547
  <example>MarkNet Pro 1 Version 2.10.196 Ethernet Combo.</example>
4444
4548
  <example>MarkNet X2011e Version 4.20.21 Ethernet 10/100.</example>
4445
4549
  <example>Lexmark MarkNet XLe 202 Version 4.117.1 Ethernet.</example>
4446
- <example>Lexmark MarkNet XLe 202 Version 4.133.1 Ethernet.</example>
4550
+ <example>Lexmark MarkNet XLe 202 Version 4.133.1 Ethernet.</example>
4447
4551
  <param pos="0" name="os.certainty" value="1.0"/>
4448
4552
  <param pos="0" name="os.vendor" value="Lexmark"/>
4449
4553
  <param pos="0" name="os.family" value="MarkNet"/>
@@ -4459,7 +4563,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4459
4563
  <example>Lexmark Optra K 1220 Version 3.11.17 Ethernet 10/100.</example>
4460
4564
  <example>Lexmark Optra N Laser Printer Version 79.133.1 Ethernet.</example>
4461
4565
  <example>Lexmark Optra SC 1275 Version 1.10.10 Ethernet 10/100.</example>
4462
- <example>Lexmark Optra SC 1275 Version 1.10.196 Ethernet 10/100.</example>
4566
+ <example>Lexmark Optra SC 1275 Version 1.10.196 Ethernet 10/100.</example>
4463
4567
  <param pos="0" name="os.certainty" value="1.0"/>
4464
4568
  <param pos="0" name="os.vendor" value="Lexmark"/>
4465
4569
  <param pos="0" name="os.family" value="Optra"/>
@@ -4480,7 +4584,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4480
4584
  <example>Lexmark Forms Printer 2590 version LCL.CU.P105 kernel 2.6.10 All-N-1</example>
4481
4585
  <example>Lexmark Forms Printer 2591 version LCL.CU.P103 kernel 2.6.10 All-N-1</example>
4482
4586
  <example>Lexmark Forms Printer 4227 plus version LC.CO.N061 kernel 2.6.10 All-N-1</example>
4483
- <example>Lexmark Forms Printer 4227 plus version LC.CO.N061 kernel 2.6.10 All-N-1</example>
4587
+ <example>Lexmark Forms Printer 4227 plus version LC.CO.N061 kernel 2.6.10 All-N-1</example>
4484
4588
  <param pos="0" name="os.certainty" value="1.0"/>
4485
4589
  <param pos="0" name="os.vendor" value="Lexmark"/>
4486
4590
  <param pos="0" name="os.family" value="Forms Printer"/>
@@ -4511,7 +4615,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4511
4615
  <example>Lexmark S510 Series version FHN.EA3.P0.110904t1 kernel 2.6.28.10.1 All-N-1</example>
4512
4616
  <example>Lexmark S510 Series version FHN.EA3.P1.111006g kernel 2.6.28.10.1 All-N-1</example>
4513
4617
  <example>Lexmark S510 Series version FHN.EA3.P1.111006g2 kernel 2.6.28.10.1 All-N-1</example>
4514
- <example>Lexmark S510 Series version FHN.EA3.P1.111006z kernel 2.6.28.10.1 All-N-1</example>
4618
+ <example>Lexmark S510 Series version FHN.EA3.P1.111006z kernel 2.6.28.10.1 All-N-1</example>
4515
4619
  <param pos="0" name="os.certainty" value="1.0"/>
4516
4620
  <param pos="0" name="os.vendor" value="Lexmark"/>
4517
4621
  <param pos="0" name="os.device" value="Printer"/>
@@ -4707,6 +4811,17 @@ Copyright (c) 1995-2005 by Cisco Systems
4707
4811
  <param pos="3" name="os.arch"/>
4708
4812
  </fingerprint>
4709
4813
 
4814
+ <fingerprint pattern="^CentOS release ([\d.]*) .*$">
4815
+ <description>CentOS Linux</description>
4816
+ <example>CentOS release 4.9 (Final)</example>
4817
+ <param pos="0" name="os.certainty" value="0.9"/>
4818
+ <param pos="0" name="os.family" value="Linux"/>
4819
+ <param pos="0" name="os.vendor" value="CentOS"/>
4820
+ <param pos="0" name="os.product" value="Linux"/>
4821
+ <param pos="0" name="os.device" value="General"/>
4822
+ <param pos="1" name="os.version"/>
4823
+ </fingerprint>
4824
+
4710
4825
  <fingerprint pattern="^Linux (\S+) (2\.6\.9-55[\d.]*EL(?:smp)?) .* (\S+)$">
4711
4826
  <description>CentOS Linux 4.5</description>
4712
4827
  <example>Linux hostname 2.6.9-55.0.9.ELsmp #1 SMP Thu Sep 27 18:27:41 EDT 2007 i686</example>
@@ -5142,6 +5257,30 @@ Copyright (c) 1995-2005 by Cisco Systems
5142
5257
  <param pos="0" name="os.device" value="General"/>
5143
5258
  <param pos="0" name="os.arch" value="x86"/>
5144
5259
  </fingerprint>
5260
+
5261
+ <fingerprint pattern="Windows\s\S+\s(6\.2\.\d+)\s+Server\s[\d\.]+\s(\w+).*">
5262
+ <description>Windows Server 2012</description>
5263
+ <example>Windows w12-srv-snmp 6.2.9200 Server 4.0 Intel64 Family 6 Model 26 Stepping 4</example>
5264
+ <param pos="0" name="os.vendor" value="Microsoft"></param>
5265
+ <param pos="0" name="os.family" value="Windows"></param>
5266
+ <param pos="1" name="os.version"/>
5267
+ <param pos="0" name="os.product" value="Windows Server 2012"/>
5268
+ <param pos="0" name="os.device" value="General"/>
5269
+ <param pos="2" name="os.arch"/>
5270
+ </fingerprint>
5271
+
5272
+ <!--======================================================================
5273
+ MRV Communications
5274
+ =======================================================================-->
5275
+
5276
+ <fingerprint pattern="^LX Console Manager, s/w version=(\S+)$">
5277
+ <description>MRV LX console servers</description>
5278
+ <example>LX Console Manager, s/w version=5.3.9</example>
5279
+ <param pos="0" name="os.vendor" value="MRV Communications"/>
5280
+ <param pos="0" name="os.product" value="LX"/>
5281
+ <param pos="0" name="os.device" value="Remote access server"/>
5282
+ <param pos="1" name="os.version"/>
5283
+ </fingerprint>
5145
5284
 
5146
5285
  <!--======================================================================
5147
5286
  MULTITECH
@@ -6227,7 +6366,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6227
6366
  <param pos="0" name="os.device" value="PDU"/>
6228
6367
  <param pos="1" name="os.product"/>
6229
6368
  <param pos="2" name="os.version"/>
6230
- </fingerprint>
6369
+ </fingerprint>
6231
6370
 
6232
6371
  <!--======================================================================
6233
6372
  RedBack Networks
@@ -6497,6 +6636,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6497
6636
 
6498
6637
 
6499
6638
  <fingerprint pattern="^Gestetner (\S+) (\S+) / Gestetner Network Printer.*$">
6639
+ <description>Gestetner Network Printer</description>
6500
6640
  <example>Gestetner C7640nD 1.01 / Gestetner Network Printer C model</example>
6501
6641
  <param pos="0" name="os.vendor" value="Ricoh"/> <!-- owned by Ricoh now -->
6502
6642
  <param pos="0" name="os.device" value="Printer"/>