recog 2.3.7 → 2.3.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (50) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +3 -2
  3. data/.ruby-gemset +1 -0
  4. data/.ruby-version +1 -0
  5. data/.travis.yml +2 -4
  6. data/Gemfile +2 -5
  7. data/bin/recog_standardize +118 -0
  8. data/cpe-remap.yaml +21 -0
  9. data/features/match.feature +4 -0
  10. data/features/support/aruba.rb +3 -0
  11. data/features/verify.feature +5 -0
  12. data/identifiers/README.md +47 -0
  13. data/identifiers/os_architecture.txt +20 -0
  14. data/identifiers/os_device.txt +52 -0
  15. data/identifiers/os_family.txt +160 -0
  16. data/identifiers/os_product.txt +199 -0
  17. data/identifiers/service_family.txt +185 -0
  18. data/identifiers/service_product.txt +255 -0
  19. data/identifiers/software_class.txt +26 -0
  20. data/identifiers/software_family.txt +91 -0
  21. data/identifiers/software_product.txt +333 -0
  22. data/identifiers/vendor.txt +405 -0
  23. data/lib/recog/version.rb +1 -1
  24. data/spec/lib/fingerprint_self_test_spec.rb +1 -1
  25. data/spec/lib/recog/fingerprint/regexp_factory_spec.rb +1 -1
  26. data/update_cpes.py +1 -1
  27. data/xml/apache_os.xml +9 -0
  28. data/xml/architecture.xml +9 -5
  29. data/xml/dns_versionbind.xml +9 -11
  30. data/xml/ftp_banners.xml +47 -5
  31. data/xml/html_title.xml +310 -196
  32. data/xml/http_cookies.xml +13 -1
  33. data/xml/http_servers.xml +145 -7
  34. data/xml/http_wwwauth.xml +13 -1
  35. data/xml/mdns_device-info_txt.xml +20 -16
  36. data/xml/mysql_banners.xml +420 -38
  37. data/xml/ntp_banners.xml +16 -8
  38. data/xml/operating_system.xml +1 -0
  39. data/xml/rtsp_servers.xml +21 -21
  40. data/xml/sip_banners.xml +5 -41
  41. data/xml/sip_user_agents.xml +40 -1
  42. data/xml/smb_native_os.xml +1 -0
  43. data/xml/smtp_banners.xml +3 -4
  44. data/xml/snmp_sysdescr.xml +44 -28
  45. data/xml/ssh_banners.xml +78 -73
  46. data/xml/telnet_banners.xml +30 -9
  47. data/xml/x11_banners.xml +1 -1
  48. data/xml/x509_issuers.xml +7 -7
  49. data/xml/x509_subjects.xml +329 -28
  50. metadata +23 -6
data/xml/ntp_banners.xml CHANGED
@@ -318,19 +318,27 @@
318
318
  <param pos="0" name="os.certainty" value="0.9"/>
319
319
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.10"/>
320
320
  </fingerprint>
321
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;FreeBSD/?(?:[^ ]+-NETSCALER-([^ ]+))&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
321
+ <fingerprint pattern="^.*version=&quot;ntpd ([^ p]+)(:?p[^ &quot;]+)?[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;FreeBSD/?(?:[^ ]+-NETSCALER-([^ ]+))&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
322
322
  <description>ntpd running on Citrix Netscaler, which is based on FreeBSD</description>
323
- <example>
323
+ <example service.version="4.2.6" service.version.version="p2@1.2194" os.arch="i386" os.version="9.3">
324
324
  version="ntpd 4.2.6p2@1.2194 Wed Nov 24 15:54:11 UTC 2010 (1)",
325
325
  processor="i386", system="FreeBSD/6.3-NETSCALER-9.3", leap=00, stratum=3,
326
326
  </example>
327
- <param pos="0" name="service.family" value="NTP"/>
328
- <param pos="0" name="service.product" value="NTP"/>
327
+ <example service.version="4.2.6" service.version.version="p3-a" os.arch="amd64" os.version="10.5">
328
+ version="ntpd 4.2.6p3-a (1)", processor="amd64", system="FreeBSD/8.4-NETSCALER-10.5",
329
+ leap=3, stratum=16, precision=-21, rootdelay=0.000, rootdisp=1264777.230,
330
+ </example>
329
331
  <param pos="1" name="service.version"/>
332
+ <param pos="2" name="service.version.version"/>
333
+ <param pos="0" name="service.vendor" value="NTP"/>
334
+ <param pos="0" name="service.product" value="NTP"/>
335
+ <param pos="0" name="service.cpe23" value="cpe:/a:ntp:ntp:{service.version}:{service.version.version}"/>
330
336
  <param pos="0" name="os.vendor" value="Citrix"/>
337
+ <param pos="0" name="os.family" value="NetScaler"/>
338
+ <param pos="0" name="os.device" value="Network Management Device"/>
331
339
  <param pos="0" name="os.product" value="NetScaler"/>
332
- <param pos="2" name="os.arch"/>
333
- <param pos="3" name="os.version"/>
340
+ <param pos="3" name="os.arch"/>
341
+ <param pos="4" name="os.version"/>
334
342
  </fingerprint>
335
343
  <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;FreeBSD/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
336
344
  <description>ntpd running on FreeBSD</description>
@@ -1008,7 +1016,7 @@
1008
1016
  </example>
1009
1017
  <param pos="0" name="os.vendor" value="Wind River"/>
1010
1018
  <param pos="0" name="os.product" value="VxWorks"/>
1011
- <param pos="0" name="os.arch" value="arm"/>
1019
+ <param pos="0" name="os.arch" value="ARM"/>
1012
1020
  <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:-"/>
1013
1021
  </fingerprint>
1014
1022
  <fingerprint pattern="system=&quot;i386-wrs-vxworks&quot;" flags="REG_ICASE">
@@ -1018,7 +1026,7 @@
1018
1026
  </example>
1019
1027
  <param pos="0" name="os.vendor" value="Wind River"/>
1020
1028
  <param pos="0" name="os.product" value="VxWorks"/>
1021
- <param pos="0" name="os.arch" value="i386"/>
1029
+ <param pos="0" name="os.arch" value="x86"/>
1022
1030
  <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:-"/>
1023
1031
  </fingerprint>
1024
1032
  <fingerprint pattern="system=&quot;UNIX/Unixware([^ ]+)&quot;" flags="REG_ICASE">
data/xml/operating_system.xml CHANGED
@@ -32,6 +32,7 @@
32
32
  <param pos="0" name="os.product" value="Windows 10 Mobile"/>
33
33
  <param pos="1" name="os.edition"/>
34
34
  <param pos="0" name="os.device" value="Mobile"/>
35
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_10_mobile:-"/>
35
36
  </fingerprint>
36
37
  <fingerprint pattern="^(?i:(?:Microsoft )?(Windows (?:XP|Vista|7|8|8.1|10))(?:\s)?((?:[a-z]+|[a-z]+, )?(?:[a-z]+|[a-z]+\s[a-z]+)?)?(?: Edition)?(?:\s)?(SP\d|SP \d|Service Pack \d)?)$">
37
38
  <description>Windows Desktop XP and later</description>
data/xml/rtsp_servers.xml CHANGED
@@ -5,39 +5,39 @@
5
5
  <example service.version="19.04">Flussonic (http://www.flussonic.com/) 19.04</example>
6
6
  <example service.version="20.01">Flussonic (http://www.flussonic.com/) 20.01</example>
7
7
  <param pos="0" name="service.vendor" value="Flussonic"/>
8
- <param pos="0" name="service.product" value="Flussonic Media Server" />
9
- <param pos="1" name="service.version" />
8
+ <param pos="0" name="service.product" value="Flussonic Media Server"/>
9
+ <param pos="1" name="service.version"/>
10
10
  </fingerprint>
11
11
  <fingerprint pattern="^Hipcam RealServer\/V([\d\.]+)$">
12
12
  <description>Hipcam IP camera running the RealServer RTSP server.</description>
13
13
  <example service.version="1.0">Hipcam RealServer/V1.0</example>
14
14
  <param pos="0" name="service.vendor" value="RealNetworks"/>
15
- <param pos="0" name="service.product" value="RealServer" />
16
- <param pos="1" name="service.version" />
17
- <param pos="0" name="hw.vendor" value="Hipcam" />
18
- <param pos="0" name="hw.device" value="IP Camera" />
15
+ <param pos="0" name="service.product" value="RealServer"/>
16
+ <param pos="1" name="service.version"/>
17
+ <param pos="0" name="hw.vendor" value="Hipcam"/>
18
+ <param pos="0" name="hw.device" value="IP Camera"/>
19
19
  </fingerprint>
20
20
  <fingerprint pattern="^Dahua Rtsp Server$">
21
21
  <description>Dahua IP Camera</description>
22
22
  <example>Dahua Rtsp Server</example>
23
23
  <param pos="0" name="service.vendor" value="Dahua"/>
24
- <param pos="0" name="hw.vendor" value="Dahua" />
25
- <param pos="0" name="hw.device" value="IP Camera" />
24
+ <param pos="0" name="hw.vendor" value="Dahua"/>
25
+ <param pos="0" name="hw.device" value="IP Camera"/>
26
26
  </fingerprint>
27
27
  <fingerprint pattern="^GStreamer RTSP server$">
28
28
  <description>GStreamer RTSP Server (https://github.com/GStreamer/gst-rtsp-server)</description>
29
29
  <example>GStreamer RTSP server</example>
30
30
  <param pos="0" name="service.vendor" value="GStreamer"/>
31
- <param pos="0" name="service.product" value="GStreamer RTSP Server" />
31
+ <param pos="0" name="service.product" value="GStreamer RTSP Server"/>
32
32
  </fingerprint>
33
33
  <fingerprint pattern="^WMServer\/([\d\.]+)$">
34
34
  <description>Windows Media Server</description>
35
35
  <example service.version="9.1.1.3862">WMServer/9.1.1.3862</example>
36
36
  <example service.version="9.5.6001.22609">WMServer/9.5.6001.22609</example>
37
37
  <param pos="0" name="service.vendor" value="Microsoft"/>
38
- <param pos="0" name="service.product" value="Windows Media Server" />
38
+ <param pos="0" name="service.product" value="Windows Media Server"/>
39
39
  <param pos="0" name="service.family" value="Windows Media Server"/>
40
- <param pos="1" name="service.version" />
40
+ <param pos="1" name="service.version"/>
41
41
  <param pos="0" name="os.vendor" value="Microsoft"/>
42
42
  <param pos="0" name="os.family" value="Windows"/>
43
43
  </fingerprint>
@@ -46,31 +46,31 @@
46
46
  <example service.version="4.7.7" service.version.version="20181108145350" service.product="Streaming Engine">Wowza Streaming Engine 4.7.7 build20181108145350</example>
47
47
  <example service.version="3.6.4" service.version.version="9641" service.product="Media Server">Wowza Media Server 3.6.4 build9641</example>
48
48
  <param pos="0" name="service.vendor" value="Wowza Media Systems"/>
49
- <param pos="1" name="service.product" />
50
- <param pos="2" name="service.version" />
51
- <param pos="3" name="service.version.version" />
49
+ <param pos="1" name="service.product"/>
50
+ <param pos="2" name="service.version"/>
51
+ <param pos="3" name="service.version.version"/>
52
52
  </fingerprint>
53
53
  <fingerprint pattern="^HiIpcam\/V\d+R\d+ VodServer\/[\d\.]+$">
54
54
  <description>Foscam IP Camera</description>
55
55
  <example>HiIpcam/V100R003 VodServer/1.0.0</example>
56
- <param pos="0" name="hw.vendor" value="Foscam" />
57
- <param pos="0" name="hw.device" value="IP Camera" />
56
+ <param pos="0" name="hw.vendor" value="Foscam"/>
57
+ <param pos="0" name="hw.device" value="IP Camera"/>
58
58
  </fingerprint>
59
59
  <fingerprint pattern="^Indigo\-Security\/[\d\.]+$">
60
60
  <description>Indigo Security IP Camera</description>
61
61
  <example>Indigo-Security/1.0</example>
62
- <param pos="0" name="hw.vendor" value="Indigo Security" />
63
- <param pos="0" name="hw.device" value="IP Camera" />
62
+ <param pos="0" name="hw.vendor" value="Indigo Security"/>
63
+ <param pos="0" name="hw.device" value="IP Camera"/>
64
64
  </fingerprint>
65
65
  <fingerprint pattern="^Cisco MediaSense Media Server$">
66
66
  <description>Cisco MediaSense Media Server (RTSP)</description>
67
67
  <example>Cisco MediaSense Media Server</example>
68
68
  <param pos="0" name="service.vendor" value="Cisco"/>
69
- <param pos="0" name="service.product" value="MediaSense Media Server"/>
70
- <param pos="0" name="service.cpe23" value="cpe:2.3:a:cisco:mediasense:-"/>
69
+ <param pos="0" name="service.product" value="MediaSense"/>
70
+ <param pos="0" name="service.cpe23" value="cpe:/a:cisco:mediasense:-"/>
71
71
  <param pos="0" name="os.vendor" value="Cisco"/>
72
72
  <param pos="0" name="hw.vendor" value="Cisco"/>
73
73
  <param pos="0" name="hw.device" value="SIP Gateway"/>
74
- <param pos="0" name="hw.product" value="MediaSense Server"/>
74
+ <param pos="0" name="hw.product" value="MediaSense"/>
75
75
  </fingerprint>
76
76
  </fingerprints>
data/xml/sip_banners.xml CHANGED
@@ -3,16 +3,14 @@
3
3
  <!--
4
4
  SIP Server header values are matched against these patterns to fingerprint SIP devices.
5
5
  -->
6
-
7
6
  <!-- Cisco/Tandberg Products -->
8
-
9
7
  <fingerprint pattern="^Cisco-SIPGateway/IOS-(\S+)\.x$">
10
8
  <description>Cisco IOS SIP Gateway w/ Vague Version</description>
11
9
  <example os.version="12">Cisco-SIPGateway/IOS-12.x</example>
12
10
  <param pos="0" name="service.vendor" value="Cisco"/>
13
11
  <param pos="0" name="service.family" value="IOS"/>
14
12
  <param pos="0" name="service.product" value="IOS"/>
15
- <param pos="0" name="service.cpe23" value="cpe:/a:cisco:ios:{os.version}"/>
13
+ <param pos="0" name="service.cpe23" value="cpe:/a:cisco:ios:-"/>
16
14
  <param pos="0" name="os.vendor" value="Cisco"/>
17
15
  <param pos="0" name="os.family" value="IOS"/>
18
16
  <param pos="0" name="os.product" value="IOS"/>
@@ -22,7 +20,6 @@
22
20
  <param pos="0" name="hw.vendor" value="Cisco"/>
23
21
  <param pos="0" name="hw.device" value="Router"/>
24
22
  </fingerprint>
25
-
26
23
  <fingerprint pattern="^Cisco-SIPGateway/IOS-(\S+)$">
27
24
  <description>Cisco IOS SIP Gateway w/ Full Version</description>
28
25
  <example os.version="15.2.4.M3">Cisco-SIPGateway/IOS-15.2.4.M3</example>
@@ -30,11 +27,11 @@
30
27
  <example os.version="15.2.3.T">Cisco-SIPGateway/IOS-15.2.3.T</example>
31
28
  <example os.version="15.4.3.S5">Cisco-SIPGateway/IOS-15.4.3.S5</example>
32
29
  <example os.version="15.6.3.M0a">Cisco-SIPGateway/IOS-15.6.3.M0a</example>
33
- <example os.version="16.3.6">Cisco-SIPGateway/IOS-16.3.6</example>
30
+ <example os.version="16.3.6">Cisco-SIPGateway/IOS-16.3.6</example>
34
31
  <param pos="0" name="service.vendor" value="Cisco"/>
35
32
  <param pos="0" name="service.family" value="IOS"/>
36
33
  <param pos="0" name="service.product" value="IOS"/>
37
- <param pos="0" name="service.cpe23" value="cpe:/a:cisco:ios:{os.version}"/>
34
+ <param pos="0" name="service.cpe23" value="cpe:/a:cisco:ios:-"/>
38
35
  <param pos="0" name="os.vendor" value="Cisco"/>
39
36
  <param pos="0" name="os.family" value="IOS"/>
40
37
  <param pos="0" name="os.product" value="IOS"/>
@@ -44,7 +41,6 @@
44
41
  <param pos="0" name="hw.vendor" value="Cisco"/>
45
42
  <param pos="0" name="hw.device" value="Router"/>
46
43
  </fingerprint>
47
-
48
44
  <fingerprint pattern="^Cisco-CP-?(\d+G?)(?:-\S+)?/([\d\.]+)">
49
45
  <description>Cisco CP VoIP Phone</description>
50
46
  <example hw.model="7960G" hw.version="8.0">Cisco-CP7960G/8.0</example>
@@ -59,7 +55,6 @@
59
55
  <param pos="1" name="hw.model"/>
60
56
  <param pos="2" name="hw.version"/>
61
57
  </fingerprint>
62
-
63
58
  <fingerprint pattern="(?:Cisco|Linksys)/(SPA\d+[DG]?\d?)-([\d\.a-zA-Z]+)">
64
59
  <description>Cisco/Linksys SPA VoIP Phone</description>
65
60
  <example hw.model="SPA112" hw.version="1.4.1SR1">Cisco/SPA112-1.4.1SR1(002)d-hisec</example>
@@ -77,7 +72,6 @@
77
72
  <param pos="1" name="hw.model"/>
78
73
  <param pos="2" name="hw.version"/>
79
74
  </fingerprint>
80
-
81
75
  <fingerprint pattern="(?:Cisco|Linksys)(?: |/)(PAP2T?)(?:-|/)(\S+)$">
82
76
  <description>Cisco/Linksys VoIP / Internet Phone adapter</description>
83
77
  <example hw.version="3.1.22(LS)" hw.model="PAP2">PhoneSystems.net aabbccddeeff Linksys/PAP2-3.1.22(LS)</example>
@@ -93,7 +87,6 @@
93
87
  <param pos="1" name="hw.model"/>
94
88
  <param pos="2" name="hw.version"/>
95
89
  </fingerprint>
96
-
97
90
  <fingerprint pattern="^Cisco/(SRP\d+)-([\d\.]+)">
98
91
  <description>Cisco Services Ready Platforms (SRP) Router</description>
99
92
  <example hw.model="SRP541" hw.version="1.2.6">Cisco/SRP541-1.2.6(003)</example>
@@ -106,7 +99,6 @@
106
99
  <param pos="1" name="hw.model"/>
107
100
  <param pos="2" name="hw.version"/>
108
101
  </fingerprint>
109
-
110
102
  <fingerprint pattern="(?:Cisco|Linksys)/(WRP\d+)-(\S+)$">
111
103
  <description>Cisco/Linksys WRP Wireless Router</description>
112
104
  <example hw.version="2.00.26" hw.model="WRP400">aabbccddeeff_FinalStage_Linksys/WRP400-2.00.26</example>
@@ -120,7 +112,6 @@
120
112
  <param pos="1" name="hw.model"/>
121
113
  <param pos="2" name="hw.version"/>
122
114
  </fingerprint>
123
-
124
115
  <fingerprint pattern="^TANDBERG/(\d+) \((.*)\) Cisco-(\S+)$">
125
116
  <description>Cisco/Tandberg TelePresence w/Cisco Model Name</description>
126
117
  <example os.version="TC7.3.7.01c84fd" tandberg.model="528" hw.product="EX60">TANDBERG/528 (TC7.3.7.01c84fd) Cisco-EX60</example>
@@ -130,13 +121,11 @@
130
121
  <param pos="0" name="os.product" value="Linux"/>
131
122
  <param pos="1" name="tandberg.model"/>
132
123
  <param pos="2" name="os.version"/>
133
- <param pos="0" name="os.cpe23" value="cpe:/o:cisco:telepresence:{os.version}"/>
134
124
  <param pos="0" name="hw.vendor" value="Cisco"/>
135
125
  <param pos="0" name="hw.family" value="TelePresence"/>
136
126
  <param pos="0" name="hw.device" value="Video Conferencing"/>
137
127
  <param pos="3" name="hw.product"/>
138
128
  </fingerprint>
139
-
140
129
  <fingerprint pattern="^(TANDBERG/(\d+)) \((\S+).*\)$">
141
130
  <description>Cisco/Tandberg TelePresence</description>
142
131
  <example os.version="TC7.0.2.aecf2d9" tandberg.model="519" hw.product="TANDBERG/519">TANDBERG/519 (TC7.0.2.aecf2d9)</example>
@@ -144,21 +133,18 @@
144
133
  <example os.version="X8.2.1" hw.product="TANDBERG/4130">TANDBERG/4130 (X8.2.1)</example>
145
134
  <example os.version="XC2.2.1-b2bua-1.0" hw.product="TANDBERG/4353" tandberg.model="4353">TANDBERG/4353 (XC2.2.1-b2bua-1.0)</example>
146
135
  <example os.version="TC5.1.4.295090" hw.product="TANDBERG/516" tandberg.model="516">TANDBERG/516 (TC5.1.4.295090)</example>
147
- <example os.version="TCNC5.1.4.295090" hw.product="TANDBERG/517" tandberg.model="517">TANDBERG/517 (TCNC5.1.4.295090)</example>
136
+ <example os.version="TCNC5.1.4.295090" hw.product="TANDBERG/517" tandberg.model="517">TANDBERG/517 (TCNC5.1.4.295090)</example>
148
137
  <param pos="0" name="os.vendor" value="Tandberg"/>
149
138
  <param pos="0" name="os.family" value="Linux"/>
150
139
  <param pos="0" name="os.product" value="Linux"/>
151
140
  <param pos="2" name="tandberg.model"/>
152
141
  <param pos="3" name="os.version"/>
153
- <param pos="0" name="os.cpe23" value="cpe:/o:cisco:telepresence:{os.version}"/>
154
142
  <param pos="0" name="hw.vendor" value="Cisco"/>
155
143
  <param pos="0" name="hw.family" value="TelePresence"/>
156
144
  <param pos="0" name="hw.device" value="Video Conferencing"/>
157
145
  <param pos="1" name="hw.product"/>
158
146
  </fingerprint>
159
-
160
147
  <!-- Various -->
161
-
162
148
  <fingerprint pattern="EnGenius_Router$">
163
149
  <description>EnGenius DuraFon IP Phone</description>
164
150
  <example>EnGenius_Router</example>
@@ -166,7 +152,6 @@
166
152
  <param pos="0" name="hw.product" value="DuraFon"/>
167
153
  <param pos="0" name="hw.device" value="VoIP"/>
168
154
  </fingerprint>
169
-
170
155
  <fingerprint pattern="(?i)^Huawei (SoftX\d+) (?:V\d.*)$">
171
156
  <description>Huawei Softswitch</description>
172
157
  <example hw.model="SoftX3000">Huawei SoftX3000 V300R006</example>
@@ -175,13 +160,11 @@
175
160
  <param pos="0" name="hw.product" value="Softswitch"/>
176
161
  <param pos="1" name="hw.model"/>
177
162
  </fingerprint>
178
-
179
163
  <fingerprint pattern="(?i)^SIP/1.0 \(Huawei\)$">
180
164
  <description>Huawei generic</description>
181
165
  <example>SIP/1.0 (Huawei)</example>
182
166
  <param pos="0" name="hw.vendor" value="Huawei"/>
183
167
  </fingerprint>
184
-
185
168
  <fingerprint pattern="^M5T SIP(?: Stack|-UA SAFE)/v?([\d\.]+)">
186
169
  <description>Media5 Corporation SIP Stack</description>
187
170
  <example service.version="4.1.2.2">M5T SIP Stack/4.1.2.2</example>
@@ -192,7 +175,6 @@
192
175
  <param pos="1" name="service.version"/>
193
176
  <param pos="0" name="hw.device" value="VoIP"/>
194
177
  </fingerprint>
195
-
196
178
  <fingerprint pattern="^Tilgin Vood ([^_\s]+)">
197
179
  <description>Tilgin Vood</description>
198
180
  <example hw.model="HG238x">Tilgin Vood HG238x_ESx000-02_07_03_26</example>
@@ -202,7 +184,6 @@
202
184
  <param pos="0" name="hw.product" value="Vood"/>
203
185
  <param pos="1" name="hw.model"/>
204
186
  </fingerprint>
205
-
206
187
  <fingerprint pattern="^(F\d{3})/VT?(\d(?:[\d\.A-Z]+))$">
207
188
  <description>ZTE GPON Router</description>
208
189
  <example hw.product="F620" hw.version="3.30.20P5T4S">F620/V3.30.20P5T4S</example>
@@ -213,7 +194,6 @@
213
194
  <param pos="1" name="hw.product"/>
214
195
  <param pos="2" name="hw.version"/>
215
196
  </fingerprint>
216
-
217
197
  <fingerprint pattern="^ZXDSL (\S+)/V?(\d(?:[\d\.A-Z_]+))$">
218
198
  <description>ZTE ZXDSL router</description>
219
199
  <example hw.product="931VII" hw.version="2.0.00.OTET06">ZXDSL 931VII/V2.0.00.OTET06</example>
@@ -223,7 +203,6 @@
223
203
  <param pos="1" name="hw.product"/>
224
204
  <param pos="2" name="hw.version"/>
225
205
  </fingerprint>
226
-
227
206
  <fingerprint pattern="^(?:ZXHN )?(H\d{3}N)/V?(\d(?:[\d\.A-Z_]+))$">
228
207
  <description>ZTE ZXHN router</description>
229
208
  <example hw.product="H218N" hw.version="1.02.01_ERS">ZXHN H218N/V1.02.01_ERS</example>
@@ -237,7 +216,6 @@
237
216
  <param pos="1" name="hw.product"/>
238
217
  <param pos="2" name="hw.version"/>
239
218
  </fingerprint>
240
-
241
219
  <fingerprint pattern="^Aastra ([^/]+)/([a-zA-Z0-9\.\-]+)$">
242
220
  <description>Aastra IP Phone</description>
243
221
  <example hw.product="6865i" os.version="4.2.0.2023">Aastra 6865i/4.2.0.2023</example>
@@ -250,7 +228,6 @@
250
228
  <param pos="0" name="hw.device" value="VoIP"/>
251
229
  <param pos="1" name="hw.product"/>
252
230
  </fingerprint>
253
-
254
231
  <fingerprint pattern="^(?:Audiocodes-Sip-Gateway-)?(\S+) FX[A-Z_]+/v.(\S+)$">
255
232
  <description>Audiocodes-Sip-Gateway</description>
256
233
  <example hw.product="MP-124" os.version="6.00A.034.003">Audiocodes-Sip-Gateway-MP-124 FXS/v.6.00A.034.003</example>
@@ -264,7 +241,6 @@
264
241
  <param pos="0" name="hw.device" value="SIP Gateway"/>
265
242
  <param pos="1" name="hw.product"/>
266
243
  </fingerprint>
267
-
268
244
  <fingerprint pattern="^Wildix GW-(\S+)$">
269
245
  <description>Wildix SIP Gateway</description>
270
246
  <example os.version="5.0.3.42145">Wildix GW-5.0.3.42145</example>
@@ -276,7 +252,6 @@
276
252
  <param pos="0" name="hw.device" value="SIP Gateway"/>
277
253
  <param pos="0" name="hw.product" value="SIP Gateway"/>
278
254
  </fingerprint>
279
-
280
255
  <fingerprint pattern="^Wildix GW$">
281
256
  <description>Wildix SIP Gateway w/o Version</description>
282
257
  <example>Wildix GW</example>
@@ -287,7 +262,6 @@
287
262
  <param pos="0" name="hw.device" value="SIP Gateway"/>
288
263
  <param pos="0" name="hw.product" value="SIP Gateway"/>
289
264
  </fingerprint>
290
-
291
265
  <fingerprint pattern="^Asterisk PBX (\S+)$">
292
266
  <description>Asterisk PBX w/ Version</description>
293
267
  <example service.version="13.18.0-6.7.1.1.rl.1538157944.1c65507">Asterisk PBX 13.18.0-6.7.1.1.rl.1538157944.1c65507</example>
@@ -296,18 +270,14 @@
296
270
  <param pos="0" name="service.family" value="PBX"/>
297
271
  <param pos="0" name="service.product" value="PBX"/>
298
272
  <param pos="1" name="service.version"/>
299
- <param pos="0" name="service.cpe23" value="cpe:/a:asterisk:asterisk:{service.version}"/>
300
273
  </fingerprint>
301
-
302
274
  <fingerprint pattern="^Asterisk PBX$">
303
275
  <description>Asterisk PBX w/o Version</description>
304
276
  <example>Asterisk PBX</example>
305
277
  <param pos="0" name="service.vendor" value="Asterisk"/>
306
278
  <param pos="0" name="service.family" value="PBX"/>
307
279
  <param pos="0" name="service.product" value="PBX"/>
308
- <param pos="0" name="service.cpe23" value="cpe:/a:asterisk:asterisk:-"/>
309
280
  </fingerprint>
310
-
311
281
  <fingerprint pattern="^FPBX-(\S+)$">
312
282
  <description>FreePBX</description>
313
283
  <example service.version="12.0.70(11.20.0)">FPBX-12.0.70(11.20.0)</example>
@@ -316,9 +286,7 @@
316
286
  <param pos="0" name="service.family" value="PBX"/>
317
287
  <param pos="0" name="service.product" value="PBX"/>
318
288
  <param pos="1" name="service.version"/>
319
- <param pos="0" name="service.cpe23" value="cpe:/a:freepbx:freepbx:{service.version}"/>
320
289
  </fingerprint>
321
-
322
290
  <fingerprint pattern="^kamailio \((\S+) \((.*)\)\)$">
323
291
  <description>Kamailio SIP Server</description>
324
292
  <example service.version="4.4.4" kamailio.platform="x86_64/linux">kamailio (4.4.4 (x86_64/linux))</example>
@@ -327,9 +295,7 @@
327
295
  <param pos="0" name="service.product" value="SIP Server"/>
328
296
  <param pos="1" name="service.version"/>
329
297
  <param pos="2" name="kamailio.platform"/>
330
- <param pos="0" name="service.cpe23" value="cpe:/a:kamailio:kamailio:{service.version}"/>
331
298
  </fingerprint>
332
-
333
299
  <!-- This match covers multiple product families and should be split up further -->
334
300
  <fingerprint pattern="^Algo-([^/]+)/(.*)$">
335
301
  <description>Algo SIP Device</description>
@@ -342,7 +308,6 @@
342
308
  <param pos="0" name="hw.device" value="SIP Device"/>
343
309
  <param pos="1" name="hw.product"/>
344
310
  </fingerprint>
345
-
346
311
  <fingerprint pattern="^(?:SIParator|Ingate-Firewall)/(\S+)$">
347
312
  <description>Ingate SIParator Firewall</description>
348
313
  <example os.version="5.0.10">Ingate-Firewall/5.0.10</example>
@@ -355,5 +320,4 @@
355
320
  <param pos="0" name="hw.device" value="SIP Gateway"/>
356
321
  <param pos="0" name="hw.product" value="SIParator Firewall"/>
357
322
  </fingerprint>
358
-
359
- </fingerprints>
323
+ </fingerprints>
data/xml/sip_user_agents.xml CHANGED
@@ -11,6 +11,8 @@
11
11
  <param pos="0" name="hw.device" value="Web cam"/>
12
12
  <param pos="0" name="hw.family" value="Network Video Door Station"/>
13
13
  <param pos="1" name="hw.product"/>
14
+ <param pos="0" name="os.vendor" value="AXIS"/>
15
+ <param pos="0" name="os.family" value="Linux"/>
14
16
  </fingerprint>
15
17
  <fingerprint pattern="(?i)^AXIS (\S+) Network (?:Audio Bridge|(?:Cabinet|Horn) Speaker)$">
16
18
  <description>Axis Network audio devices</description>
@@ -20,6 +22,8 @@
20
22
  <param pos="0" name="hw.vendor" value="Axis"/>
21
23
  <param pos="0" name="hw.family" value="Network Audio"/>
22
24
  <param pos="1" name="hw.product"/>
25
+ <param pos="0" name="os.vendor" value="AXIS"/>
26
+ <param pos="0" name="os.family" value="Linux"/>
23
27
  </fingerprint>
24
28
  <!-- Cisco Devices -->
25
29
  <fingerprint pattern="^Cisco-SIPGateway/IOS-([\d\.x]+)$">
@@ -125,7 +129,7 @@
125
129
  <example hw.version="4.1.4.7430" hw.family="VVX" hw.product="VVX 400" host.mac="010203040506">PolycomVVX-VVX_400-UA/4.1.4.7430_010203040506</example>
126
130
  <example hw.version="5.5.0.23866" hw.family="VVX" hw.product="VVX 501">Polycom/5.5.0.23866 PolycomVVX-VVX_501-UA/5.5.0.23866</example>
127
131
  <example hw.version="4.0.7.2514" hw.family="SoundPoint" hw.product="SoundPoint 670">PolycomSoundPointIP-SPIP_670-UA/4.0.7.2514</example>
128
- <example hw.version="4.0.8.1608" hw.family="SoundStation" hw.product="SoundStation 7000">PolycomSoundStationIP-SSIP_7000-UA/4.0.8.1608</example>
132
+ <example hw.version="4.0.8.1608" hw.model="7000" hw.family="SoundStation" hw.product="SoundStation 7000">PolycomSoundStationIP-SSIP_7000-UA/4.0.8.1608</example>
129
133
  <param pos="0" name="hw.vendor" value="Polycom"/>
130
134
  <param pos="0" name="hw.device" value="VoIP"/>
131
135
  <param pos="1" name="hw.family"/>
@@ -179,4 +183,39 @@
179
183
  <param pos="0" name="service.product" value="SIPPS IP Phone"/>
180
184
  <param pos="1" name="service.version"/>
181
185
  </fingerprint>
186
+ <fingerprint pattern="^ShoreGear/([\d\.]+)\s+\(ShoreTel \d+\)$">
187
+ <description>ShoreTel VoIP Switch</description>
188
+ <example hw.version="21.90.4128.0">ShoreGear/21.90.4128.0 (ShoreTel 15)</example>
189
+ <example hw.version="22.11.4900.0">ShoreGear/22.11.4900.0 (ShoreTel 15)</example>
190
+ <param pos="0" name="hw.vendor" value="ShoreTel"/>
191
+ <param pos="0" name="hw.device" value="VoIP Switch"/>
192
+ <param pos="1" name="hw.version"/>
193
+ </fingerprint>
194
+ <fingerprint pattern="^MERCURY-([a-fA-F0-9]{12})$">
195
+ <description>Crestron Mercury</description>
196
+ <example host.mac="00107F1ABAA0">MERCURY-00107F1ABAA0</example>
197
+ <param pos="0" name="hw.vendor" value="Crestron"/>
198
+ <param pos="0" name="hw.device" value="Video Conferencing"/>
199
+ <param pos="0" name="hw.product" value="Mercury"/>
200
+ <param pos="0" name="os.vendor" value="Crestron"/>
201
+ <param pos="0" name="os.family" value="Linux"/>
202
+ <param pos="0" name="os.device" value="Video Conferencing"/>
203
+ <param pos="1" name="host.mac"/>
204
+ </fingerprint>
205
+ <fingerprint pattern="^IPDECT/([\d\.]+)\s+\(MAC=([a-fA-F0-9]{12}); SER=">
206
+ <description>Konftel IP Phone</description>
207
+ <example host.mac="00087B0F1D30" hw.version="03.55.0013">IPDECT/03.55.0013 (MAC=00087B0F1D30; SER= 00000; HW=1)</example>
208
+ <param pos="0" name="hw.vendor" value="Konftel"/>
209
+ <param pos="0" name="hw.device" value="VoIP"/>
210
+ <param pos="1" name="hw.version"/>
211
+ <param pos="2" name="host.mac"/>
212
+ </fingerprint>
213
+ <fingerprint pattern="^Sangoma ([^\s]+) V([a-zA-Z0-9\.]+)=?">
214
+ <description>Sangoma IP Phone</description>
215
+ <example hw.product="S305" hw.version="3.0.4.72">Sangoma S305 V3.0.4.72</example>
216
+ <param pos="0" name="hw.vendor" value="Sangoma"/>
217
+ <param pos="0" name="hw.device" value="VoIP"/>
218
+ <param pos="2" name="hw.version"/>
219
+ <param pos="1" name="hw.product"/>
220
+ </fingerprint>
182
221
  </fingerprints>