recog 2.3.0 → 2.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/lib/recog/version.rb +1 -1
  3. data/spec/lib/fingerprint_self_test_spec.rb +17 -0
  4. data/xml/apache_os.xml +4 -4
  5. data/xml/ftp_banners.xml +37 -46
  6. data/xml/h323_callresp.xml +1 -1
  7. data/xml/http_cookies.xml +26 -58
  8. data/xml/http_servers.xml +65 -95
  9. data/xml/http_wwwauth.xml +6 -6
  10. data/xml/imap_banners.xml +12 -5
  11. data/xml/ldap_searchresult.xml +2 -2
  12. data/xml/mysql_banners.xml +3 -3
  13. data/xml/mysql_error.xml +0 -1
  14. data/xml/ntp_banners.xml +2 -2
  15. data/xml/operating_system.xml +0 -1
  16. data/xml/pop_banners.xml +5 -6
  17. data/xml/smb_native_os.xml +4 -4
  18. data/xml/smtp_banners.xml +13 -19
  19. data/xml/smtp_debug.xml +5 -13
  20. data/xml/smtp_ehlo.xml +2 -7
  21. data/xml/smtp_expn.xml +12 -24
  22. data/xml/smtp_help.xml +22 -62
  23. data/xml/smtp_noop.xml +5 -9
  24. data/xml/smtp_quit.xml +3 -7
  25. data/xml/smtp_rcptto.xml +3 -7
  26. data/xml/smtp_vrfy.xml +16 -35
  27. data/xml/snmp_sysdescr.xml +258 -278
  28. data/xml/snmp_sysobjid.xml +3 -3
  29. data/xml/ssh_banners.xml +8 -11
  30. data/xml/x509_subjects.xml +14 -17
  31. metadata +3 -3
data/xml/http_servers.xml CHANGED
@@ -260,9 +260,8 @@
260
260
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
261
261
  </fingerprint>
262
262
  <fingerprint pattern="^Microsoft-WinCE/(\d\.\d+)$">
263
- <description>Windows CE embedded devices, including HP iPAQ,
264
- Palm Treo, Motorola phones, and many more</description>
265
- <example>Microsoft-WinCE/4.10</example>
263
+ <description>Windows CE embedded devices, including HP iPAQ, Palm Treo, Motorola phones, and many more</description>
264
+ <example os.version="4.10">Microsoft-WinCE/4.10</example>
266
265
  <example>Microsoft-WinCE/4.20</example>
267
266
  <example>Microsoft-WinCE/5.0</example>
268
267
  <param pos="0" name="service.vendor" value="Microsoft"/>
@@ -311,8 +310,7 @@
311
310
  <param pos="1" name="service.version"/>
312
311
  </fingerprint>
313
312
  <fingerprint pattern="^Apache[ -]Coyote/(\d\.\d)$">
314
- <description>HTTP connector for Apache Tomcat to run as a standalone
315
- HTTP server</description>
313
+ <description>HTTP connector for Apache Tomcat to run as a standalone HTTP server - Coyote variant</description>
316
314
  <example>Apache-Coyote/1.1</example>
317
315
  <example>Apache Coyote/1.0</example>
318
316
  <param pos="0" name="service.vendor" value="Apache"/>
@@ -333,7 +331,7 @@
333
331
  <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:-"/>
334
332
  </fingerprint>
335
333
  <fingerprint pattern="^Servlet [\d\.]+; JBoss-(\S+) \(build: .*\)/Tomcat-(\S+)$">
336
- <description>JBoss with embedded tomcat</description>
334
+ <description>JBoss with embedded Tomcat</description>
337
335
  <example service.version="4.0.4.GA" service.component.version="5.5">Servlet 2.4; JBoss-4.0.4.GA (build: CVSTag=JBoss_4_0_4_GA date=200605151000)/Tomcat-5.5</example>
338
336
  <param pos="0" name="service.vendor" value="Red Hat"/>
339
337
  <param pos="0" name="service.product" value="JBoss EAP"/>
@@ -346,7 +344,7 @@
346
344
  <param pos="0" name="service.component.cpe23" value="cpe:/a:apache:tomcat:{service.component.version}"/>
347
345
  </fingerprint>
348
346
  <fingerprint pattern="^Servlet [\d\.]+; Tomcat-(\S+)/JBoss-(\S+) \(build: .*\)$">
349
- <description>JBoss with embedded tomcat</description>
347
+ <description>JBoss with embedded Tomcat - Tomcat build variant</description>
350
348
  <example service.version="4.0.1sp1" service.component.version="5.0.28">Servlet 2.4; Tomcat-5.0.28/JBoss-4.0.1sp1 (build: CVSTag=JBoss_4_0_1_SP1 date=200502160314)</example>
351
349
  <param pos="0" name="service.vendor" value="Red Hat"/>
352
350
  <param pos="0" name="service.product" value="JBoss EAP"/>
@@ -388,11 +386,10 @@
388
386
  <param pos="0" name="service.cpe23" value="cpe:/a:redhat:jboss_enterprise_application_platform:{service.version}"/>
389
387
  </fingerprint>
390
388
  <fingerprint pattern="^Apache Tomcat/(\d\.[\d.]+)(?:-LE-jdk14)? \(HTTP/1.1 Connector\)$">
391
- <description>HTTP connector for Apache Tomcat to run as a standalone
392
- HTTP server</description>
393
- <example>Apache Tomcat/4.0.6 (HTTP/1.1 Connector)</example>
394
- <example>Apache Tomcat/4.1.12 (HTTP/1.1 Connector)</example>
395
- <example>Apache Tomcat/4.1.27-LE-jdk14 (HTTP/1.1 Connector)</example>
389
+ <description>HTTP connector for Apache Tomcat to run as a standalone HTTP server - Apache variant</description>
390
+ <example service.version="4.0.6">Apache Tomcat/4.0.6 (HTTP/1.1 Connector)</example>
391
+ <example service.version="4.1.12">Apache Tomcat/4.1.12 (HTTP/1.1 Connector)</example>
392
+ <example service.version="4.1.27">Apache Tomcat/4.1.27-LE-jdk14 (HTTP/1.1 Connector)</example>
396
393
  <param pos="0" name="service.vendor" value="Apache"/>
397
394
  <param pos="0" name="service.family" value="Tomcat"/>
398
395
  <param pos="0" name="service.product" value="Tomcat"/>
@@ -403,8 +400,7 @@
403
400
  <param pos="0" name="service.component.product" value="Apache Tomcat HTTP Connector"/>
404
401
  </fingerprint>
405
402
  <fingerprint pattern="^Tomcat Web Server/(\d\.[\dA-Z.]+)(?: Final)?(?:\s\(([^\)]+)\))?$">
406
- <description>HTTP connector for Apache Tomcat to run as a standalone
407
- HTTP server</description>
403
+ <description>HTTP connector for Apache Tomcat to run as a standalone HTTP server</description>
408
404
  <example>Tomcat Web Server/3.2.2 (JSP 1.1; Servlet 2.2; Java 1.3.1; Windows 2000 5.0 x86; java.vendor=Sun Microsystems Inc.)</example>
409
405
  <example>Tomcat Web Server/3.2.2 (JSP 1.1; Servlet 2.2; Java 1.4.2_13; Windows 2003 5.2 x86; java.vendor=Sun Microsystems Inc.)</example>
410
406
  <example>Tomcat Web Server/3.1M1 (JSP 1.1; Servlet 2.2; Java 1.3.1; AIX 5.3 ppc; java.vendor=IBM Corporation)</example>
@@ -503,7 +499,7 @@
503
499
  <param pos="1" name="apache.variant.version"/>
504
500
  </fingerprint>
505
501
  <fingerprint pattern="^Oracle HTTP Server Powered by Apache/([12][\d.]*)\s*(.*)$">
506
- <description>Oracle HTTP Server (powered by Apache)</description>
502
+ <description>Oracle HTTP Server (powered by Apache) - version string variant</description>
507
503
  <example>Oracle HTTP Server Powered by Apache/1.3.12 (Unix) ApacheJServ/1.1 mod_ssl/2.6.4 OpenSSL/0.9.5a</example>
508
504
  <example>Oracle HTTP Server Powered by Apache/1.3.19 (Unix) mod_plsql/3.0.9.8.3b PHP/4.3.10 mod_fastcgi/2.2.10 mod_perl/1.25 mod_oprocmgr/1.0</example>
509
505
  <example>Oracle HTTP Server Powered by Apache/1.3.19 (Win32) mod_ssl/2.8.1 OpenSSL/0.9.5a mod_fastcgi/2.2.10 mod_oprocmgr/1.0 mod_perl/1.25</example>
@@ -780,7 +776,7 @@
780
776
  <param pos="0" name="hw.device" value="Router"/>
781
777
  </fingerprint>
782
778
  <fingerprint pattern="^Helix Server Version ([0-9.]*) \(win32\) \(RealServer compatible\)$">
783
- <description>RealMedia Helix Server</description>
779
+ <description>RealMedia Helix Server - Windows</description>
784
780
  <example>Helix Server Version 9.0.4.960 (win32) (RealServer compatible)</example>
785
781
  <param pos="0" name="os.vendor" value="Microsoft"/>
786
782
  <param pos="0" name="os.family" value="Windows"/>
@@ -792,7 +788,7 @@
792
788
  <param pos="1" name="service.version"/>
793
789
  </fingerprint>
794
790
  <fingerprint pattern="^Helix Server Version ([0-9.]*) \(linux-\S+\) \(RealServer compatible\)$">
795
- <description>RealMedia Helix Server</description>
791
+ <description>RealMedia Helix Server - Linux</description>
796
792
  <example>Helix Server Version 9.0.4.960 (linux-2.2-libc6-i586-server) (RealServer compatible)</example>
797
793
  <param pos="0" name="os.family" value="Linux"/>
798
794
  <param pos="0" name="os.product" value="Linux"/>
@@ -959,8 +955,7 @@
959
955
  Netscape/Sun's Application Server
960
956
  -->
961
957
  <fingerprint pattern="^Sun[ -]Java[ -]System[ /]Application[ -]Server( \d\.[\d_]+)?$">
962
- <description>Sun Java System Application Server (formerly iPlanet Application Server,
963
- Sun ONE Application Server)</description>
958
+ <description>Sun Java System Application Server (formerly iPlanet Application Server, Sun ONE Application Server)</description>
964
959
  <example>Sun-Java-System/Application-Server</example>
965
960
  <param pos="0" name="service.vendor" value="Sun"/>
966
961
  <param pos="0" name="service.family" value="Java System Application Server"/>
@@ -968,11 +963,10 @@
968
963
  <param pos="1" name="service.version"/>
969
964
  <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_application_server:{service.version}"/>
970
965
  </fingerprint>
971
- <fingerprint pattern="^Sun[ -]Java[ -]System[ /]Application[ -]Server Platform Edition( \d\.[\d_]+)?$">
972
- <description>Sun Java System Application Server (formerly iPlanet Application Server,
973
- Sun ONE Application Server)</description>
966
+ <fingerprint pattern="^Sun[ -]Java[ -]System[ /]Application[ -]Server Platform Edition (\d\.[\d_]+)?$">
967
+ <description>Sun Java System Application Server Platform Edition(formerly iPlanet Application Server, Sun ONE Application Server)</description>
974
968
  <example>Sun Java System Application Server Platform Edition 9.0</example>
975
- <example>Sun Java System Application Server Platform Edition 9.0_01</example>
969
+ <example service.version="9.0_01">Sun Java System Application Server Platform Edition 9.0_01</example>
976
970
  <param pos="0" name="service.vendor" value="Sun"/>
977
971
  <param pos="0" name="service.family" value="Java System Application Server"/>
978
972
  <param pos="0" name="service.product" value="Java System Application Server Platform Edition"/>
@@ -995,8 +989,7 @@
995
989
  Netscape/Sun's Web Server
996
990
  -->
997
991
  <fingerprint pattern="^Netscape-Enterprise/(\d+\.[\w\s.]+)$">
998
- <description>Netscape Enterprise Server (subsequently iPlanet Web Server,
999
- Sun ONE Web Server, presently Sun Java System Web Server)</description>
992
+ <description>Netscape Enterprise Server (subsequently iPlanet Web Server, Sun ONE Web Server, presently Sun Java System Web Server)</description>
1000
993
  <example>Netscape-Enterprise/3.5.1</example>
1001
994
  <example>Netscape-Enterprise/3.6 SP3</example>
1002
995
  <example>Netscape-Enterprise/6.0</example>
@@ -1007,8 +1000,7 @@
1007
1000
  <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_server:{service.version}"/>
1008
1001
  </fingerprint>
1009
1002
  <fingerprint pattern="^(?:Sun-Java-System-Web-Server|Sun-ONE-Web-Server)/(?:\d\.[\d_]+)$">
1010
- <description>Sun Java System Web Server (formerly Netscape Enterprise Server, iPlanet Web
1011
- Server and Sun ONE Web Server)</description>
1003
+ <description>Sun Java System Web Server (formerly Netscape Enterprise Server, iPlanet Web Server and Sun ONE Web Server)</description>
1012
1004
  <example>Sun-Java-System-Web-Server/7.0</example>
1013
1005
  <example>Sun-ONE-Web-Server/6.1</example>
1014
1006
  <param pos="0" name="service.vendor" value="Sun"/>
@@ -1030,10 +1022,9 @@
1030
1022
  there seems to be no relation between 3.54 and "3.6 Service Pack 4".
1031
1023
  -->
1032
1024
  <fingerprint pattern="^iPlanet-Web-Proxy-Server/(.*)$">
1033
- <description>iPlanet WebProxy Server (subsequently Sun ONE WebProxy Server,
1034
- presently Sun Java System Web Proxy Server)</description>
1025
+ <description>iPlanet WebProxy Server (subsequently Sun ONE WebProxy Server, presently Sun Java System Web Proxy Server)</description>
1035
1026
  <example>iPlanet-Web-Proxy-Server/3.6</example>
1036
- <example>iPlanet-Web-Proxy-Server/3.6-SP5</example>
1027
+ <example service.version="3.6-SP5">iPlanet-Web-Proxy-Server/3.6-SP5</example>
1037
1028
  <param pos="0" name="service.vendor" value="Sun"/>
1038
1029
  <param pos="0" name="service.family" value="Java System Web Proxy Server"/>
1039
1030
  <param pos="0" name="service.product" value="Java System Web Proxy Server"/>
@@ -1041,37 +1032,26 @@
1041
1032
  <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_proxy_server:{service.version}"/>
1042
1033
  </fingerprint>
1043
1034
  <fingerprint pattern="^Sun-ONE-Web-Proxy-Server/(.*)$">
1044
- <description>Sun ONE WebProxy Server (formerly iPlanet WebProxy Server,
1045
- presently Sun Java System Web Proxy Server)</description>
1046
- <example>Sun-ONE-Web-Proxy-Server/3.6-SP4</example>
1035
+ <description>Sun ONE WebProxy Server (formerly iPlanet WebProxy Server, presently Sun Java System Web Proxy Server)</description>
1036
+ <example service.version="3.6-SP4">Sun-ONE-Web-Proxy-Server/3.6-SP4</example>
1047
1037
  <param pos="0" name="service.vendor" value="Sun"/>
1048
1038
  <param pos="0" name="service.family" value="Java System Web Proxy Server"/>
1049
1039
  <param pos="0" name="service.product" value="Java System Web Proxy Server"/>
1050
1040
  <param pos="1" name="service.version"/>
1051
1041
  <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_proxy_server:{service.version}"/>
1052
1042
  </fingerprint>
1053
- <fingerprint pattern="^Sun-Java-System-Web-Proxy-Server/([^.]+\.[^.]+\.[^.]+)$">
1054
- <description>Sun Java System Web Proxy Server (formerly iPlanet WebProxy Server,
1055
- Sun ONE WebProxy Server) with full version info</description>
1043
+ <fingerprint pattern="^Sun-Java-System-Web-Proxy-Server/(\d\.[\d.]+)$">
1044
+ <description>Sun Java System Web Proxy Server (formerly iPlanet WebProxy Server, Sun ONE WebProxy Server)</description>
1056
1045
  <example>Sun-Java-System-Web-Proxy-Server/4.0.2</example>
1046
+ <example>Sun-Java-System-Web-Proxy-Server/4.0</example>
1057
1047
  <param pos="0" name="service.vendor" value="Sun"/>
1058
1048
  <param pos="0" name="service.family" value="Java System Web Proxy Server"/>
1059
1049
  <param pos="0" name="service.product" value="Java System Web Proxy Server"/>
1060
1050
  <param pos="1" name="service.version"/>
1061
1051
  <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_proxy_server:{service.version}"/>
1062
1052
  </fingerprint>
1063
- <fingerprint pattern="^Sun-Java-System-Web-Proxy-Server/(?:4\.\d+)$">
1064
- <description>Sun Java System Web Proxy Server (formerly iPlanet WebProxy Server,
1065
- Sun ONE WebProxy Server) with partial version info</description>
1066
- <example>Sun-Java-System-Web-Proxy-Server/4.0</example>
1067
- <param pos="0" name="service.vendor" value="Sun"/>
1068
- <param pos="0" name="service.family" value="Java System Web Proxy Server"/>
1069
- <param pos="0" name="service.product" value="Java System Web Proxy Server"/>
1070
- <param pos="0" name="service.cpe23" value="cpe:/a:sun:java_system_web_proxy_server:-"/>
1071
- </fingerprint>
1072
1053
  <fingerprint pattern="^Sun-ILOM-Web-Server/(?:\d\.[\d._]+)$">
1073
- <description>Sun Integrated Lights Out Manager (ILOM) usually
1074
- bundled with Sun Fire servers</description>
1054
+ <description>Sun Integrated Lights Out Manager (ILOM) usually bundled with Sun Fire servers</description>
1075
1055
  <example>Sun-ILOM-Web-Server/1.0</example>
1076
1056
  <param pos="0" name="service.vendor" value="Sun"/>
1077
1057
  <param pos="0" name="service.product" value="Integrated Lights Out Manager"/>
@@ -1080,11 +1060,7 @@
1080
1060
  <param pos="0" name="hw.family" value="Sun Fire"/>
1081
1061
  </fingerprint>
1082
1062
  <fingerprint pattern="^HP-iLO-Server/(?:[\S]+)">
1083
- <description>
1084
- HP Integrated Lights Out Manager (iLO). The version in the Server
1085
- header is the firmware version and is not currently used. Furthermore,
1086
- this header value only seems to be present in iLO 4
1087
- </description>
1063
+ <description>HP Integrated Lights Out Manager (iLO). Version in the Server header (found on in iLO4) is the firmware version and is not currently used.</description>
1088
1064
  <example>HP-iLO-Server/1.30</example>
1089
1065
  <param pos="0" name="service.vendor" value="HP"/>
1090
1066
  <param pos="0" name="service.product" value="iLO"/>
@@ -1103,7 +1079,7 @@
1103
1079
  Sun_WebServer/2.1
1104
1080
  -->
1105
1081
  <fingerprint pattern="^Jetty/(\d+\.[\d.]+)(?: \((.*)\))?$">
1106
- <description>Mort Bay Jetty</description>
1082
+ <description>Mort Bay Jetty with info</description>
1107
1083
  <example>Jetty/4.0.1 (SunOS 5.8 sparc)</example>
1108
1084
  <example>Jetty/4.2.23 (SunOS/5.9 sparc java/1.4.2_04)</example>
1109
1085
  <example>Jetty/5.1.10 (Linux/2.6.12 i386 java/1.5.0_05)</example>
@@ -1127,6 +1103,7 @@
1127
1103
  <fingerprint pattern="^Jetty\((\S+)\)$">
1128
1104
  <description>Mort Bay Jetty</description>
1129
1105
  <example>Jetty(6.1.7)</example>
1106
+ <example>Jetty(9.4.z-SNAPSHOT)</example>
1130
1107
  <param pos="0" name="service.vendor" value="Mort Bay"/>
1131
1108
  <param pos="0" name="service.product" value="Jetty"/>
1132
1109
  <param pos="0" name="service.family" value="Jetty"/>
@@ -1175,8 +1152,7 @@
1175
1152
  <fingerprint pattern="^lighttpd(?:/(\d[\d.]+))?.*$">
1176
1153
  <description>Lighttpd</description>
1177
1154
  <example>lighttpd</example>
1178
- <example>lighttpd/1.4.16</example>
1179
- <example>lighttpd/1.4.16</example>
1155
+ <example service.version="1.4.16">lighttpd/1.4.16</example>
1180
1156
  <example>lighttpd/1.3.7 (Mar 23 2007/16:00:15)</example>
1181
1157
  <param pos="0" name="service.product" value="lighttpd"/>
1182
1158
  <param pos="0" name="service.family" value="lighttpd"/>
@@ -1225,9 +1201,9 @@
1225
1201
  </fingerprint>
1226
1202
  <fingerprint pattern="^WebLogic (?:WebLogic )?Server (\d+\.\d+(?:\s+SP\d+)?)\s+.*$">
1227
1203
  <description>BEA WebLogic</description>
1228
- <example>WebLogic Server 8.1 SP3 Tue Jun 29 23:11:19 PDT 2004 404973</example>
1229
- <example>WebLogic Server 7.0 SP4 Tue Aug 12 11:22:26 PDT 2003</example>
1230
- <example>WebLogic WebLogic Server 6.1 SP4 11/08/2002 21:50:43 #221641</example>
1204
+ <example service.version="8.1 SP3">WebLogic Server 8.1 SP3 Tue Jun 29 23:11:19 PDT 2004 404973</example>
1205
+ <example service.version="7.0 SP4">WebLogic Server 7.0 SP4 Tue Aug 12 11:22:26 PDT 2003</example>
1206
+ <example service.version="6.1 SP4">WebLogic WebLogic Server 6.1 SP4 11/08/2002 21:50:43 #221641</example>
1231
1207
  <param pos="0" name="service.vendor" value="BEA"/>
1232
1208
  <param pos="0" name="service.product" value="WebLogic"/>
1233
1209
  <param pos="0" name="service.family" value="WebLogic"/>
@@ -1236,8 +1212,8 @@
1236
1212
  </fingerprint>
1237
1213
  <fingerprint pattern="^WebSphere Application Server/(\d+\.\d+)$">
1238
1214
  <description>IBM WebSphere</description>
1239
- <example>WebSphere Application Server/5.0</example>
1240
- <example>WebSphere Application Server/6.1</example>
1215
+ <example service.version="5.0">WebSphere Application Server/5.0</example>
1216
+ <example service.version="6.1">WebSphere Application Server/6.1</example>
1241
1217
  <param pos="0" name="service.vendor" value="IBM"/>
1242
1218
  <param pos="0" name="service.product" value="WebSphere"/>
1243
1219
  <param pos="0" name="service.family" value="WebSphere"/>
@@ -1270,8 +1246,7 @@
1270
1246
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1271
1247
  </fingerprint>
1272
1248
  <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X1-Win32 AbyssLib/(?:\d\.[\d.]+)$">
1273
- <description>Aprelium Technologies Abyss Web Server X1
1274
- (free personal edition) on Windows</description>
1249
+ <description>Aprelium Technologies Abyss Web Server X1 (free personal edition) on Windows</description>
1275
1250
  <example>Abyss/2.0.0.20-X1-Win32 AbyssLib/2.0.0.20</example>
1276
1251
  <example>Abyss/2.3.2-X1-Win32 AbyssLib/2.3.2</example>
1277
1252
  <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
@@ -1284,8 +1259,7 @@
1284
1259
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
1285
1260
  </fingerprint>
1286
1261
  <fingerprint pattern="^Abyss/(\d\.[\d.]+)-X2-Win32 AbyssLib/(?:\d\.[\d.]+)$">
1287
- <description>Aprelium Technologies Abyss Web Server X2
1288
- (licensed professional edition) on Windows</description>
1262
+ <description>Aprelium Technologies Abyss Web Server X2 (licensed professional edition) on Windows</description>
1289
1263
  <param pos="0" name="service.vendor" value="Aprelium Technologies"/>
1290
1264
  <param pos="0" name="service.product" value="Abyss Web Server X1"/>
1291
1265
  <param pos="0" name="service.family" value="Abyss Web Server"/>
@@ -1413,9 +1387,8 @@
1413
1387
  <param pos="0" name="os.vendor" value="SonicWALL"/>
1414
1388
  </fingerprint>
1415
1389
  <fingerprint pattern="^NetCache appliance \(NetApp/+(\d+\.\d+[\w.]+)\)$">
1416
- <description>NetCache appliance (product line formerly owned by Network Appliances,
1417
- now owned by Blue Coat Systems).</description>
1418
- <example>NetCache appliance (NetApp/5.3.1R3)</example>
1390
+ <description>NetCache appliance (product line formerly owned by Network Appliances, now owned by Blue Coat Systems).</description>
1391
+ <example service.version="5.3.1R3">NetCache appliance (NetApp/5.3.1R3)</example>
1419
1392
  <example>NetCache appliance (NetApp/5.4R2D2)</example>
1420
1393
  <example>NetCache appliance (NetApp/5.6.1D22)</example>
1421
1394
  <example>NetCache appliance (NetApp/6.0.2P1)</example>
@@ -1626,9 +1599,9 @@
1626
1599
  </fingerprint>
1627
1600
  <fingerprint pattern="^EWS-NIC\d/(\S+)$">
1628
1601
  <description>Xerox Embedded Web Server (EWS)</description>
1629
- <example>EWS-NIC3/6.31</example>
1630
- <example>EWS-NIC4/13.40</example>
1631
- <example>EWS-NIC4/13.39</example>
1602
+ <example service.version="6.31">EWS-NIC3/6.31</example>
1603
+ <example service.version="13.40">EWS-NIC4/13.40</example>
1604
+ <example service.version="13.39">EWS-NIC4/13.39</example>
1632
1605
  <param pos="0" name="service.vendor" value="Xerox"/>
1633
1606
  <param pos="0" name="service.family" value="EWS"/>
1634
1607
  <param pos="0" name="service.product" value="EWS"/>
@@ -1841,8 +1814,8 @@
1841
1814
  </fingerprint>
1842
1815
  -->
1843
1816
  <fingerprint pattern="^SentinelProtectionServer/((?:\d+\.)*\d+)$">
1844
- <description>Embedded web server in SafeNet's memory key dongles.</description>
1845
- <example>SentinelProtectionServer/7.1</example>
1817
+ <description>Sentinel Protection Server - Embedded httpd in SafeNet's memory key dongles</description>
1818
+ <example service.version="7.1">SentinelProtectionServer/7.1</example>
1846
1819
  <example>SentinelProtectionServer/7.3</example>
1847
1820
  <example>SentinelProtectionServer/7.0</example>
1848
1821
  <example>SentinelProtectionServer/7</example>
@@ -1852,8 +1825,8 @@
1852
1825
  <param pos="1" name="service.version"/>
1853
1826
  </fingerprint>
1854
1827
  <fingerprint pattern="^SentinelKeysServer/((?:\d+\.)*\d+)$">
1855
- <description>Embedded web server in SafeNet's memory key dongles.</description>
1856
- <example>SentinelKeysServer/1.3.1</example>
1828
+ <description>Sentinel Key Server - Embedded httpd in SafeNet's memory key dongles</description>
1829
+ <example service.version="1.3.1">SentinelKeysServer/1.3.1</example>
1857
1830
  <example>SentinelKeysServer/1.0</example>
1858
1831
  <example>SentinelKeysServer/1</example>
1859
1832
  <param pos="0" name="service.vendor" value="SafeNet"/>
@@ -2097,7 +2070,7 @@
2097
2070
  <param pos="1" name="service.version"/>
2098
2071
  </fingerprint>
2099
2072
  <fingerprint pattern="^Oracle XML DB/Oracle\S+ Enterprise Edition Release ((?:\d+\.)*\d+) - Production$">
2100
- <description>Web server providing web services for Oracle's XML DB.</description>
2073
+ <description>Web server providing web services for Oracle's XML DB - with version string</description>
2101
2074
  <example>Oracle XML DB/Oracle9i Enterprise Edition Release 9.2.0.1.0 - Production</example>
2102
2075
  <example>Oracle XML DB/Oracle9i Enterprise Edition Release 9 - Production</example>
2103
2076
  <param pos="0" name="service.vendor" value="Oracle"/>
@@ -2106,15 +2079,14 @@
2106
2079
  <param pos="1" name="service.version"/>
2107
2080
  </fingerprint>
2108
2081
  <fingerprint pattern="^Oracle XML DB/Oracle Database$">
2109
- <description>Web server providing web services for Oracle's XML DB.</description>
2082
+ <description>Web server providing web services for Oracle's XML DB</description>
2110
2083
  <example>Oracle XML DB/Oracle Database</example>
2111
2084
  <param pos="0" name="service.vendor" value="Oracle"/>
2112
2085
  <param pos="0" name="service.product" value="XML DB"/>
2113
2086
  <param pos="0" name="service.family" value="Oracle"/>
2114
2087
  </fingerprint>
2115
2088
  <fingerprint pattern="^sfcHttpd$">
2116
- <description>Server for HTTP interface to sfcb, a lightweight CIM server.
2117
- </description>
2089
+ <description>Server for HTTP interface to sfcb, a lightweight CIM server</description>
2118
2090
  <example>sfcHttpd</example>
2119
2091
  <param pos="0" name="service.vendor" value="SBLIM"/>
2120
2092
  <param pos="0" name="service.product" value="sfcb"/>
@@ -2221,8 +2193,7 @@
2221
2193
  </fingerprint>
2222
2194
  -->
2223
2195
  <fingerprint pattern="^(?:(?:\d+.){3}\d+):\d{1,4}$">
2224
- <description>A banner consisting of an IP address and port --
2225
- assert nothing.</description>
2196
+ <description>A banner consisting of an IP address and port -- assert nothing.</description>
2226
2197
  <example>192.168.0.4:9999</example>
2227
2198
  </fingerprint>
2228
2199
  <fingerprint pattern="^Web-Server/(?:\d+\.+\d+)$">
@@ -2515,7 +2486,6 @@
2515
2486
  <fingerprint pattern="(?i)^Netgear/\S+ UPnP/\S+ miniupnpd/(\S+)$">
2516
2487
  <description>Netgear DG834G or WNDR3300 WAP UPnP Server</description>
2517
2488
  <example>Netgear/1.0 UPnP/1.0 miniupnpd/1.0</example>
2518
- <example>Netgear/1.0 UPnP/1.0 miniupnpd/1.0</example>
2519
2489
  <param pos="0" name="service.product" value="MiniUPnP"/>
2520
2490
  <param pos="1" name="service.version"/>
2521
2491
  <param pos="0" name="os.vendor" value="Netgear"/>
@@ -2752,7 +2722,7 @@
2752
2722
  <param pos="2" name="service.version"/>
2753
2723
  </fingerprint>
2754
2724
  <fingerprint pattern="^(\S+) \d+/Service Pack \d+, UPnP/[\d\.]+, TVersity Media Server$">
2755
- <description>TVersity Media Server UPnP Server</description>
2725
+ <description>TVersity Media Server UPnP Server with Service Pack</description>
2756
2726
  <example>5.2.3790 2/Service Pack 1, UPnP/1.0, TVersity Media Server</example>
2757
2727
  <example>5.1.2600 2/Service Pack 3, UPnP/1.0, TVersity Media Server</example>
2758
2728
  <param pos="0" name="service.vendor" value="TVersity"/>
@@ -2781,7 +2751,7 @@
2781
2751
  <param pos="0" name="os.device" value="Router"/>
2782
2752
  </fingerprint>
2783
2753
  <fingerprint pattern="^Linux-(\S+), UPnP/[\d\.]+, PMS/([\d\.]+)$">
2784
- <description>PlayStation3 Media Server UPnP Server</description>
2754
+ <description>PlayStation3 Media Server UPnP Server - linux</description>
2785
2755
  <example>Linux-amd64-2.6.18-238.9.1.el5, UPnP/1.0, PMS/1.52.1</example>
2786
2756
  <example>Linux-i386-2.6.33.2, UPnP/1.0, PMS/1.21.1</example>
2787
2757
  <param pos="0" name="service.vendor" value="Sony"/>
@@ -2793,7 +2763,7 @@
2793
2763
  <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
2794
2764
  </fingerprint>
2795
2765
  <fingerprint pattern="^Windows_XP-(\S+), UPnP/[\d\.]+, PMS/([\d\.]+)$">
2796
- <description>PlayStation3 Media Server UPnP Server</description>
2766
+ <description>PlayStation3 Media Server UPnP Server - Windows XP</description>
2797
2767
  <example>Windows_XP-amd64-5.2, UPnP/1.0, PMS/1.54.0</example>
2798
2768
  <example>Windows_XP-x86-5.1, UPnP/1.0, PMS/1.20.400</example>
2799
2769
  <param pos="0" name="service.vendor" value="Sony"/>
@@ -2805,7 +2775,7 @@
2805
2775
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_xp:{os.version}"/>
2806
2776
  </fingerprint>
2807
2777
  <fingerprint pattern="^Windows_7-x86-(\S+), UPnP/[\d\.]+, PMS/([\d\.]+)$">
2808
- <description>PlayStation3 Media Server UPnP Server</description>
2778
+ <description>PlayStation3 Media Server UPnP Server - Windows 7 x86</description>
2809
2779
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.20</example>
2810
2780
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.22.0</example>
2811
2781
  <example>Windows_7-x86-6.1, UPnP/1.0, PMS/1.25.1</example>
@@ -2834,7 +2804,7 @@
2834
2804
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_7:{os.version}"/>
2835
2805
  </fingerprint>
2836
2806
  <fingerprint pattern="^Windows_7-x86_64-(\S+), UPnP/[\d\.]+, PMS/([\d\.]+)$">
2837
- <description>PlayStation3 Media Server UPnP Server</description>
2807
+ <description>PlayStation3 Media Server UPnP Server - Windows 7 x86_64</description>
2838
2808
  <param pos="0" name="service.vendor" value="Sony"/>
2839
2809
  <param pos="0" name="service.product" value="PMS"/>
2840
2810
  <param pos="2" name="service.version"/>
@@ -2851,7 +2821,7 @@
2851
2821
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_8:-"/>
2852
2822
  </fingerprint>
2853
2823
  <fingerprint pattern="^Mac_OS_X-x86_64-(\S+), UPnP/[\d\.]+, PMS/([\d\.]+)$">
2854
- <description>PlayStation3 Media Server UPnP Server</description>
2824
+ <description>PlayStation3 Media Server UPnP Server - macOS x86_64</description>
2855
2825
  <example>Mac_OS_X-x86_64-10.5.8, UPnP/1.0, PMS/1.20</example>
2856
2826
  <param pos="0" name="service.vendor" value="Sony"/>
2857
2827
  <param pos="0" name="service.product" value="PMS"/>
@@ -2862,7 +2832,7 @@
2862
2832
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:{os.version}"/>
2863
2833
  </fingerprint>
2864
2834
  <fingerprint pattern="^Linux/(\S+), UPnP/\S+, Free UPnP Entertainment Service/ReadyNAS$">
2865
- <description>Free UPnP Entertainment Service UPnP Server</description>
2835
+ <description>Free UPnP Entertainment Service UPnP Server - Linux on ReadyNAS</description>
2866
2836
  <param pos="0" name="service.product" value="FUPPES"/>
2867
2837
  <param pos="0" name="os.vendor" value="Linux"/>
2868
2838
  <param pos="0" name="os.product" value="Linux"/>
@@ -2874,7 +2844,7 @@
2874
2844
  <param pos="0" name="hw.product" value="ReadyNAS"/>
2875
2845
  </fingerprint>
2876
2846
  <fingerprint pattern="^Linux/(\S+), UPnP/\S+, Free UPnP Entertainment Service/$">
2877
- <description>Free UPnP Entertainment Service UPnP Server</description>
2847
+ <description>Free UPnP Entertainment Service UPnP Server - Linux</description>
2878
2848
  <param pos="0" name="service.product" value="FUPPES"/>
2879
2849
  <param pos="0" name="os.vendor" value="Linux"/>
2880
2850
  <param pos="0" name="os.product" value="Linux"/>
@@ -2882,7 +2852,7 @@
2882
2852
  <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
2883
2853
  </fingerprint>
2884
2854
  <fingerprint pattern="^FreeBSD/(\S+), UPnP/\S+, Free UPnP Entertainment Service/$">
2885
- <description>Free UPnP Entertainment Service UPnP Server</description>
2855
+ <description>Free UPnP Entertainment Service UPnP Server - FreeBSD</description>
2886
2856
  <param pos="0" name="service.product" value="FUPPES"/>
2887
2857
  <param pos="0" name="os.vendor" value="FreeBSD"/>
2888
2858
  <param pos="0" name="os.product" value="FreeBSD"/>
@@ -2934,7 +2904,7 @@
2934
2904
  <param pos="0" name="os.device" value="WAP"/>
2935
2905
  </fingerprint>
2936
2906
  <fingerprint pattern="^Linux/(\S+), UPnP/[\d\.]+, Portable SDK for UPnP devices/(\S+)$">
2937
- <description>Portable SDK for UPnP Server</description>
2907
+ <description>Portable SDK for UPnP Server - Linux</description>
2938
2908
  <example>Linux/2.4.20-46.7asp, UPnP/1.0, Portable SDK for UPnP devices/1.6.17</example>
2939
2909
  <example>Linux/2.6.10-iop1-1, UPnP/1.0, Portable SDK for UPnP devices/1.4.1</example>
2940
2910
  <example>Linux/2.6.12-5.1-brcmstb-dm800, UPnP/1.0, Portable SDK for UPnP devices/1.6.0</example>
@@ -2960,7 +2930,7 @@
2960
2930
  <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
2961
2931
  </fingerprint>
2962
2932
  <fingerprint pattern="^Linux/(\S+) UPnP/[\d\.]+ DLNADOC/[\d\.]+ Portable SDK for UPnP devices/(\S+)$">
2963
- <description>DLNADOC Portable SDK for UPnP Server</description>
2933
+ <description>DLNADOC Portable SDK for UPnP Server - Linux DNLADOC variant</description>
2964
2934
  <example>Linux/3.0.8 UPnP/1.0 DLNADOC/1.50 Portable SDK for UPnP devices/1.6.6</example>
2965
2935
  <example>Linux/2.6.23.17_stm23_0125dorade00 UPnP/1.0 DLNADOC/1.50 Portable SDK for UPnP devices/1.4.6-5</example>
2966
2936
  <param pos="0" name="service.product" value="libupnp"/>
@@ -2971,7 +2941,7 @@
2971
2941
  <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
2972
2942
  </fingerprint>
2973
2943
  <fingerprint pattern="^Linux/(\S+), UPnP/[\d\.]+, Intel SDK for UPnP devices ?/(\S+)$">
2974
- <description>Intel SDK for UPnP Server</description>
2944
+ <description>Intel SDK for UPnP Server with verbose banner</description>
2975
2945
  <example>Linux/2.6.10_dev-malta-mips2_fp_le, UPnP/1.0, Intel SDK for UPnP devices /1.2</example>
2976
2946
  <example>Linux/2.4.18_mvl30-ixdp425, UPnP/1.0, Intel SDK for UPnP devices/1.3.1</example>
2977
2947
  <param pos="0" name="service.product" value="libupnp"/>
@@ -2988,8 +2958,8 @@
2988
2958
  <param pos="1" name="service.version"/>
2989
2959
  </fingerprint>
2990
2960
  <fingerprint pattern="^Darwin/(\S+), UPnP/\S+, Portable SDK for UPnP devices/(\S+)$">
2991
- <description>Portable SDK for UPnP Server</description>
2992
- <example>Darwin/10.2.0, UPnP/1.0, Portable SDK for UPnP devices/1.6.6</example>
2961
+ <description>Portable SDK for UPnP Server - macOS</description>
2962
+ <example service.version="1.6.6" os.version="10.2.0">Darwin/10.2.0, UPnP/1.0, Portable SDK for UPnP devices/1.6.6</example>
2993
2963
  <param pos="0" name="service.product" value="libupnp"/>
2994
2964
  <param pos="2" name="service.version"/>
2995
2965
  <param pos="0" name="os.vendor" value="Apple"/>